diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-04-10 12:37:15 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-04-10 12:37:15 -0400 |
| commit | f51656498ea4c3418499f25e5a7a24b4c71be122 (patch) | |
| tree | f54ef3c2ec601519e0cc98f007705e56a4b20dc0 /cpu | |
| parent | ae1a95ed9c9aa2b3c97272570575345dc3c37799 (diff) | |
| parent | 4f430e9ab56443e822171b7881f4d50475dbaf25 (diff) | |
| download | gem5-f51656498ea4c3418499f25e5a7a24b4c71be122.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
arch/mips/isa/formats/mem.isa:
Filled in Split-Memory Access Code
arch/mips/isa_traits.hh:
Leave IntRegFile as an array instead of class with member functions
mem/page_table.cc:
take out NO ALIGN FAULT page table access code for now... No need to messs up what works
--HG--
extra : convert_revision : cbf1cce9145daf9ee9ceabc9080271ddb0561489
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/static_inst.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index a200e2849..f0b75c10e 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -397,8 +397,9 @@ class StaticInst : public StaticInstBase int getRs() { return (machInst & 0x03E00000) >> 21; } //25...21 int getRt() { return (machInst & 0x001F0000) >> 16; } //20...16 int getRd() { return (machInst & 0x0000F800) >> 11; } //15...11 - int getOpname(){ return (machInst & 0x0000003F); }//5...0 - int getBranch(){ return (machInst & 0x0000FFFF); }//5...0 + int getImm() { return (machInst & 0x0000FFFF); } //15...0 + int getFunction(){ return (machInst & 0x0000003F); }//5...0 + int getBranch(){ return (machInst & 0x0000FFFF); }//15...0 int getJump(){ return (machInst & 0x03FFFFFF); }//5...0 int getHint(){ return (machInst & 0x000007C0) >> 6; } //10...6 std::string getName() { return mnemonic; } |