Message ID | 20180902003322.3428-4-pavel.zbitskiy@gmail.com |
---|---|
State | New |
Headers | show |
Series | Some improvements in z/Arch instructions support | expand |
Am 02.09.18 um 02:33 schrieb Pavel Zbitskiy: > Convert to Binary - counterparts of the already implemented Convert > to Decimal (CVD*) instructions. > Example from the Principles of Operation: 25594C becomes 63FA. > > Signed-off-by: Pavel Zbitskiy <pavel.zbitskiy@gmail.com> > --- > target/s390x/helper.h | 1 + > target/s390x/insn-data.def | 4 +++ > target/s390x/int_helper.c | 52 +++++++++++++++++++++++++++++++++ > target/s390x/translate.c | 11 +++++++ > tests/tcg/s390x/Makefile.target | 1 + > tests/tcg/s390x/cvb.c | 18 ++++++++++++ > 6 files changed, 87 insertions(+) > create mode 100644 tests/tcg/s390x/cvb.c > > diff --git a/target/s390x/helper.h b/target/s390x/helper.h > index 97c60ca7bc..46baaee0ab 100644 > --- a/target/s390x/helper.h > +++ b/target/s390x/helper.h > @@ -88,6 +88,7 @@ DEF_HELPER_FLAGS_4(tcxb, TCG_CALL_NO_RWG_SE, i32, env, i64, i64, i64) > DEF_HELPER_FLAGS_2(sqeb, TCG_CALL_NO_WG, i64, env, i64) > DEF_HELPER_FLAGS_2(sqdb, TCG_CALL_NO_WG, i64, env, i64) > DEF_HELPER_FLAGS_3(sqxb, TCG_CALL_NO_WG, i64, env, i64, i64) > +DEF_HELPER_FLAGS_3(cvb, TCG_CALL_NO_WG, i64, env, i64, i32) > DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32) > DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64) > DEF_HELPER_FLAGS_4(pka, TCG_CALL_NO_WG, void, env, i64, i64, i32) > diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def > index 9c7b434fca..0911180ca6 100644 > --- a/target/s390x/insn-data.def > +++ b/target/s390x/insn-data.def > @@ -284,6 +284,10 @@ > D(0xec73, CLFIT, RIE_a, GIE, r1_32u, i2_32u, 0, 0, ct, 0, 1) > D(0xec71, CLGIT, RIE_a, GIE, r1_o, i2_32u, 0, 0, ct, 0, 1) > > +/* CONVERT TO BINARY */ > + C(0x4f00, CVB, RX_a, Z, la2, 0, new, r1_32, cvb, 0) > + C(0xe306, CVBY, RXY_a, LD, la2, 0, new, r1_32, cvb, 0) > + C(0xe30e, CVBG, RXY_a, Z, la2, 0, r1, 0, cvb, 0) This has to be r1_o, no? (otherwise the value is never actually written to r1, but only to a copy). However, I guess we should write the result directly from the HELPER(cvb) - due to the fixed-point-divide exception checks. So pass to the helper the register number instead. > /* CONVERT TO DECIMAL */ > C(0x4e00, CVD, RX_a, Z, r1_o, a2, 0, 0, cvd, 0) > C(0xe326, CVDY, RXY_a, LD, r1_o, a2, 0, 0, cvd, 0) > diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c > index abf77a94e6..3b12c11cee 100644 > --- a/target/s390x/int_helper.c > +++ b/target/s390x/int_helper.c > @@ -24,6 +24,7 @@ > #include "exec/exec-all.h" > #include "qemu/host-utils.h" > #include "exec/helper-proto.h" > +#include "exec/cpu_ldst.h" > > /* #define DEBUG_HELPER */ > #ifdef DEBUG_HELPER > @@ -118,6 +119,57 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, > return ret; > } > > +static void general_operand_exception(CPUS390XState *env, uintptr_t ra) > +{ > +#ifndef CONFIG_USER_ONLY > + LowCore *lowcore; > + > + lowcore = cpu_map_lowcore(env); > + lowcore->data_exc_code = 0; > + cpu_unmap_lowcore(lowcore); > +#endif > + s390_program_interrupt(env, PGM_DATA, ILEN_AUTO, ra); Have a look at http://patchwork.ozlabs.org/patch/963846/ Once that is merged (soon), you can make use of tcg_s390_data_exception(), which will also take care of storing the dxc into the FPC poperly. > +} > + > +uint64_t HELPER(cvb)(CPUS390XState *env, uint64_t src, uint32_t n) > +{ > + int i, j; > + uint64_t tmpsrc; > + const uintptr_t ra = GETPC(); > + int64_t dec, sign = 0, digit, val = 0, pow10 = 0; > + > + for (i = 0; i < n; i++) { > + tmpsrc = wrap_address(env, src + (n - i - 1) * 8); > + dec = cpu_ldq_data_ra(env, tmpsrc, ra); > + for (j = 0; j < 16; j++, dec >>= 4) { > + if (i == 0 && j == 0) { > + sign = dec & 0xf; > + if (sign < 0xa) { > + general_operand_exception(env, ra); > + } > + continue; > + } > + digit = dec & 0xf; > + if (digit > 0x9) { > + general_operand_exception(env, ra); > + } > + if (i == 0 && j == 1) { > + if (sign == 0xb || sign == 0xd) { > + val = -digit; > + pow10 = -10; > + } else { > + val = digit; > + pow10 = 10; > + } > + } else { > + val += digit * pow10; > + pow10 *= 10; > + } > + } > + } > + return val; We are missing the fixed-point-divide exception checks. For n==1, the valid range is -2,147,483,648 - 2,147,483,647. So in case our number no longer fits into 32bit (excluding sign extension), we have to trigger that. Guess it could be something like this (please verify): /* store the result before triggering fix-point-divide */ if (n ==1) { env->regs[reg] &= 0xfff... env->regs[reg] |= val & 0xfff... } else { env->regs[reg] = val; } if (n == 1 && (int64_t)(int32_t) val != val) { // trigger fix-point-divide } For n == 2, it might be sufficient to check for an overflow, so if the sign of val suddenly toggles. This could maybe be checked also for n==1, as it should not matter. Also, I wonder if it would make sense to split up 32bit and 64bit. > +} > + > uint64_t HELPER(cvd)(int32_t reg) > { > /* positive 0 */ > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index 59b1e5893c..c709184a03 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/translate.c > @@ -2114,6 +2114,17 @@ static DisasJumpType op_csp(DisasContext *s, DisasOps *o) > } > #endif > > +static DisasJumpType op_cvb(DisasContext *s, DisasOps *o) > +{ > + bool g = (s->fields->op == 0xE3) && (s->fields->op2 == 0x0E); you could make this const, also checking against the latter is sufficient as of now. > + int32_t n = g ? 2 /* CVBG */ : 1 /* CVB, CVBY */; > + TCGv_i32 tmp = tcg_const_i32(n); What about: const bool is_cvbg = s->fields->op2 == 0x0E TCGv_i32 n = tcg_const_i32(is_cvbg ? 2 : 1); > + > + gen_helper_cvb(o->out, cpu_env, o->addr1, tmp); > + tcg_temp_free_i32(tmp); > + return DISAS_NEXT; > +} > + > static DisasJumpType op_cvd(DisasContext *s, DisasOps *o) > { > TCGv_i64 t1 = tcg_temp_new_i64(); > diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target > index 151dc075aa..990dfb26ff 100644 > --- a/tests/tcg/s390x/Makefile.target > +++ b/tests/tcg/s390x/Makefile.target > @@ -6,3 +6,4 @@ TESTS+=ipm > TESTS+=exrl-trt > TESTS+=exrl-trtr > TESTS+=pack > +TESTS+=cvb > diff --git a/tests/tcg/s390x/cvb.c b/tests/tcg/s390x/cvb.c > new file mode 100644 > index 0000000000..3a72e132aa > --- /dev/null > +++ b/tests/tcg/s390x/cvb.c > @@ -0,0 +1,18 @@ > +#include <stdint.h> > +#include <unistd.h> > + > +int main(void) > +{ > + uint64_t data = 0x000000000025594cull; > + uint64_t result = 0; > + > + asm volatile( > + " cvb %[result],%[data]\n" > + : [result] "+r" (result) > + : [data] "m" (data)); > + if (result != 0x63fa) { > + write(1, "bad result\n", 11); > + return 1; > + } > + return 0; > +} >
diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 97c60ca7bc..46baaee0ab 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -88,6 +88,7 @@ DEF_HELPER_FLAGS_4(tcxb, TCG_CALL_NO_RWG_SE, i32, env, i64, i64, i64) DEF_HELPER_FLAGS_2(sqeb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqdb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(sqxb, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(cvb, TCG_CALL_NO_WG, i64, env, i64, i32) DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32) DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(pka, TCG_CALL_NO_WG, void, env, i64, i64, i32) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 9c7b434fca..0911180ca6 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -284,6 +284,10 @@ D(0xec73, CLFIT, RIE_a, GIE, r1_32u, i2_32u, 0, 0, ct, 0, 1) D(0xec71, CLGIT, RIE_a, GIE, r1_o, i2_32u, 0, 0, ct, 0, 1) +/* CONVERT TO BINARY */ + C(0x4f00, CVB, RX_a, Z, la2, 0, new, r1_32, cvb, 0) + C(0xe306, CVBY, RXY_a, LD, la2, 0, new, r1_32, cvb, 0) + C(0xe30e, CVBG, RXY_a, Z, la2, 0, r1, 0, cvb, 0) /* CONVERT TO DECIMAL */ C(0x4e00, CVD, RX_a, Z, r1_o, a2, 0, 0, cvd, 0) C(0xe326, CVDY, RXY_a, LD, r1_o, a2, 0, 0, cvd, 0) diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c index abf77a94e6..3b12c11cee 100644 --- a/target/s390x/int_helper.c +++ b/target/s390x/int_helper.c @@ -24,6 +24,7 @@ #include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" +#include "exec/cpu_ldst.h" /* #define DEBUG_HELPER */ #ifdef DEBUG_HELPER @@ -118,6 +119,57 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, return ret; } +static void general_operand_exception(CPUS390XState *env, uintptr_t ra) +{ +#ifndef CONFIG_USER_ONLY + LowCore *lowcore; + + lowcore = cpu_map_lowcore(env); + lowcore->data_exc_code = 0; + cpu_unmap_lowcore(lowcore); +#endif + s390_program_interrupt(env, PGM_DATA, ILEN_AUTO, ra); +} + +uint64_t HELPER(cvb)(CPUS390XState *env, uint64_t src, uint32_t n) +{ + int i, j; + uint64_t tmpsrc; + const uintptr_t ra = GETPC(); + int64_t dec, sign = 0, digit, val = 0, pow10 = 0; + + for (i = 0; i < n; i++) { + tmpsrc = wrap_address(env, src + (n - i - 1) * 8); + dec = cpu_ldq_data_ra(env, tmpsrc, ra); + for (j = 0; j < 16; j++, dec >>= 4) { + if (i == 0 && j == 0) { + sign = dec & 0xf; + if (sign < 0xa) { + general_operand_exception(env, ra); + } + continue; + } + digit = dec & 0xf; + if (digit > 0x9) { + general_operand_exception(env, ra); + } + if (i == 0 && j == 1) { + if (sign == 0xb || sign == 0xd) { + val = -digit; + pow10 = -10; + } else { + val = digit; + pow10 = 10; + } + } else { + val += digit * pow10; + pow10 *= 10; + } + } + } + return val; +} + uint64_t HELPER(cvd)(int32_t reg) { /* positive 0 */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 59b1e5893c..c709184a03 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2114,6 +2114,17 @@ static DisasJumpType op_csp(DisasContext *s, DisasOps *o) } #endif +static DisasJumpType op_cvb(DisasContext *s, DisasOps *o) +{ + bool g = (s->fields->op == 0xE3) && (s->fields->op2 == 0x0E); + int32_t n = g ? 2 /* CVBG */ : 1 /* CVB, CVBY */; + TCGv_i32 tmp = tcg_const_i32(n); + + gen_helper_cvb(o->out, cpu_env, o->addr1, tmp); + tcg_temp_free_i32(tmp); + return DISAS_NEXT; +} + static DisasJumpType op_cvd(DisasContext *s, DisasOps *o) { TCGv_i64 t1 = tcg_temp_new_i64(); diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 151dc075aa..990dfb26ff 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -6,3 +6,4 @@ TESTS+=ipm TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack +TESTS+=cvb diff --git a/tests/tcg/s390x/cvb.c b/tests/tcg/s390x/cvb.c new file mode 100644 index 0000000000..3a72e132aa --- /dev/null +++ b/tests/tcg/s390x/cvb.c @@ -0,0 +1,18 @@ +#include <stdint.h> +#include <unistd.h> + +int main(void) +{ + uint64_t data = 0x000000000025594cull; + uint64_t result = 0; + + asm volatile( + " cvb %[result],%[data]\n" + : [result] "+r" (result) + : [data] "m" (data)); + if (result != 0x63fa) { + write(1, "bad result\n", 11); + return 1; + } + return 0; +}
Convert to Binary - counterparts of the already implemented Convert to Decimal (CVD*) instructions. Example from the Principles of Operation: 25594C becomes 63FA. Signed-off-by: Pavel Zbitskiy <pavel.zbitskiy@gmail.com> --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 4 +++ target/s390x/int_helper.c | 52 +++++++++++++++++++++++++++++++++ target/s390x/translate.c | 11 +++++++ tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/cvb.c | 18 ++++++++++++ 6 files changed, 87 insertions(+) create mode 100644 tests/tcg/s390x/cvb.c