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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/trusted/debug_stub/abi.cc

Issue 11194045: Change BKPT and UDF encodings on ARM. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Clarify comments. Fix unaligned_data_irt.nexe, it had a hard-coded BKPT #0x7777. Created 8 years, 2 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
« src/include/arm_sandbox.h ('K') | « src/include/nacl_macros.h ('k') | src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/debug_stub/abi.cc
diff --git a/src/trusted/debug_stub/abi.cc b/src/trusted/debug_stub/abi.cc
index b12d89e862ae0ff1dbe702bde81f47ed0af69977..adba01d715dbe938b7d67fb5b6190a46fec54ecd 100644
--- a/src/trusted/debug_stub/abi.cc
+++ b/src/trusted/debug_stub/abi.cc
@@ -9,6 +9,7 @@
#include <map>
#include <string>
+#include "native_client/src/include/arm_sandbox.h"
#include "native_client/src/shared/platform/nacl_log.h"
#include "native_client/src/trusted/debug_stub/abi.h"
#include "native_client/src/trusted/debug_stub/platform.h"
@@ -129,7 +130,7 @@ static Abi::BPDef breakpoint_x86 = {
breakpoint_code_x86
};
-static uint32_t breakpoint_code_arm[] = { 0xe1277777 /* bkpt 0x7777 */ };
+static uint32_t breakpoint_code_arm[] = { NACL_INSTR_BREAKPOINT };
static Abi::BPDef breakpoint_arm = {
sizeof(breakpoint_code_arm),
(uint8_t *) breakpoint_code_arm
« src/include/arm_sandbox.h ('K') | « src/include/nacl_macros.h ('k') | src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698