diff options
| author | Jo Shields <directhex@apebox.org> | 2013-11-15 00:02:53 +0000 |
|---|---|---|
| committer | Jo Shields <directhex@apebox.org> | 2013-11-15 00:02:53 +0000 |
| commit | b54e524cf566d25a73f396b584f7e7c0cb758c25 (patch) | |
| tree | fc71dd8cffce43564c1b72896561f5eb66b0e3bc | |
| parent | 2b7198ee04e0b52d6a3bb69f7eaea60e470cac21 (diff) | |
| parent | 8a07907bddd89c341dc0feb43471b0275af60144 (diff) | |
| download | mono-b54e524cf566d25a73f396b584f7e7c0cb758c25.tar.gz | |
Merge branch 'master-experimental-patches/avoid_nop_instruction_on_mips' into master-experimental
| -rw-r--r-- | mono/arch/mips/mips-codegen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mono/arch/mips/mips-codegen.h b/mono/arch/mips/mips-codegen.h index dc4df7d8a6..1dbd1c6e27 100644 --- a/mono/arch/mips/mips-codegen.h +++ b/mono/arch/mips/mips-codegen.h @@ -334,7 +334,7 @@ enum { /* misc and coprocessor ops */ #define mips_move(c,dest,src) mips_addu(c,dest,src,mips_zero) #define mips_dmove(c,dest,src) mips_daddu(c,dest,src,mips_zero) -#define mips_nop(c) mips_sll(c,0,0,0) +#define mips_nop(c) mips_or(c,mips_at,mips_at,0) #define mips_break(c,code) mips_emit32(c, ((code)<<6)|13) #define mips_mfhi(c,dest) mips_format_r(c,0,0,0,dest,0,16) #define mips_mflo(c,dest) mips_format_r(c,0,0,0,dest,0,18) |