Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: runtime/vm/simulator_arm.cc

Issue 647523002: Uses correct mnemonic for vmrs instructions. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/disassembler_arm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_arm.cc
===================================================================
--- runtime/vm/simulator_arm.cc (revision 41020)
+++ runtime/vm/simulator_arm.cc (working copy)
@@ -2961,13 +2961,21 @@
SRegister sd = OddSRegisterOf(dn);
set_sregister_bits(sd, get_register(rd));
}
- } else if ((instr->Bits(20, 4) == 0xf) && (instr->Bit(8) == 0) &&
- (instr->Bits(12, 4) == 0xf)) {
- // Format(instr, "vmstat'cond");
- n_flag_ = fp_n_flag_;
- z_flag_ = fp_z_flag_;
- c_flag_ = fp_c_flag_;
- v_flag_ = fp_v_flag_;
+ } else if ((instr->Bits(20, 4) == 0xf) && (instr->Bit(8) == 0)) {
+ if (instr->Bits(12, 4) == 0xf) {
+ // Format(instr, "vmrs'cond APSR, FPSCR");
+ n_flag_ = fp_n_flag_;
+ z_flag_ = fp_z_flag_;
+ c_flag_ = fp_c_flag_;
+ v_flag_ = fp_v_flag_;
+ } else {
+ // Format(instr, "vmrs'cond 'rd, FPSCR");
+ const int32_t n_flag = fp_n_flag_ ? (1 << 31) : 0;
+ const int32_t z_flag = fp_z_flag_ ? (1 << 30) : 0;
+ const int32_t c_flag = fp_c_flag_ ? (1 << 29) : 0;
+ const int32_t v_flag = fp_v_flag_ ? (1 << 28) : 0;
+ set_register(instr->RdField(), n_flag | z_flag | c_flag | v_flag);
+ }
} else {
UnimplementedInstruction(instr);
}
« no previous file with comments | « runtime/vm/disassembler_arm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698