From 5a1414d78233357d361d47aa3a74c16eb240a28c Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Sat, 14 Jan 2023 10:16:09 -0300 Subject: [PATCH] arch: Remove a couple of deprecated namespaces These namespaces have gone through the deprecation period and can now be removed: X86Macroops, SMBios, RomLabels, DeliveryMode, ConditionTests. Change-Id: I6ff5e98319d92e27743a9fbeeab054497a2392e0 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67375 Tested-by: kokoro Maintainer: Jason Lowe-Power Reviewed-by: Jason Lowe-Power --- src/arch/x86/bios/smbios.hh | 1 - src/arch/x86/fs_workload.hh | 1 - src/arch/x86/insts/microop.hh | 1 - src/arch/x86/intmessage.hh | 1 - src/arch/x86/isa/macroop.isa | 1 - src/arch/x86/isa/rom.isa | 4 +--- 6 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh index dc38676445..88d3344cbb 100644 --- a/src/arch/x86/bios/smbios.hh +++ b/src/arch/x86/bios/smbios.hh @@ -61,7 +61,6 @@ struct X86SMBiosSMBiosTableParams; namespace X86ISA { -GEM5_DEPRECATED_NAMESPACE(SMBios, smbios); namespace smbios { diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh index 5c1187cda4..9d14f91bb5 100644 --- a/src/arch/x86/fs_workload.hh +++ b/src/arch/x86/fs_workload.hh @@ -55,7 +55,6 @@ namespace gem5 namespace X86ISA { -GEM5_DEPRECATED_NAMESPACE(SMBios, smbios); namespace smbios { diff --git a/src/arch/x86/insts/microop.hh b/src/arch/x86/insts/microop.hh index 9cbdec87d1..384e15e7e4 100644 --- a/src/arch/x86/insts/microop.hh +++ b/src/arch/x86/insts/microop.hh @@ -48,7 +48,6 @@ namespace gem5 namespace X86ISA { -GEM5_DEPRECATED_NAMESPACE(ConditionTests, condition_tests); namespace condition_tests { diff --git a/src/arch/x86/intmessage.hh b/src/arch/x86/intmessage.hh index f7692e25a3..71e4765c76 100644 --- a/src/arch/x86/intmessage.hh +++ b/src/arch/x86/intmessage.hh @@ -52,7 +52,6 @@ namespace X86ISA Bitfield<21> trigger; EndBitUnion(TriggerIntMessage) - GEM5_DEPRECATED_NAMESPACE(DeliveryMode, delivery_mode); namespace delivery_mode { enum IntDeliveryMode diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa index 691e8d011c..d1b9e22032 100644 --- a/src/arch/x86/isa/macroop.isa +++ b/src/arch/x86/isa/macroop.isa @@ -76,7 +76,6 @@ output header {{ // Basic instruction class declaration template. def template MacroDeclare {{ - GEM5_DEPRECATED_NAMESPACE(X86Macroop, x86_macroop); namespace x86_macroop { /** diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa index 9aef3ba3eb..bf2f9ff8e2 100644 --- a/src/arch/x86/isa/rom.isa +++ b/src/arch/x86/isa/rom.isa @@ -42,9 +42,7 @@ let {{ class X86MicrocodeRom(Rom): def getDeclaration(self): - declareLabels = \ - "GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\n" - declareLabels += "namespace rom_labels\n{\n" + declareLabels = "namespace rom_labels\n{\n" for (label, microop) in self.labels.items(): declareLabels += "const static uint64_t label_%s = %d;\n" \ % (label, microop.micropc)