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

Unified Diff: runtime/vm/simulator_arm64.cc

Issue 1682113002: Fix product build for 32-bit architectures, simulators and ARM64. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/simulator_arm.cc ('k') | runtime/vm/simulator_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_arm64.cc
diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc
index 8ab84559953b0b609636d15d015fcc2ca4c29218..7916d1848fdc4215c4e7df4b83dcdb7d7eef4207 100644
--- a/runtime/vm/simulator_arm64.cc
+++ b/runtime/vm/simulator_arm64.cc
@@ -425,7 +425,11 @@ void SimulatorDebugger::Debug() {
if (Simulator::IsIllegalAddress(last_pc)) {
OS::Print("pc is out of bounds: 0x%" Px "\n", last_pc);
} else {
- Disassembler::Disassemble(last_pc, last_pc + Instr::kInstrSize);
+ if (FLAG_support_disassembler) {
+ Disassembler::Disassemble(last_pc, last_pc + Instr::kInstrSize);
+ } else {
+ OS::Print("Disassembler not supported in this mode.\n");
+ }
}
}
char* line = ReadLine("sim> ");
@@ -597,7 +601,11 @@ void SimulatorDebugger::Debug() {
}
}
if ((start > 0) && (end > start)) {
- Disassembler::Disassemble(start, end);
+ if (FLAG_support_disassembler) {
+ Disassembler::Disassemble(start, end);
+ } else {
+ OS::Print("Disassembler not supported in this mode.\n");
+ }
} else {
OS::Print("disasm [<address> [<number_of_instructions>]]\n");
}
@@ -3364,7 +3372,11 @@ void Simulator::InstructionDecode(Instr* instr) {
OS::Print("%" Pu64 " ", icount_);
const uword start = reinterpret_cast<uword>(instr);
const uword end = start + Instr::kInstrSize;
- Disassembler::Disassemble(start, end);
+ if (FLAG_support_disassembler) {
+ Disassembler::Disassemble(start, end);
+ } else {
+ OS::Print("Disassembler not supported in this mode.\n");
+ }
}
if (instr->IsDPImmediateOp()) {
« no previous file with comments | « runtime/vm/simulator_arm.cc ('k') | runtime/vm/simulator_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698