SPARC: Isolate FP operations enough to prevent code/rounding mode reordering.

--HG--
extra : rebase_source : ee79ab89c5a707c1294f38abb84c60f8ef64196c
This commit is contained in:
Gabe Black 2011-11-27 22:00:58 -05:00
parent 13552dc304
commit e7d0c999a1

View file

@ -33,6 +33,11 @@ def template BasicExecDeclare {{
Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const; Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const;
}}; }};
def template DoFpOpDeclare {{
Fault doFpOp(%(CPU_exec_context)s *, Trace::InstRecord *)
const M5_NO_INLINE;
}};
// Definitions of execute methods that panic. // Definitions of execute methods that panic.
def template BasicExecPanic {{ def template BasicExecPanic {{
Fault Fault
@ -57,6 +62,21 @@ def template BasicDeclare {{
}; };
}}; }};
// Basic instruction class declaration template.
def template FpBasicDeclare {{
/**
* Static instruction class for "%(mnemonic)s".
*/
class %(class_name)s : public %(base_class)s
{
public:
// Constructor.
%(class_name)s(ExtMachInst machInst);
%(BasicExecDeclare)s
%(DoFpOpDeclare)s
};
}};
// Basic instruction class declaration template. // Basic instruction class declaration template.
def template BasicDeclareWithMnemonic {{ def template BasicDeclareWithMnemonic {{
/** /**
@ -110,6 +130,22 @@ def template BasicExecute {{
} }
}}; }};
def template DoFpOpExecute {{
Fault
%(class_name)s::doFpOp(%(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const
{
Fault fault = NoFault;
%(op_decl)s;
%(op_rd)s;
%(fp_code)s;
if (fault == NoFault) {
%(op_wb)s;
}
return fault;
}
}};
// Basic decode template. // Basic decode template.
def template BasicDecode {{ def template BasicDecode {{
return new %(class_name)s(machInst); return new %(class_name)s(machInst);
@ -131,7 +167,7 @@ def format BasicOperate(code, *flags) {{
}}; }};
def format FpBasic(code, *flags) {{ def format FpBasic(code, *flags) {{
fp_code = """ exec_code = """
Fsr |= bits(Fsr,4,0) << 5; Fsr |= bits(Fsr,4,0) << 5;
Fsr = insertBits(Fsr, 4, 0, 0); Fsr = insertBits(Fsr, 4, 0, 0);
int newrnd = M5_FE_TONEAREST; int newrnd = M5_FE_TONEAREST;
@ -143,18 +179,18 @@ def format FpBasic(code, *flags) {{
} }
int oldrnd = m5_fegetround(); int oldrnd = m5_fegetround();
m5_fesetround(newrnd); m5_fesetround(newrnd);
""" __asm__ __volatile__("" ::: "memory");
fault = doFpOp(xc, traceData);
fp_code += code __asm__ __volatile__("" ::: "memory");
fp_code += """
m5_fesetround(oldrnd); m5_fesetround(oldrnd);
return fault;
""" """
fp_code = filterDoubles(fp_code) fp_code = filterDoubles(code)
iop = InstObjParams(name, Name, 'SparcStaticInst', fp_code, flags) iop = InstObjParams(name, Name, 'SparcStaticInst',
header_output = BasicDeclare.subst(iop) { "code" : exec_code, "fp_code" : fp_code }, flags)
header_output = FpBasicDeclare.subst(iop)
decoder_output = BasicConstructor.subst(iop) decoder_output = BasicConstructor.subst(iop)
decode_block = BasicDecode.subst(iop) decode_block = BasicDecode.subst(iop)
exec_output = BasicExecute.subst(iop) exec_output = BasicExecute.subst(iop)
exec_output += DoFpOpExecute.subst(iop)
}}; }};