Browse Source

ARM: Fix compilation of math.sinh/cosh/tanh.

Mike Pall 13 years ago
parent
commit
eec0d80d1b
2 changed files with 4 additions and 4 deletions
  1. 1 1
      src/lj_ffrecord.c
  2. 3 3
      src/lj_ircall.h

+ 1 - 1
src/lj_ffrecord.c

@@ -476,7 +476,7 @@ static void LJ_FASTCALL recff_math_atrig(jit_State *J, RecordFFData *rd)
 static void LJ_FASTCALL recff_math_htrig(jit_State *J, RecordFFData *rd)
 static void LJ_FASTCALL recff_math_htrig(jit_State *J, RecordFFData *rd)
 {
 {
   TRef tr = lj_ir_tonum(J, J->base[0]);
   TRef tr = lj_ir_tonum(J, J->base[0]);
-  J->base[0] = lj_ir_call(J, rd->data, tr);
+  J->base[0] = emitir(IRTN(IR_CALLN), tr, rd->data);
 }
 }
 
 
 static void LJ_FASTCALL recff_math_modf(jit_State *J, RecordFFData *rd)
 static void LJ_FASTCALL recff_math_modf(jit_State *J, RecordFFData *rd)

+ 3 - 3
src/lj_ircall.h

@@ -114,9 +114,9 @@ typedef struct CCallInfo {
   _(ANY,	lj_mem_newgco,		2,  FS, P32, CCI_L) \
   _(ANY,	lj_mem_newgco,		2,  FS, P32, CCI_L) \
   _(ANY,	lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \
   _(ANY,	lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \
   _(ANY,	lj_vm_modi,		2,  FN, INT, 0) \
   _(ANY,	lj_vm_modi,		2,  FN, INT, 0) \
-  _(ANY,	sinh,			1,  N, NUM, 0) \
-  _(ANY,	cosh,			1,  N, NUM, 0) \
-  _(ANY,	tanh,			1,  N, NUM, 0) \
+  _(ANY,	sinh,			ARG1_FP,  N, NUM, 0) \
+  _(ANY,	cosh,			ARG1_FP,  N, NUM, 0) \
+  _(ANY,	tanh,			ARG1_FP,  N, NUM, 0) \
   _(ANY,	fputc,			2,  S, INT, 0) \
   _(ANY,	fputc,			2,  S, INT, 0) \
   _(ANY,	fwrite,			4,  S, INT, 0) \
   _(ANY,	fwrite,			4,  S, INT, 0) \
   _(ANY,	fflush,			1,  S, INT, 0) \
   _(ANY,	fflush,			1,  S, INT, 0) \