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

Unified Diff: src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S

Issue 10978045: [MIPS] Use break instruction as NACL_HALT for MIPS. (Closed)
Patch Set: Reuse NACL_HALT_OPCODE in assembler. Created 8 years, 3 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
Index: src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S
diff --git a/src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S b/src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S
index c654ae8f86551db0345632bf1f0a5718af89283d..dec6d9dbde151c109c86ee034faf5ed8ef67c852 100644
--- a/src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S
+++ b/src/trusted/service_runtime/arch/mips/nacl_text_pad_test.S
@@ -4,12 +4,12 @@
* be found in the LICENSE file.
*/
+#include "native_client/src/trusted/service_runtime/arch/mips/sel_ldr_mips.h"
#include "native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h"
#include "native_client/src/trusted/service_runtime/nacl_config.h"
#define STORE_MASK $t7
#define JUMP_MASK $t6
-#define NACL_HALT 0x00000008 /*opcode for "jr $zero", Mips nacl halt*/
/*
* Code to test various address layout boundary conditions.
@@ -234,13 +234,15 @@ _start:
nop
#if defined(PNACL_AS)
-/* NOTE: unlike x86 the alignment directive on Mips takes
- the logarithm of the alignment */
+/*
+ * NOTE: unlike x86 the alignment directive on MIPS takes
+ * the logarithm of the alignment
+ */
#define POW2_BIGGER_THAN_DOT 14
- .align32 POW2_BIGGER_THAN_DOT, NACL_HALT
- .fill (TEXT_EXTEND - (1 << POW2_BIGGER_THAN_DOT))/4, 4, NACL_HALT
+ .align32 POW2_BIGGER_THAN_DOT, NACL_HALT_OPCODE
+ .fill (TEXT_EXTEND - (1 << POW2_BIGGER_THAN_DOT))/4, 4, NACL_HALT_OPCODE
#else
- .fill (TEXT_EXTEND - (. - start_of_text))/4, 4, NACL_HALT
+ .fill (TEXT_EXTEND - (. - start_of_text))/4, 4, NACL_HALT_OPCODE
#endif
end_of_text:
« no previous file with comments | « src/trusted/service_runtime/arch/mips/nacl_syscall.S ('k') | src/trusted/service_runtime/arch/mips/sel_ldr_mips.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698