fix enum mismatch in ARM JIT

Also, recognize `__ARM_ARCH_6ZK__`.
This commit is contained in:
Matthew Flatt 2015-08-11 14:34:51 -06:00
parent b16f0b24b7
commit 820ab7126c
3 changed files with 3 additions and 3 deletions

View File

@ -124,7 +124,7 @@ typedef enum {
# define JIT_ARM_THUMB 1
# define JIT_ARM_VERSION 5
# define JIT_ARM_EXTENDED 1
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__)
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
# define JIT_ARM_VERSION 6
#elif defined(__ARM_ARCH_6T__) || defined(__ARM_ARCH_6T2__)
# define JIT_ARM_THUMB 2

View File

@ -570,7 +570,7 @@ swf_iff(jit_state_t _jitp, int (*i0)(float, float),
__jit_inline void
swf_idd(jit_state_t _jitp, int (*i0)(double, double),
jit_fpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
{
int l;
l = 0xf;

View File

@ -420,7 +420,7 @@ _vcmp_10_f(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
}
__jit_inline void
_vcmp_10_d(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_gpr_t r1, jit_gpr_t r2)
_vcmp_10_d(jit_state_t _jitp, int cc, jit_gpr_t r0, jit_fpr_t r1, jit_fpr_t r2)
{
_VCMP_F64(r1, r2);
_vcmp10_x(_jitp, cc, r0);