diff options
| author | 2017-12-01 16:10:19 +0000 | |
|---|---|---|
| committer | 2017-12-01 16:10:19 +0000 | |
| commit | d40e416f329fa7d7a3ad9cf1bcfbc5eb8137cbc4 (patch) | |
| tree | c016c5a8099dbb948609119551387018c3fce562 | |
| parent | f8054b5c04e1052a14b391e2dd615825852042c1 (diff) | |
| parent | 54149772111907eb88a6c74b0cbb43c51c503a6b (diff) | |
Merge "Fix MIPS32 mterp"
| -rw-r--r-- | runtime/interpreter/mterp/mips/entry.S | 1 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/mips/footer.S | 1 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/mips/header.S | 2 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/out/mterp_mips.S | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/runtime/interpreter/mterp/mips/entry.S b/runtime/interpreter/mterp/mips/entry.S index 3908cb506e..41b5d5650d 100644 --- a/runtime/interpreter/mterp/mips/entry.S +++ b/runtime/interpreter/mterp/mips/entry.S @@ -32,6 +32,7 @@ */ ExecuteMterpImpl: + .cfi_startproc .set noreorder .cpload t9 .set reorder diff --git a/runtime/interpreter/mterp/mips/footer.S b/runtime/interpreter/mterp/mips/footer.S index 6e1ba1c882..1c784ef188 100644 --- a/runtime/interpreter/mterp/mips/footer.S +++ b/runtime/interpreter/mterp/mips/footer.S @@ -284,4 +284,5 @@ MterpProfileActive: STACK_LOAD_FULL() jalr zero, ra + .cfi_endproc .end ExecuteMterpImpl diff --git a/runtime/interpreter/mterp/mips/header.S b/runtime/interpreter/mterp/mips/header.S index 1ccaa6443f..0f7a6f1116 100644 --- a/runtime/interpreter/mterp/mips/header.S +++ b/runtime/interpreter/mterp/mips/header.S @@ -32,7 +32,7 @@ */ #include "asm_support.h" -#include "interpreter/mterp/cfi_asm_support.S" +#include "interpreter/mterp/cfi_asm_support.h" #if (__mips==32) && (__mips_isa_rev>=2) #define MIPS32REVGE2 /* mips32r2 and greater */ diff --git a/runtime/interpreter/mterp/out/mterp_mips.S b/runtime/interpreter/mterp/out/mterp_mips.S index 9535e254e7..1687afa58a 100644 --- a/runtime/interpreter/mterp/out/mterp_mips.S +++ b/runtime/interpreter/mterp/out/mterp_mips.S @@ -39,7 +39,7 @@ */ #include "asm_support.h" -#include "interpreter/mterp/cfi_asm_support.S" +#include "interpreter/mterp/cfi_asm_support.h" #if (__mips==32) && (__mips_isa_rev>=2) #define MIPS32REVGE2 /* mips32r2 and greater */ @@ -766,6 +766,7 @@ */ ExecuteMterpImpl: + .cfi_startproc .set noreorder .cpload t9 .set reorder @@ -12844,5 +12845,6 @@ MterpProfileActive: STACK_LOAD_FULL() jalr zero, ra + .cfi_endproc .end ExecuteMterpImpl |