Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39322 )
Change subject: arch,cpu: Move getExecutingAsid to the ISA class.
......................................................................
arch,cpu: Move getExecutingAsid to the ISA class.
This function was switched based on the ISA, and returned 0 on
everything except SPARC and ARM. It was used only when tracing
instruction execution with --debug-flags=Exec.
Change-Id: I70c274cb76fb229d0e2bc606ba41f458ed18ab81
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39322
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Gabe Black <[email protected]>
---
M src/arch/arm/isa.hh
M src/arch/arm/utility.hh
M src/arch/generic/isa.hh
M src/arch/mips/utility.hh
M src/arch/power/utility.hh
M src/arch/riscv/utility.hh
M src/arch/sparc/isa.hh
M src/arch/sparc/utility.hh
M src/arch/x86/utility.hh
M src/cpu/exetrace.cc
10 files changed, 17 insertions(+), 39 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index 133c824..a97b1a5 100644
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -887,6 +887,12 @@
const Params ¶ms() const;
ISA(const Params &p);
+
+ uint64_t
+ getExecutingAsid() const override
+ {
+ return readMiscRegNoEffect(MISCREG_CONTEXTIDR);
+ }
};
}
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 6ec6403..453e461 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -411,12 +411,6 @@
Addr truncPage(Addr addr);
Addr roundPage(Addr addr);
-inline uint64_t
-getExecutingAsid(ThreadContext *tc)
-{
- return tc->readMiscReg(MISCREG_CONTEXTIDR);
-}
-
// Decodes the register index to access based on the fields used in a MSR
// or MRS instruction
bool
diff --git a/src/arch/generic/isa.hh b/src/arch/generic/isa.hh
index c1b8734..7d5daa8 100644
--- a/src/arch/generic/isa.hh
+++ b/src/arch/generic/isa.hh
@@ -54,6 +54,8 @@
public:
virtual void takeOverFrom(ThreadContext *new_tc, ThreadContext
*old_tc) {}
virtual void setThreadContext(ThreadContext *_tc) { tc = _tc; }
+
+ virtual uint64_t getExecutingAsid() const { return 0; }
};
#endif // __ARCH_GENERIC_ISA_HH__
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index c156c82..23d92c1 100644
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -108,12 +108,6 @@
pc.advance();
}
-inline uint64_t
-getExecutingAsid(ThreadContext *tc)
-{
- return 0;
-}
-
};
diff --git a/src/arch/power/utility.hh b/src/arch/power/utility.hh
index ba28f07..3a4b16c 100644
--- a/src/arch/power/utility.hh
+++ b/src/arch/power/utility.hh
@@ -66,12 +66,6 @@
return 0;
}
-inline uint64_t
-getExecutingAsid(ThreadContext *tc)
-{
- return 0;
-}
-
} // namespace PowerISA
diff --git a/src/arch/riscv/utility.hh b/src/arch/riscv/utility.hh
index d4cf221..816d36c 100644
--- a/src/arch/riscv/utility.hh
+++ b/src/arch/riscv/utility.hh
@@ -176,12 +176,6 @@
return true;
}
-inline uint64_t
-getExecutingAsid(ThreadContext *tc)
-{
- return 0;
-}
-
} // namespace RiscvISA
#endif // __ARCH_RISCV_UTILITY_HH__
diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh
index 2881384..21143dd 100644
--- a/src/arch/sparc/isa.hh
+++ b/src/arch/sparc/isa.hh
@@ -215,6 +215,11 @@
int flattenCCIndex(int reg) const { return reg; }
int flattenMiscIndex(int reg) const { return reg; }
+ uint64_t
+ getExecutingAsid() const override
+ {
+ return readMiscRegNoEffect(MISCREG_MMU_P_CONTEXT);
+ }
typedef SparcISAParams Params;
const Params ¶ms() const;
diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh
index 4738eb4..3f36f03 100644
--- a/src/arch/sparc/utility.hh
+++ b/src/arch/sparc/utility.hh
@@ -70,12 +70,6 @@
inst->advancePC(pc);
}
-inline uint64_t
-getExecutingAsid(ThreadContext *tc)
-{
- return tc->readMiscRegNoEffect(MISCREG_MMU_P_CONTEXT);
-}
-
} // namespace SparcISA
#endif
diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh
index 39a142c..50f65ef 100644
--- a/src/arch/x86/utility.hh
+++ b/src/arch/x86/utility.hh
@@ -77,13 +77,6 @@
inst->advancePC(pc);
}
- inline uint64_t
- getExecutingAsid(ThreadContext *tc)
- {
- return 0;
- }
-
-
/**
* Reconstruct the rflags register from the internal gem5 register
* state.
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 7bf60e7..e144743 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -66,8 +66,10 @@
if (!in_user_mode && !Debug::ExecKernel) return;
}
- if (Debug::ExecAsid)
- outs << "A" << std::dec << TheISA::getExecutingAsid(thread) << " ";
+ if (Debug::ExecAsid) {
+ outs << "A" << std::dec <<
+ thread->getIsaPtr()->getExecutingAsid() << " ";
+ }
if (Debug::ExecThread)
outs << "T" << thread->threadId() << " : ";
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39322
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: I70c274cb76fb229d0e2bc606ba41f458ed18ab81
Gerrit-Change-Number: 39322
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s