derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: Move the remaining microops out of the decoder and into the ISA desc.

Browse Source
This commit is contained in:
Gabe Black
2009-07-08 23:02:19 -07:00
parent 1d4f338b39
commit 95392d3fb8
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/arch/arm/isa/decoder.isa
View File

@@ -37,19 +37,8 @@
// in the ARM ISA specification document starting with Table B.1 or 3-1
//
//
decode COND_CODE default Unknown::unknown() {
0xf: decode COND_CODE {
0x1: decode OPCODE {
// Just a simple trick to allow us to specify our new uops here
0x0: PredIntOp::mvtd_uop({{ Fd.ud = ((uint64_t) Rhi << 32)|Rlo; }},
'IsMicroop');
0x1: PredIntOp::mvfd_uop({{ Rhi = (Fd.ud >> 32) & 0xffffffff;
Rlo = Fd.ud & 0xffffffff; }},
'IsMicroop');
}
default: Unknown::unknown(); // TODO: Ignore other NV space for now
}
default: decode ENCODING {
decode ENCODING default Unknown::unknown() {
format DataOp {
0x0: decode SEVEN_AND_FOUR {
1: decode MISC_OPCODE {
@@ -440,5 +429,4 @@ format DataOp {
}
}
}
}

27
src/arch/arm/isa/formats/macromem.isa
View File

@@ -128,6 +128,33 @@ let {{
PredOpExecute.subst(microSubiUopIop)
}};
////////////////////////////////////////////////////////////////////
//
// Moving to/from double floating point registers
//
let {{
microMvtdUopIop = InstObjParams('mvtd_uop', 'MicroMvtdUop',
'PredOp',
{'code': 'Fd.ud = (Rhi.ud << 32) | Rlo;',
'predicate_test': predicateTest},
['IsMicroop'])
microMvfdUopIop = InstObjParams('mvfd_uop', 'MicroMvfdUop',
'PredOp',
{'code': '''Rhi = bits(Fd.ud, 63, 32);
Rlo = bits(Fd.ud, 31, 0);''',
'predicate_test': predicateTest},
['IsMicroop'])
header_output = BasicDeclare.subst(microMvtdUopIop) + \
BasicDeclare.subst(microMvfdUopIop)
decoder_output = BasicConstructor.subst(microMvtdUopIop) + \
BasicConstructor.subst(microMvfdUopIop)
exec_output = PredOpExecute.subst(microMvtdUopIop) + \
PredOpExecute.subst(microMvfdUopIop)
}};
////////////////////////////////////////////////////////////////////
//
// Macro Memory-format instructions

6
src/arch/arm/isa/formats/util.isa
View File

@@ -106,18 +106,16 @@ output decoder {{
emit_ldfstf_uops(StaticInstPtr* microOps, int index, ExtMachInst machInst,
bool loadop, bool up, int32_t disp)
{
MachInst newMachInst = machInst & 0xf000f000;
if (loadop)
{
microOps[index++] = new MicroLdrUop(machInst, 19, RN, disp);
microOps[index++] =
new MicroLdrUop(machInst, 18, RN, disp + (up ? 4 : -4));
microOps[index++] = new Mvtd_uop(newMachInst);
microOps[index++] = new MicroMvtdUop(machInst);
}
else
{
microOps[index++] = new Mvfd_uop(newMachInst);
microOps[index++] = new MicroMvfdUop(machInst);
microOps[index++] = new MicroStrUop(machInst, 19, RN, disp);
microOps[index++] =
new MicroStrUop(machInst, 18, RN, disp + (up ? 4 : -4));