Enabled pop

This commit is contained in:
Dani Messerman 2015-05-06 21:59:05 +03:00
parent 2839139250
commit b528ddeebc

View File

@ -22,7 +22,7 @@ bool Ldr::Decode()
form = Form::Reg; form = Form::Reg;
if (!P && W) return false; // SEE LDRT; if (!P && W) return false; // SEE LDRT;
if (rn == Register::SP && !P && U && !W && imm12 == 4) return false; // SEE POP; //if (rn == Register::SP && !P && U && !W && imm12 == 4) return false; // SEE POP;
if ((!P || W) && rn == rt) return false; // UNPREDICTABLE; if ((!P || W) && rn == rt) return false; // UNPREDICTABLE;
return true; return true;
@ -32,7 +32,7 @@ bool Ldr::Decode()
{ {
form = Form::MultiReg; form = Form::MultiReg;
if (W && rn == Register::SP && register_list.size() > 1) return false; // SEE POP (ARM); //if (W && rn == Register::SP && register_list.size() > 1) return false; // SEE POP (ARM);
if (rn == Register::PC || register_list.size() < 1) return false; // UNPREDICTABLE; if (rn == Register::PC || register_list.size() < 1) return false; // UNPREDICTABLE;
if (W && register_list[(u32)rn]) return false; // UNPREDICTABLE; if (W && register_list[(u32)rn]) return false; // UNPREDICTABLE;