From 355d4d1c00e708907ff391c24ca708f1c9c06bf0 Mon Sep 17 00:00:00 2001 From: Pavel Dovgalyuk Date: Wed, 18 Apr 2018 09:41:53 +0300 Subject: [PATCH 1/4] m68k: fix subx mem, mem instruction This patch fixes decrement of the pointers for subx mem, mem instructions. Without the patch pointers are decremented by OS_* constant value instead of retrieving the corresponding data size and using it as a decrement. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Laurent Vivier Message-Id: <20180418064152.24606.71975.stgit@pasha-VirtualBox> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 6beaf9ed66..e407ba2db3 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -3166,11 +3166,11 @@ DISAS_INSN(subx_mem) opsize = insn_opsize(insn); addr_src = AREG(insn, 0); - tcg_gen_subi_i32(addr_src, addr_src, opsize); + tcg_gen_subi_i32(addr_src, addr_src, opsize_bytes(opsize)); src = gen_load(s, opsize, addr_src, 1, IS_USER(s)); addr_dest = AREG(insn, 9); - tcg_gen_subi_i32(addr_dest, addr_dest, opsize); + tcg_gen_subi_i32(addr_dest, addr_dest, opsize_bytes(opsize)); dest = gen_load(s, opsize, addr_dest, 1, IS_USER(s)); gen_subx(s, src, dest, opsize); From 981348af5c3c72335d95f6877abf702d80176eb3 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Mon, 30 Apr 2018 19:01:55 +0200 Subject: [PATCH 2/4] m68k: Fix floatx80_lognp1 (Coverity CID1390587) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit return the result of packFloatx80() instead of dropping it. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20180430170156.1860-1-laurent@vivier.eu> --- target/m68k/softfloat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/m68k/softfloat.c b/target/m68k/softfloat.c index dffb371c71..2c069a5efb 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -334,7 +334,8 @@ floatx80 floatx80_lognp1(floatx80 a, float_status *status) if (aSign && aExp >= one_exp) { if (aExp == one_exp && aSig == one_sig) { float_raise(float_flag_divbyzero, status); - packFloatx80(aSign, floatx80_infinity.high, floatx80_infinity.low); + return packFloatx80(aSign, floatx80_infinity.high, + floatx80_infinity.low); } float_raise(float_flag_invalid, status); return floatx80_default_nan(status); From 6361d2984ce88912976a34e1797a5ad5139c649b Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Mon, 30 Apr 2018 19:01:56 +0200 Subject: [PATCH 3/4] m68k: remove dead code (Coverity CID1390617) floatx80_sin() and floatx80_cos() are derived from one sincos() function. They have both unused code coming from their common origin. Remove it. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Message-Id: <20180430170156.1860-2-laurent@vivier.eu> --- target/m68k/softfloat.c | 43 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/target/m68k/softfloat.c b/target/m68k/softfloat.c index 2c069a5efb..e41b07d042 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -1497,7 +1497,7 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) int32_t compact, l, n, j; floatx80 fp0, fp1, fp2, fp3, fp4, fp5, x, invtwopi, twopi1, twopi2; float32 posneg1, twoto63; - flag adjn, endflag; + flag endflag; aSig = extractFloatx80Frac(a); aExp = extractFloatx80Exp(a); @@ -1515,8 +1515,6 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) return packFloatx80(aSign, 0, 0); } - adjn = 0; - user_rnd_mode = status->float_rounding_mode; user_rnd_prec = status->floatx80_rounding_precision; status->float_rounding_mode = float_round_nearest_even; @@ -1591,14 +1589,8 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) status->float_rounding_mode = user_rnd_mode; status->floatx80_rounding_precision = user_rnd_prec; - if (adjn) { - /* COSTINY */ - a = floatx80_sub(fp0, float32_to_floatx80( - make_float32(0x00800000), status), status); - } else { - /* SINTINY */ - a = floatx80_move(a, status); - } + /* SINTINY */ + a = floatx80_move(a, status); float_raise(float_flag_inexact, status); return a; @@ -1616,7 +1608,7 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) status); /* FP0 IS R = (X-Y1)-Y2 */ sincont: - if ((n + adjn) & 1) { + if (n & 1) { /* COSPOLY */ fp0 = floatx80_mul(fp0, fp0, status); /* FP0 IS S */ fp1 = floatx80_mul(fp0, fp0, status); /* FP1 IS T */ @@ -1629,7 +1621,7 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) xExp = extractFloatx80Exp(fp0); xSig = extractFloatx80Frac(fp0); - if (((n + adjn) >> 1) & 1) { + if ((n >> 1) & 1) { xSign ^= 1; posneg1 = make_float32(0xBF800000); /* -1 */ } else { @@ -1681,7 +1673,7 @@ floatx80 floatx80_sin(floatx80 a, float_status *status) xExp = extractFloatx80Exp(fp0); xSig = extractFloatx80Frac(fp0); - xSign ^= ((n + adjn) >> 1) & 1; /* X IS NOW R'= SGN*R */ + xSign ^= (n >> 1) & 1; /* X IS NOW R'= SGN*R */ fp0 = floatx80_mul(fp0, fp0, status); /* FP0 IS S */ fp1 = floatx80_mul(fp0, fp0, status); /* FP1 IS T */ @@ -1744,7 +1736,7 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) int32_t compact, l, n, j; floatx80 fp0, fp1, fp2, fp3, fp4, fp5, x, invtwopi, twopi1, twopi2; float32 posneg1, twoto63; - flag adjn, endflag; + flag endflag; aSig = extractFloatx80Frac(a); aExp = extractFloatx80Exp(a); @@ -1762,8 +1754,6 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) return packFloatx80(0, one_exp, one_sig); } - adjn = 1; - user_rnd_mode = status->float_rounding_mode; user_rnd_prec = status->floatx80_rounding_precision; status->float_rounding_mode = float_round_nearest_even; @@ -1837,15 +1827,10 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) status->float_rounding_mode = user_rnd_mode; status->floatx80_rounding_precision = user_rnd_prec; - if (adjn) { - /* COSTINY */ - a = floatx80_sub(fp0, float32_to_floatx80( - make_float32(0x00800000), status), - status); - } else { - /* SINTINY */ - a = floatx80_move(a, status); - } + /* COSTINY */ + a = floatx80_sub(fp0, float32_to_floatx80( + make_float32(0x00800000), status), + status); float_raise(float_flag_inexact, status); return a; @@ -1863,7 +1848,7 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) status); /* FP0 IS R = (X-Y1)-Y2 */ sincont: - if ((n + adjn) & 1) { + if ((n + 1) & 1) { /* COSPOLY */ fp0 = floatx80_mul(fp0, fp0, status); /* FP0 IS S */ fp1 = floatx80_mul(fp0, fp0, status); /* FP1 IS T */ @@ -1876,7 +1861,7 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) xExp = extractFloatx80Exp(fp0); xSig = extractFloatx80Frac(fp0); - if (((n + adjn) >> 1) & 1) { + if (((n + 1) >> 1) & 1) { xSign ^= 1; posneg1 = make_float32(0xBF800000); /* -1 */ } else { @@ -1927,7 +1912,7 @@ floatx80 floatx80_cos(floatx80 a, float_status *status) xExp = extractFloatx80Exp(fp0); xSig = extractFloatx80Frac(fp0); - xSign ^= ((n + adjn) >> 1) & 1; /* X IS NOW R'= SGN*R */ + xSign ^= ((n + 1) >> 1) & 1; /* X IS NOW R'= SGN*R */ fp0 = floatx80_mul(fp0, fp0, status); /* FP0 IS S */ fp1 = floatx80_mul(fp0, fp0, status); /* FP1 IS T */ From 83dc62f6ed6b4f2afce71d579a630441cca0957c Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Sun, 29 Apr 2018 09:40:02 +0200 Subject: [PATCH 4/4] hw/m68k/mcf5208: Fix trivial typo in board description It's the MCF5208 evaluation board, not the MCF5206 eval board. Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier Message-Id: <20180429094002.3293c9de@thl530.multi.box> Signed-off-by: Laurent Vivier --- hw/m68k/mcf5208.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 7aca58542e..ae3dcc98c3 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -315,7 +315,7 @@ static void mcf5208evb_init(MachineState *machine) static void mcf5208evb_machine_init(MachineClass *mc) { - mc->desc = "MCF5206EVB"; + mc->desc = "MCF5208EVB"; mc->init = mcf5208evb_init; mc->is_default = 1; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208");