A64: Hardwire the decoder and the simulator

src/a64/simulator-a64.h

 // 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
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 177 matching lines @@
 };
 typedef SimRegisterBase<kXRegSizeInBytes> SimRegister;      // r0-r31
 typedef SimRegisterBase<kDRegSizeInBytes> SimFPRegister;    // v0-v31
 
 
 class Simulator : public DecoderVisitor {
  public:
   explicit Simulator(Decoder<DispatchingDecoderVisitor>* decoder,
                      Isolate* isolate = NULL,
                      FILE* stream = stderr);
+  Simulator();
   ~Simulator();
 
   // System functions.
 
   static void Initialize(Isolate* isolate);
 
   static Simulator* current(v8::internal::Isolate* isolate);
 
   class CallArgument;
 
@@ skipping 119 matching lines @@
   Instruction* pc() { return pc_; }
 
   void increment_pc() {
     if (!pc_modified_) {
       pc_ = pc_->NextInstruction();
     }
 
     pc_modified_ = false;
   }
 
+  virtual void Decode(Instruction* instr) {
+    decoder_->Decode(instr);
+  }
+
   void ExecuteInstruction() {
     ASSERT(IsAligned(reinterpret_cast<uintptr_t>(pc_), kInstructionSize));
     CheckBreakNext();
-    decoder_->Decode(pc_);
+    Decode(pc_);
     LogProcessorState();
     increment_pc();
     CheckBreakpoints();
   }
 
   // Declare all Visitor functions.
   #define DECLARE(A)  void Visit##A(Instruction* instr);
   VISITOR_LIST(DECLARE)
   #undef DECLARE
 
@@ skipping 224 matching lines @@
     LogSystemRegisters();
     LogRegisters();
     LogFPRegisters();
   }
   void LogWrite(uint8_t* address, uint64_t value, unsigned num_bytes) {
     if (log_parameters_ & LOG_WRITE) PrintWrite(address, value, num_bytes);
   }
 
   int log_parameters() { return log_parameters_; }
   void set_log_parameters(int new_parameters) {
+    log_parameters_ = new_parameters;
+    if (!decoder_) {
+      if (new_parameters & LOG_DISASM) {
+        PrintF("Run --debug-sim to dynamically turn on disassembler\n");
+      }
+      return;
+    }
     if (new_parameters & LOG_DISASM) {
       decoder_->InsertVisitorBefore(print_disasm_, this);
     } else {
       decoder_->RemoveVisitor(print_disasm_);
     }
-    log_parameters_ = new_parameters;
   }
 
   static inline const char* WRegNameForCode(unsigned code,
       Reg31Mode mode = Reg31IsZeroRegister);
   static inline const char* XRegNameForCode(unsigned code,
       Reg31Mode mode = Reg31IsZeroRegister);
   static inline const char* SRegNameForCode(unsigned code);
   static inline const char* DRegNameForCode(unsigned code);
   static inline const char* VRegNameForCode(unsigned code);
   static inline int CodeFromName(const char* name);
@@ skipping 211 matching lines @@
 
   // Debugger input.
   void set_last_debugger_input(char* input) {
     DeleteArray(last_debugger_input_);
     last_debugger_input_ = input;
   }
   char* last_debugger_input() { return last_debugger_input_; }
   char* last_debugger_input_;
 
  private:
+  void Init(FILE* stream);
+
   int  log_parameters_;
   Isolate* isolate_;
 };
 
 
 // When running with the simulator transition into simulated execution at this
 // point.
 #define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \
   reinterpret_cast<Object*>(Simulator::current(Isolate::Current())->CallJS(    \
       FUNCTION_ADDR(entry),                                                    \
@@ skipping 27 matching lines @@
   static void UnregisterCTryCatch() {
     Simulator::current(Isolate::Current())->PopAddress();
   }
 };
 
 #endif  // !defined(USE_SIMULATOR)
 
 } }  // namespace v8::internal
 
 #endif  // V8_A64_SIMULATOR_A64_H_