Index: runtime/vm/assembler_mips.cc |
=================================================================== |
--- runtime/vm/assembler_mips.cc (revision 23469) |
+++ runtime/vm/assembler_mips.cc (working copy) |
@@ -12,7 +12,9 @@ |
namespace dart { |
+#if defined(USING_SIMULATOR) |
DECLARE_FLAG(bool, trace_sim); |
+#endif |
DEFINE_FLAG(bool, print_stop_message, false, "Print stop message."); |
@@ -460,7 +462,9 @@ |
void Assembler::ReserveAlignedFrameSpace(intptr_t frame_space) { |
// Reserve space for arguments and align frame before entering |
// the C++ world. |
- AddImmediate(SP, -frame_space); |
+ if (frame_space != 0) { |
+ AddImmediate(SP, -frame_space); |
regis
2013/05/31 16:44:13
On ARM, AddImmediate of 0 to the same register wil
zra
2013/05/31 18:41:17
Done.
|
+ } |
if (OS::ActivationFrameAlignment() > 0) { |
LoadImmediate(TMP1, ~(OS::ActivationFrameAlignment() - 1)); |
and_(SP, SP, TMP1); |
@@ -575,7 +579,9 @@ |
void Assembler::TraceSimMsg(const char* message) { |
- // Don't bother adding in the messages unless tracing is enabled. |
+ // Don't bother adding in the messages unless tracing is enabled, and we are |
+ // running in the simulator. |
+#if defined(USING_SIMULATOR) |
if (FLAG_trace_sim) { |
Label msg; |
b(&msg); |
@@ -583,6 +589,7 @@ |
Bind(&msg); |
break_(Instr::kMsgMessageCode); |
} |
+#endif |
} |
} // namespace dart |