Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45396 )
Change subject: arch-x86: Rename RomLabels namespace as rom_labels
......................................................................
arch-x86: Rename RomLabels namespace as rom_labels
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
RomLabels became rom_labels.
Change-Id: I972409ab33c595baaf845bf11f2f450ab5938d54
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45396
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/x86/faults.cc
M src/arch/x86/isa/microasm.isa
M src/arch/x86/isa/microops/base.isa
M src/arch/x86/isa/rom.isa
4 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 97d7b88..749e743 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -64,7 +64,7 @@
PCState pcState = tc->pcState();
Addr pc = pcState.pc();
DPRINTF(Faults, "RIP %#x: vector %d: %s\n", pc, vector, describe());
- using namespace X86ISAInst::RomLabels;
+ using namespace X86ISAInst::rom_labels;
HandyM5Reg m5reg = tc->readMiscRegNoEffect(MISCREG_M5_REG);
MicroPC entry;
if (m5reg.mode == LongMode) {
@@ -292,7 +292,7 @@
// Update the handy M5 Reg.
tc->setMiscReg(MISCREG_M5_REG, 0);
- MicroPC entry = X86ISAInst::RomLabels::extern_label_initIntHalt;
+ MicroPC entry = X86ISAInst::rom_labels::extern_label_initIntHalt;
pc.upc(romMicroPC(entry));
pc.nupc(romMicroPC(entry) + 1);
tc->pcState(pc);
diff --git a/src/arch/x86/isa/microasm.isa b/src/arch/x86/isa/microasm.isa
index bac4902..ff110f1 100644
--- a/src/arch/x86/isa/microasm.isa
+++ b/src/arch/x86/isa/microasm.isa
@@ -216,12 +216,12 @@
assembler.symbols["label"] = labeler
def rom_labeler(labelStr):
- return "romMicroPC(RomLabels::extern_label_%s)" % labelStr
+ return "romMicroPC(rom_labels::extern_label_%s)" % labelStr
assembler.symbols["rom_label"] = rom_labeler
def rom_local_labeler(labelStr):
- return "romMicroPC(RomLabels::label_%s)" % labelStr
+ return "romMicroPC(rom_labels::label_%s)" % labelStr
assembler.symbols["rom_local_label"] = rom_local_labeler
diff --git a/src/arch/x86/isa/microops/base.isa
b/src/arch/x86/isa/microops/base.isa
index b9e499c..2dea9a3 100644
--- a/src/arch/x86/isa/microops/base.isa
+++ b/src/arch/x86/isa/microops/base.isa
@@ -215,7 +215,7 @@
macroop ? macroop->getExtMachInst() : dummyExtMachInst;
GEM5_VAR_USED const EmulEnv &env =
macroop ? macroop->getEmulEnv() : dummyEmulEnv;
- using namespace RomLabels;
+ using namespace rom_labels;
return %s;
}
'''
diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa
index 1f41ad1..f0153ef 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -31,7 +31,7 @@
X86ISA::MicrocodeRom::MicrocodeRom()
{
- using namespace RomLabels;
+ using namespace rom_labels;
genFuncs = new GenFunc[numMicroops];
%(alloc_generators)s;
}
@@ -52,7 +52,9 @@
def getDeclaration(self):
- declareLabels = "namespace RomLabels {\n"
+ declareLabels = \
+ "GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\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)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45396
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I972409ab33c595baaf845bf11f2f450ab5938d54
Gerrit-Change-Number: 45396
Gerrit-PatchSet: 6
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
