From 39bbd9c05e5d634027ff936732b5e2ba87f7538f Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Sat, 14 Jan 2023 10:13:31 -0300 Subject: [PATCH] sim,arch: Remove the GuestABI namespace This namespace has gone through the deprecation period and can now be removed. Change-Id: I476815491314f4222da43da75c91654b4f3d1228 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67374 Maintainer: Jason Lowe-Power Reviewed-by: Richard Cooper Tested-by: kokoro --- src/arch/arm/aapcs32.hh | 2 -- src/arch/arm/aapcs64.hh | 1 - src/arch/arm/freebsd/se_workload.hh | 1 - src/arch/arm/linux/se_workload.hh | 1 - src/arch/arm/reg_abi.hh | 1 - src/arch/arm/semihosting.cc | 1 - src/arch/arm/semihosting.hh | 1 - src/arch/mips/se_workload.hh | 1 - src/arch/power/se_workload.hh | 1 - src/arch/riscv/se_workload.hh | 1 - src/arch/sparc/pseudo_inst_abi.hh | 1 - src/arch/sparc/se_workload.hh | 1 - src/arch/x86/linux/linux.hh | 1 - src/arch/x86/linux/se_workload.hh | 1 - src/arch/x86/pseudo_inst_abi.hh | 1 - src/sim/guest_abi.test.cc | 1 - src/sim/guest_abi/definition.hh | 1 - src/sim/guest_abi/dispatch.hh | 1 - src/sim/guest_abi/layout.hh | 1 - src/sim/guest_abi/varargs.hh | 1 - src/sim/proxy_ptr.hh | 1 - src/sim/proxy_ptr.test.cc | 1 - src/sim/syscall_abi.hh | 1 - 23 files changed, 24 deletions(-) diff --git a/src/arch/arm/aapcs32.hh b/src/arch/arm/aapcs32.hh index 383b8eb36b..1d727e2634 100644 --- a/src/arch/arm/aapcs32.hh +++ b/src/arch/arm/aapcs32.hh @@ -70,7 +70,6 @@ struct Aapcs32 }; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { @@ -446,7 +445,6 @@ struct Aapcs32Vfp : public Aapcs32 }; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/aapcs64.hh b/src/arch/arm/aapcs64.hh index 2f53822a70..62926d34b2 100644 --- a/src/arch/arm/aapcs64.hh +++ b/src/arch/arm/aapcs64.hh @@ -67,7 +67,6 @@ struct Aapcs64 }; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/freebsd/se_workload.hh b/src/arch/arm/freebsd/se_workload.hh index b944dbd8f9..47e41f2590 100644 --- a/src/arch/arm/freebsd/se_workload.hh +++ b/src/arch/arm/freebsd/se_workload.hh @@ -70,7 +70,6 @@ class EmuFreebsd : public SEWorkload } // namespace ArmISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/linux/se_workload.hh b/src/arch/arm/linux/se_workload.hh index 0939af1dda..29bd30a6bf 100644 --- a/src/arch/arm/linux/se_workload.hh +++ b/src/arch/arm/linux/se_workload.hh @@ -62,7 +62,6 @@ class EmuLinux : public SEWorkload } // namespace ArmISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/reg_abi.hh b/src/arch/arm/reg_abi.hh index 1d5272c66d..e892166c5e 100644 --- a/src/arch/arm/reg_abi.hh +++ b/src/arch/arm/reg_abi.hh @@ -51,7 +51,6 @@ struct RegABI64 : public GenericSyscallABI64 } // namespace ArmISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/semihosting.cc b/src/arch/arm/semihosting.cc index 8efe841623..4ce52e8741 100644 --- a/src/arch/arm/semihosting.cc +++ b/src/arch/arm/semihosting.cc @@ -714,7 +714,6 @@ struct SemiPseudoAbi64 : public ArmSemihosting::Abi64 }; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh index fe7819cae9..557eb76636 100644 --- a/src/arch/arm/semihosting.hh +++ b/src/arch/arm/semihosting.hh @@ -599,7 +599,6 @@ class ArmSemihosting : public SimObject std::ostream &operator << ( std::ostream &os, const ArmSemihosting::InPlaceArg &ipa); -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/mips/se_workload.hh b/src/arch/mips/se_workload.hh index dc6f1dd5e3..18c0bda9c1 100644 --- a/src/arch/mips/se_workload.hh +++ b/src/arch/mips/se_workload.hh @@ -68,7 +68,6 @@ class SEWorkload : public gem5::SEWorkload } // namespace MipsISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/power/se_workload.hh b/src/arch/power/se_workload.hh index d041c45728..3c2bb936f4 100644 --- a/src/arch/power/se_workload.hh +++ b/src/arch/power/se_workload.hh @@ -68,7 +68,6 @@ class SEWorkload : public gem5::SEWorkload } // namespace PowerISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/riscv/se_workload.hh b/src/arch/riscv/se_workload.hh index 6f7c2edb70..9ae3be4c05 100644 --- a/src/arch/riscv/se_workload.hh +++ b/src/arch/riscv/se_workload.hh @@ -66,7 +66,6 @@ class SEWorkload : public gem5::SEWorkload } // namespace RiscvISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/sparc/pseudo_inst_abi.hh b/src/arch/sparc/pseudo_inst_abi.hh index 993e11bff3..989f0e7dfc 100644 --- a/src/arch/sparc/pseudo_inst_abi.hh +++ b/src/arch/sparc/pseudo_inst_abi.hh @@ -40,7 +40,6 @@ struct SparcPseudoInstABI using State = int; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/sparc/se_workload.hh b/src/arch/sparc/se_workload.hh index 8cb373ac90..e0f7467fae 100644 --- a/src/arch/sparc/se_workload.hh +++ b/src/arch/sparc/se_workload.hh @@ -80,7 +80,6 @@ class SEWorkload : public gem5::SEWorkload } // namespace SparcISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh index 0c34d09330..b9598224a6 100644 --- a/src/arch/x86/linux/linux.hh +++ b/src/arch/x86/linux/linux.hh @@ -77,7 +77,6 @@ class X86Linux : public Linux class SyscallABI {}; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/x86/linux/se_workload.hh b/src/arch/x86/linux/se_workload.hh index f170776d82..d8d60e759f 100644 --- a/src/arch/x86/linux/se_workload.hh +++ b/src/arch/x86/linux/se_workload.hh @@ -96,7 +96,6 @@ class EmuLinux : public SEWorkload } // namespace X86ISA -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/arch/x86/pseudo_inst_abi.hh b/src/arch/x86/pseudo_inst_abi.hh index 05bf66f5f2..e465c7abd5 100644 --- a/src/arch/x86/pseudo_inst_abi.hh +++ b/src/arch/x86/pseudo_inst_abi.hh @@ -46,7 +46,6 @@ struct X86PseudoInstABI using State = int; }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/guest_abi.test.cc b/src/sim/guest_abi.test.cc index 5b59874c3e..64f4122a51 100644 --- a/src/sim/guest_abi.test.cc +++ b/src/sim/guest_abi.test.cc @@ -98,7 +98,6 @@ struct TestABI_TcInit namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/guest_abi/definition.hh b/src/sim/guest_abi/definition.hh index 2857b5b616..43aafecdc8 100644 --- a/src/sim/guest_abi/definition.hh +++ b/src/sim/guest_abi/definition.hh @@ -35,7 +35,6 @@ namespace gem5 class ThreadContext; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/guest_abi/dispatch.hh b/src/sim/guest_abi/dispatch.hh index 7ada2e2ac4..8846354e06 100644 --- a/src/sim/guest_abi/dispatch.hh +++ b/src/sim/guest_abi/dispatch.hh @@ -43,7 +43,6 @@ namespace gem5 class ThreadContext; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/guest_abi/layout.hh b/src/sim/guest_abi/layout.hh index 02681510d0..4d469b177c 100644 --- a/src/sim/guest_abi/layout.hh +++ b/src/sim/guest_abi/layout.hh @@ -38,7 +38,6 @@ namespace gem5 class ThreadContext; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/guest_abi/varargs.hh b/src/sim/guest_abi/varargs.hh index 9bb04786ff..1a34f2086c 100644 --- a/src/sim/guest_abi/varargs.hh +++ b/src/sim/guest_abi/varargs.hh @@ -39,7 +39,6 @@ namespace gem5 class ThreadContext; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/proxy_ptr.hh b/src/sim/proxy_ptr.hh index 03ab9472c9..5e766f7cc9 100644 --- a/src/sim/proxy_ptr.hh +++ b/src/sim/proxy_ptr.hh @@ -357,7 +357,6 @@ operator + (A a, const ProxyPtr &other) return other + a; } -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/proxy_ptr.test.cc b/src/sim/proxy_ptr.test.cc index 6f49d166e2..57fdb973bb 100644 --- a/src/sim/proxy_ptr.test.cc +++ b/src/sim/proxy_ptr.test.cc @@ -474,7 +474,6 @@ struct TestABI namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi { diff --git a/src/sim/syscall_abi.hh b/src/sim/syscall_abi.hh index b91dc8ea95..90dbd9747b 100644 --- a/src/sim/syscall_abi.hh +++ b/src/sim/syscall_abi.hh @@ -75,7 +75,6 @@ struct GenericSyscallABI32 : public GenericSyscallABI } }; -GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi); namespace guest_abi {