diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2013-05-24 23:41:39 +0200 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2013-05-24 23:41:50 +0200 |
| commit | 2f56d471f089b8f514377ce501a0c1643652d639 (patch) | |
| tree | 3843be250e9d38e730b47743ae660bbc6d2d345d | |
| parent | ab6a96ef346220433f9f7967b763a0453d9cbc66 (diff) | |
| download | ffts-2f56d471f089b8f514377ce501a0c1643652d639.zip ffts-2f56d471f089b8f514377ce501a0c1643652d639.tar.gz | |
Merge some Nacl/ARM changes from https://github.com/igotti-google/mono/commit/65d8d68e8c81cf6adb1076de7a9425c84cab86a3.
| -rw-r--r-- | arm/arm-codegen.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arm/arm-codegen.h b/arm/arm-codegen.h index d94653e..5a3dba0 100644 --- a/arm/arm-codegen.h +++ b/arm/arm-codegen.h @@ -1031,7 +1031,11 @@ typedef struct { ARM_RORS_REG_COND(p, rd, rm, rs, ARMCOND_AL) #define ARM_RORS_REG_REG(p, rd, rm, rs) ARM_RORS_REG(p, rd, rm, rs) +#ifdef __native_client_codegen__ +#define ARM_DBRK(p) ARM_EMIT(p, 0xE7FEDEF0) +#else #define ARM_DBRK(p) ARM_EMIT(p, 0xE6000010) +#endif #define ARM_IASM_DBRK() ARM_IASM_EMIT(0xE6000010) #define ARM_INC(p, reg) ARM_ADD_REG_IMM8(p, reg, reg, 1) |
