OLD | NEW |
1 // Copyright 2010 the V8 project authors. All rights reserved. | 1 // Copyright 2010 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 | 146 |
147 void Debugger::Stop(Instr* instr) { | 147 void Debugger::Stop(Instr* instr) { |
148 // Get the stop code. | 148 // Get the stop code. |
149 uint32_t code = instr->SvcField() & kStopCodeMask; | 149 uint32_t code = instr->SvcField() & kStopCodeMask; |
150 // Retrieve the encoded address, which comes just after this stop. | 150 // Retrieve the encoded address, which comes just after this stop. |
151 char* msg = *reinterpret_cast<char**>(sim_->get_pc() + Instr::kInstrSize); | 151 char* msg = *reinterpret_cast<char**>(sim_->get_pc() + Instr::kInstrSize); |
152 // Update this stop description. | 152 // Update this stop description. |
153 if (sim_->isWatchedStop(code) && !sim_->watched_stops[code].desc) { | 153 if (sim_->isWatchedStop(code) && !sim_->watched_stops[code].desc) { |
154 sim_->watched_stops[code].desc = msg; | 154 sim_->watched_stops[code].desc = msg; |
155 } | 155 } |
156 PrintF("Simulator hit %s\n", msg); | 156 // Print the stop message and code if it is not the default code. |
| 157 if (code != kMaxStopCode) { |
| 158 PrintF("Simulator hit stop %u: %s\n", code, msg); |
| 159 } else { |
| 160 PrintF("Simulator hit %s\n", msg); |
| 161 } |
157 sim_->set_pc(sim_->get_pc() + 2 * Instr::kInstrSize); | 162 sim_->set_pc(sim_->get_pc() + 2 * Instr::kInstrSize); |
158 Debug(); | 163 Debug(); |
159 } | 164 } |
160 #endif | 165 #endif |
161 | 166 |
162 | 167 |
163 int32_t Debugger::GetRegisterValue(int regnum) { | 168 int32_t Debugger::GetRegisterValue(int regnum) { |
164 if (regnum == kPCRegister) { | 169 if (regnum == kPCRegister) { |
165 return sim_->get_pc(); | 170 return sim_->get_pc(); |
166 } else { | 171 } else { |
(...skipping 2879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3046 uintptr_t address = *stack_slot; | 3051 uintptr_t address = *stack_slot; |
3047 set_register(sp, current_sp + sizeof(uintptr_t)); | 3052 set_register(sp, current_sp + sizeof(uintptr_t)); |
3048 return address; | 3053 return address; |
3049 } | 3054 } |
3050 | 3055 |
3051 } } // namespace assembler::arm | 3056 } } // namespace assembler::arm |
3052 | 3057 |
3053 #endif // USE_SIMULATOR | 3058 #endif // USE_SIMULATOR |
3054 | 3059 |
3055 #endif // V8_TARGET_ARCH_ARM | 3060 #endif // V8_TARGET_ARCH_ARM |
OLD | NEW |