Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/42347 )
Change subject: arch-x86: Remove static code from debug.isa and fix style.
......................................................................
arch-x86: Remove static code from debug.isa and fix style.
Fix style problems in debug.isa, and move static code out of the ISA
description into a plain header file.
Change-Id: I8369bd8d46ad11b66cac8249cc981a8d279a1492
---
M src/arch/x86/insts/badmicroop.cc
A src/arch/x86/insts/microdebug.hh
M src/arch/x86/isa/includes.isa
M src/arch/x86/isa/microops/debug.isa
4 files changed, 90 insertions(+), 62 deletions(-)
diff --git a/src/arch/x86/insts/badmicroop.cc
b/src/arch/x86/insts/badmicroop.cc
index 9b4d32a..d85a1b0 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -55,7 +55,7 @@
// try to delete the static memory when it was destructed.
const StaticInstPtr badMicroop =
- new X86ISAInst::MicroDebug(dummyMachInst, "panic", "BAD",
+ new MicroDebug(dummyMachInst, "panic", "BAD",
StaticInst::IsMicroop | StaticInst::IsLastMicroop,
new GenericISA::M5PanicFault("Invalid microop!"));
diff --git a/src/arch/x86/insts/microdebug.hh
b/src/arch/x86/insts/microdebug.hh
new file mode 100644
index 0000000..b3af1e7
--- /dev/null
+++ b/src/arch/x86/insts/microdebug.hh
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __ARCH_X86_INSTS_MICRODEBUG_HH__
+#define __ARCH_X86_INSTS_MICRODEBUG_HH__
+
+#include "arch/x86/insts/microop.hh"
+
+namespace X86ISA
+{
+
+class MicroDebug : public X86ISA::X86MicroopBase
+{
+ protected:
+ std::shared_ptr<GenericISA::M5DebugFault> fault;
+
+ public:
+ MicroDebug(ExtMachInst mach_inst, const char *mnem, const char
*inst_mnem,
+ uint64_t set_flags, GenericISA::M5DebugFault *_fault) :
+ X86MicroopBase(mach_inst, mnem, inst_mnem, set_flags, No_OpClass),
+ fault(_fault)
+ {}
+
+ Fault
+ execute(ExecContext *xc, Trace::InstRecord *traceData) const override
+ {
+ return fault;
+ }
+
+ std::string
+ generateDisassembly(Addr pc,
+ const Loader::SymbolTable *symtab) const override
+ {
+ std::stringstream response;
+
+ printMnemonic(response, instMnem, mnemonic);
+ response << "\"" << fault->message() << "\"";
+
+ return response.str();
+ }
+};
+
+} // namespace X86ISA
+
+#endif //__ARCH_X86_INSTS_MICRODEBUG_HH__
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 4b95655..b5fedb2 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -55,6 +55,7 @@
#include "arch/generic/debugfaults.hh"
#include "arch/x86/emulenv.hh"
#include "arch/x86/insts/macroop.hh"
+#include "arch/x86/insts/microdebug.hh"
#include "arch/x86/insts/microfpop.hh"
#include "arch/x86/insts/microldstop.hh"
#include "arch/x86/insts/micromediaop.hh"
diff --git a/src/arch/x86/isa/microops/debug.isa
b/src/arch/x86/isa/microops/debug.isa
index 326f245..5023682 100644
--- a/src/arch/x86/isa/microops/debug.isa
+++ b/src/arch/x86/isa/microops/debug.isa
@@ -39,47 +39,6 @@
//
//////////////////////////////////////////////////////////////////////////
-output header {{
- class MicroDebug : public X86ISA::X86MicroopBase
- {
- protected:
- std::shared_ptr<GenericISA::M5DebugFault> fault;
-
- public:
- MicroDebug(ExtMachInst _machInst, const char *mnem,
- const char *instMnem, uint64_t setFlags,
- GenericISA::M5DebugFault *_fault);
-
- Fault
- execute(ExecContext *xc, Trace::InstRecord *traceData) const
override
- {
- return fault;
- }
-
- std::string
- generateDisassembly(Addr pc,
- const Loader::SymbolTable *symtab) const
override
- {
- std::stringstream response;
-
- printMnemonic(response, instMnem, mnemonic);
- response << "\"" << fault->message() << "\"";
-
- return response.str();
- }
- };
-}};
-
-output decoder {{
- MicroDebug::MicroDebug(ExtMachInst _machInst, const char *mnem,
- const char *instMnem, uint64_t setFlags,
- GenericISA::M5DebugFault *_fault) :
- X86ISA::X86MicroopBase(_machInst, mnem, instMnem,
- setFlags, No_OpClass),
- fault(_fault)
- {}
-}};
-
def template MicroDebugFlagsDeclare {{
class %(class_name)s : public %(base_class)s
{
@@ -90,36 +49,35 @@
uint8_t cc;
public:
- %(class_name)s(ExtMachInst _machInst, const char *mnem,
- const char *instMnem, uint64_t setFlags,
- GenericISA::M5DebugFault *_fault, uint8_t _cc);
+ %(class_name)s(ExtMachInst mach_inst, const char *mnem,
+ const char *inst_mnem, uint64_t set_flags,
+ GenericISA::M5DebugFault *_fault, uint8_t _cc);
Fault execute(ExecContext *, Trace::InstRecord *) const override;
};
}};
def template MicroDebugFlagsExecute {{
- Fault
- %(class_name)s::execute(ExecContext *xc,
- Trace::InstRecord *traceData) const
- {
- %(op_decl)s
- %(op_rd)s
- if (%(cond_test)s) {
- return %(base_class)s::execute(xc, traceData);
- } else {
- return NoFault;
- }
+ Fault
+ %(class_name)s::execute(ExecContext *xc,
+ Trace::InstRecord *trace_data) const
+ {
+ %(op_decl)s
+ %(op_rd)s
+ if (%(cond_test)s) {
+ return %(base_class)s::execute(xc, trace_data);
+ } else {
+ return NoFault;
}
+ }
}};
def template MicroDebugFlagsConstructor {{
%(class_name)s::%(class_name)s(
- ExtMachInst machInst, const char *mnem,
- const char *instMnem, uint64_t setFlags,
- GenericISA::M5DebugFault *_fault, uint8_t _cc) :
- %(base_class)s(machInst, mnem, instMnem, setFlags, _fault),
- cc(_cc)
+ ExtMachInst mach_inst, const char *mnem, const char *inst_mnem,
+ uint64_t set_flags, GenericISA::M5DebugFault *_fault,
+ uint8_t _cc) :
+ %(base_class)s(mach_inst, mnem, inst_mnem, set_flags, _fault),
cc(_cc)
{
%(set_reg_idx_arr)s;
%(constructor)s;
@@ -127,7 +85,7 @@
}};
let {{
- iop = InstObjParams("", "MicroDebugFlags", "MicroDebug",
+ iop = InstObjParams("", "MicroDebugFlags", "X86ISA::MicroDebug",
{"code": "",
"cond_test": "checkCondition(ccFlagBits | cfofBits | \
dfBit | ecfBit | ezfBit,
cc)"})
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42347
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: I8369bd8d46ad11b66cac8249cc981a8d279a1492
Gerrit-Change-Number: 42347
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
