pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compile would not work on RPI1/Zero due to JIT FPU sections not supported by that CPU.

Browse source
This commit is contained in:
Dimitris Panokostas 2018-02-05 21:57:52 +01:00
parent cdcb3eac63
commit 7dc7645fd2
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/jit/compemu_support.cpp
View file

@ -1342,7 +1342,7 @@ static int rmw(int r, int wsize, int rsize)
/******************************************************************** /********************************************************************
* FPU register status handling. EMIT TIME! * * FPU register status handling. EMIT TIME! *
********************************************************************/ ********************************************************************/
#ifdef USE_JIT_FPU
STATIC_INLINE void f_tomem_drop(int r) STATIC_INLINE void f_tomem_drop(int r)
{ {
if (live.fate[r].status == DIRTY) { if (live.fate[r].status == DIRTY) {
@ -1476,7 +1476,7 @@ static void fflags_into_flags_internal(void)
f_unlock(r); f_unlock(r);
live_flags(); live_flags();
} }
#endif
#if defined(CPU_arm) #if defined(CPU_arm)
#include "compemu_midfunc_arm.cpp" #include "compemu_midfunc_arm.cpp"
@ -1662,12 +1662,14 @@ void flush(int save_regs)
sync_m68k_pc(); /* mid level */ sync_m68k_pc(); /* mid level */
if (save_regs) { if (save_regs) {
#ifdef USE_JIT_FPU
for (i = 0; i < VFREGS; i++) { for (i = 0; i < VFREGS; i++) {
if (live.fate[i].needflush == NF_SCRATCH || if (live.fate[i].needflush == NF_SCRATCH ||
live.fate[i].status == CLEAN) { live.fate[i].status == CLEAN) {
f_disassociate(i); f_disassociate(i);
} }
} }
#endif
for (i=0; i<=FLAGTMP; i++) { for (i=0; i<=FLAGTMP; i++) {
switch(live.state[i].status) { switch(live.state[i].status) {
case INMEM: case INMEM:
@ -1688,11 +1690,13 @@ void flush(int save_regs)
break; break;
} }
} }
#ifdef USE_JIT_FPU
for (i = 0; i <= FP_RESULT; i++) { for (i = 0; i <= FP_RESULT; i++) {
if (live.fate[i].status == DIRTY) { if (live.fate[i].status == DIRTY) {
f_evict(i); f_evict(i);
} }
} }
#endif
} }
} }
@ -1710,8 +1714,9 @@ void freescratch(void)
for (i = S1; i < VREGS; i++) for (i = S1; i < VREGS; i++)
forget_about(i); forget_about(i);
#ifdef USE_JIT_FPU
f_forget_about(FS1); f_forget_about(FS1);
#endif
} }
/******************************************************************** /********************************************************************
@ -1745,10 +1750,12 @@ static void flush_all(void)
tomem(i); tomem(i);
} }
} }
#ifdef USE_JIT_FPU
if (f_isinreg(FP_RESULT)) if (f_isinreg(FP_RESULT))
f_evict(FP_RESULT); f_evict(FP_RESULT);
if (f_isinreg(FS1)) if (f_isinreg(FS1))
f_evict(FS1); f_evict(FS1);
#endif
} }
/* Make sure all registers that will get clobbered by a call are /* Make sure all registers that will get clobbered by a call are
@ -1769,11 +1776,11 @@ static void prepare_for_call_2(void)
if (!call_saved[i] && live.nat[i].nholds > 0) if (!call_saved[i] && live.nat[i].nholds > 0)
free_nreg(i); free_nreg(i);
} }
#ifdef USE_JIT_FPU
for (i = 6; i <= 7; i++) // only FP_RESULT and FS1, FP0-FP7 are call save for (i = 6; i <= 7; i++) // only FP_RESULT and FS1, FP0-FP7 are call save
if (live.fat[i].nholds > 0) if (live.fat[i].nholds > 0)
f_free_nreg(i); f_free_nreg(i);
#endif
live.flags_in_flags = TRASH; /* Note: We assume we already rescued the live.flags_in_flags = TRASH; /* Note: We assume we already rescued the
flags at the very start of the call_r flags at the very start of the call_r
functions! */ functions! */