A64: Avoid generating simulator specific instructions if we are building a snapshot.

src/a64/assembler-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
@@ skipping 1748 matching lines @@
 
 
 void Assembler::brk(int code) {
   ASSERT(is_uint16(code));
   Emit(BRK | ImmException(code));
 }
 
 
 void Assembler::debug(const char* message, uint32_t code, Instr params) {
 #ifdef USE_SIMULATOR
-  // The arguments to the debug marker need to be contiguous in memory, so make
-  // sure we don't try to emit a literal pool.
-  BlockConstPoolScope scope(this);
+  // Don't generate simulator specific code if we are building a snapshot, which
+  // might be run on real hardware.
+  if (!Serializer::enabled()) {
+#ifdef DEBUG
+    Serializer::TooLateToEnableNow();
+#endif
+    // The arguments to the debug marker need to be contiguous in memory, so
+    // make sure we don't try to emit a literal pool.
+    BlockConstPoolScope scope(this);
 
-  Label start;
-  bind(&start);
+    Label start;
+    bind(&start);
 
-  // Refer to instructions-a64.h for a description of the marker and its
-  // arguments.
-  hlt(kImmExceptionIsDebug);
-  ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugCodeOffset);
-  dc32(code);
-  ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugParamsOffset);
-  dc32(params);
-  ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugMessageOffset);
-  EmitStringData(message);
-  hlt(kImmExceptionIsUnreachable);
+    // Refer to instructions-a64.h for a description of the marker and its
+    // arguments.
+    hlt(kImmExceptionIsDebug);
+    ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugCodeOffset);
+    dc32(code);
+    ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugParamsOffset);
+    dc32(params);
+    ASSERT(SizeOfCodeGeneratedSince(&start) == kDebugMessageOffset);
+    EmitStringData(message);
+    hlt(kImmExceptionIsUnreachable);
+
+    return;

[Rodolph Perfetta (ARM), 2014/02/10 15:18:19]

not necessary.

[rmcilroy, 2014/02/10 16:18:33]

Actually, what I meant to do was fall through to the real hardware hlt if the
serializer was enabled.  Uploaded new patchset with this change.

+  }
 #else
   if (params & BREAK) {
     hlt(kImmExceptionIsDebug);
   }
 #endif
 }
 
 
 void Assembler::Logical(const Register& rd,
                         const Register& rn,
@@ skipping 689 matching lines @@
   // code.
 #ifdef ENABLE_DEBUGGER_SUPPORT
   RecordRelocInfo(RelocInfo::CONST_POOL, static_cast<intptr_t>(size));
 #endif
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64