From: Frode Solheim <frode@fs-uae.net>
Date: Mon, 7 Sep 2015 19:22:16 +0000 (+0200)
Subject: JIT: harmless changes in compemu_midfunc_x86
X-Git-Tag: 3200~70^2~23
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=cd7fa608d8c3840b5f35008aa3fb4ee72898f512;p=francis%2Fwinuae.git

JIT: harmless changes in compemu_midfunc_x86
---

diff --git a/jit/compemu_midfunc_x86.cpp b/jit/compemu_midfunc_x86.cpp
index d5fa8013..2b81787d 100644
--- a/jit/compemu_midfunc_x86.cpp
+++ b/jit/compemu_midfunc_x86.cpp
@@ -1148,9 +1148,6 @@ MIDFUNC(4,mov_b_mrr_indexed,(RR4 baser, RR4 index, IMM factor, RR1 s))
 MENDFUNC(4,mov_b_mrr_indexed,(RR4 baser, RR4 index, IMM factor, RR1 s))
 
 
-#ifdef UAE
-/* FIXME: These functions are unused */
-#else
 MIDFUNC(5,mov_l_bmrr_indexed,(IMM base, RR4 baser, RR4 index, IMM factor, RR4 s))
 {
     int basereg=baser;
@@ -1271,7 +1268,6 @@ MIDFUNC(5,mov_b_brrm_indexed,(W1 d, IMM base, RR4 baser, RR4 index, IMM factor))
     unlock2(index);
 }
 MENDFUNC(5,mov_b_brrm_indexed,(W1 d, IMM base, RR4 baser, RR4 index, IMM factor))
-#endif
 
 /* Read a long from base+4*index */
 MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, RR4 index))
diff --git a/jit/compemu_midfunc_x86.h b/jit/compemu_midfunc_x86.h
index ad138e5b..49083e6f 100644
--- a/jit/compemu_midfunc_x86.h
+++ b/jit/compemu_midfunc_x86.h
@@ -31,7 +31,6 @@
  *
  */
 
-/* What we expose to the outside */
 DECLARE_MIDFUNC(bt_l_ri(RR4 r, IMM i));
 DECLARE_MIDFUNC(bt_l_rr(RR4 r, RR4 b));
 DECLARE_MIDFUNC(btc_l_ri(RW4 r, IMM i));
@@ -78,8 +77,6 @@ DECLARE_MIDFUNC(shra_w_ri(RW2 r, IMM i));
 DECLARE_MIDFUNC(shra_b_ri(RW1 r, IMM i));
 DECLARE_MIDFUNC(setcc(W1 d, IMM cc));
 DECLARE_MIDFUNC(setcc_m(IMM d, IMM cc));
-DECLARE_MIDFUNC(cmov_b_rr(RW1 d, RR1 s, IMM cc));
-DECLARE_MIDFUNC(cmov_w_rr(RW2 d, RR2 s, IMM cc));
 DECLARE_MIDFUNC(cmov_l_rr(RW4 d, RR4 s, IMM cc));
 DECLARE_MIDFUNC(cmov_l_rm(RW4 d, IMM s, IMM cc));
 DECLARE_MIDFUNC(bsf_l_rr(W4 d, RR4 s));
@@ -107,7 +104,13 @@ DECLARE_MIDFUNC(mov_b_rrm_indexed(W1 d, RR4 baser, RR4 index, IMM factor));
 DECLARE_MIDFUNC(mov_l_mrr_indexed(RR4 baser, RR4 index, IMM factor, RR4 s));
 DECLARE_MIDFUNC(mov_w_mrr_indexed(RR4 baser, RR4 index, IMM factor, RR2 s));
 DECLARE_MIDFUNC(mov_b_mrr_indexed(RR4 baser, RR4 index, IMM factor, RR1 s));
+DECLARE_MIDFUNC(mov_l_bmrr_indexed(IMM base, RR4 baser, RR4 index, IMM factor, RR4 s));
+DECLARE_MIDFUNC(mov_w_bmrr_indexed(IMM base, RR4 baser, RR4 index, IMM factor, RR2 s));
+DECLARE_MIDFUNC(mov_b_bmrr_indexed(IMM base, RR4 baser, RR4 index, IMM factor, RR1 s));
 DECLARE_MIDFUNC(mov_l_rm_indexed(W4 d, IMM base, RR4 index));
+DECLARE_MIDFUNC(mov_w_brrm_indexed(W2 d, IMM base, RR4 baser, RR4 index, IMM factor));
+DECLARE_MIDFUNC(mov_b_brrm_indexed(W1 d, IMM base, RR4 baser, RR4 index, IMM factor));
+DECLARE_MIDFUNC(mov_l_rm_indexed(W4 d, IMM base, RR4 index, IMM factor));
 DECLARE_MIDFUNC(mov_l_rR(W4 d, RR4 s, IMM offset));
 DECLARE_MIDFUNC(mov_w_rR(W2 d, RR4 s, IMM offset));
 DECLARE_MIDFUNC(mov_b_rR(W1 d, RR4 s, IMM offset));
@@ -122,6 +125,7 @@ DECLARE_MIDFUNC(mov_w_Rr(RR4 d, RR2 s, IMM offset));
 DECLARE_MIDFUNC(mov_b_Rr(RR4 d, RR1 s, IMM offset));
 DECLARE_MIDFUNC(lea_l_brr(W4 d, RR4 s, IMM offset));
 DECLARE_MIDFUNC(lea_l_brr_indexed(W4 d, RR4 s, RR4 index, IMM factor, IMM offset));
+DECLARE_MIDFUNC(lea_l_rr_indexed(W4 d, RR4 s, RR4 index, IMM factor));
 DECLARE_MIDFUNC(mov_l_bRr(RR4 d, RR4 s, IMM offset));
 DECLARE_MIDFUNC(mov_w_bRr(RR4 d, RR2 s, IMM offset));
 DECLARE_MIDFUNC(mov_b_bRr(RR4 d, RR1 s, IMM offset));
@@ -186,8 +190,6 @@ DECLARE_MIDFUNC(end_needflags(void));
 DECLARE_MIDFUNC(make_flags_live(void));
 DECLARE_MIDFUNC(call_r_11(RR4 r, W4 out1, RR4 in1, IMM osize, IMM isize));
 DECLARE_MIDFUNC(call_r_02(RR4 r, RR4 in1, RR4 in2, IMM isize1, IMM isize2));
-DECLARE_MIDFUNC(readmem_new(RR4 address, W4 dest, IMM offset, IMM size, W4 tmp));
-DECLARE_MIDFUNC(writemem_new(RR4 address, RR4 source, IMM offset, IMM size, W4 tmp));
 DECLARE_MIDFUNC(forget_about(W4 r));
 DECLARE_MIDFUNC(nop(void));