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..9f625b03ec86dc41e339de32b406cd8c03e0dcfe 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 |
@@ -9,7 +9,7 @@ |
#define STORE_MASK $t7 |
#define JUMP_MASK $t6 |
-#define NACL_HALT 0x00000008 /*opcode for "jr $zero", Mips nacl halt*/ |
+#define NACL_HALT 0x0000000D /* opcode for "break", MIPS nacl halt */ |
Mark Seaborn
2012/09/26 16:59:24
You could reuse NACL_HALT_OPCODE rather than dupli
petarj
2012/09/28 17:55:02
Done. You may want to do the same in ARM code.
|
/* |
* Code to test various address layout boundary conditions. |
@@ -234,8 +234,10 @@ _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 |