projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CPU: Make physPort and getPhysPort available in SE mode.
[gem5.git]
/
src
/
cpu
/
inorder
/
inorder_dyn_inst.hh
diff --git
a/src/cpu/inorder/inorder_dyn_inst.hh
b/src/cpu/inorder/inorder_dyn_inst.hh
index d0f5a55a7c3fe261cd20af66ff58da0cccaba133..f49476ec595c5d4763176918279bd8bdb12a4b5a 100644
(file)
--- a/
src/cpu/inorder/inorder_dyn_inst.hh
+++ b/
src/cpu/inorder/inorder_dyn_inst.hh
@@
-71,7
+71,6
@@
*/
// Forward declaration.
*/
// Forward declaration.
-class StaticInstPtr;
class ResourceRequest;
class Packet;
class ResourceRequest;
class Packet;
@@
-324,7
+323,7
@@
class InOrderDynInst : public FastAlloc, public RefCounted
std::string instName()
{ return (staticInst) ? staticInst->getName() : "undecoded-inst"; }
std::string instName()
{ return (staticInst) ? staticInst->getName() : "undecoded-inst"; }
- void set
MachInst(ExtMachInst inst
);
+ void set
StaticInst(StaticInstPtr si
);
ExtMachInst getMachInst() { return staticInst->machInst; }
ExtMachInst getMachInst() { return staticInst->machInst; }
@@
-526,10
+525,10
@@
class InOrderDynInst : public FastAlloc, public RefCounted
bool simPalCheck(int palFunc);
#else
short syscallNum;
bool simPalCheck(int palFunc);
#else
short syscallNum;
+#endif
- /**
Call
s a syscall. */
+ /**
Emulate
s a syscall. */
void syscall(int64_t callnum);
void syscall(int64_t callnum);
-#endif
////////////////////////////////////////////////////////////
//
////////////////////////////////////////////////////////////
//
@@
-613,10
+612,10
@@
class InOrderDynInst : public FastAlloc, public RefCounted
//
////////////////////////////////////////////
//
////////////////////////////////////////////
- Fault read
Bytes
(Addr addr, uint8_t *data, unsigned size, unsigned flags);
+ Fault read
Mem
(Addr addr, uint8_t *data, unsigned size, unsigned flags);
- Fault write
Bytes
(uint8_t *data, unsigned size,
-
Addr addr, unsigned flags, uint64_t *res);
+ Fault write
Mem
(uint8_t *data, unsigned size,
+ Addr addr, unsigned flags, uint64_t *res);
/** Initiates a memory access - Calculate Eff. Addr & Initiate Memory
* Access Only valid for memory operations.
/** Initiates a memory access - Calculate Eff. Addr & Initiate Memory
* Access Only valid for memory operations.