From 569fba6db9c12916bd2802a7ee46dc5609118e0b Mon Sep 17 00:00:00 2001 From: Edmund Grimley Evans Date: Tue, 17 Nov 2015 19:09:35 +0000 Subject: Merge the integer members of union CValue into "uint64_t i". --- c67-gen.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'c67-gen.c') diff --git a/c67-gen.c b/c67-gen.c index 2182518..5ea9666 100644 --- a/c67-gen.c +++ b/c67-gen.c @@ -1567,14 +1567,14 @@ void load(int r, SValue * sv) fr = sv->r; ft = sv->type.t; - fc = sv->c.ul; + fc = sv->c.i; v = fr & VT_VALMASK; if (fr & VT_LVAL) { if (v == VT_LLOCAL) { v1.type.t = VT_INT; v1.r = VT_LOCAL | VT_LVAL; - v1.c.ul = fc; + v1.c.i = fc; load(r, &v1); fr = r; } else if ((ft & VT_BTYPE) == VT_LDOUBLE) { @@ -1726,7 +1726,7 @@ void store(int r, SValue * v) int fr, bt, ft, fc, size, t, element; ft = v->type.t; - fc = v->c.ul; + fc = v->c.i; fr = v->r & VT_VALMASK; bt = ft & VT_BTYPE; /* XXX: incorrect if float reg to reg */ @@ -2106,13 +2106,12 @@ int gtst(int inv, int t) /* && or || optimization */ if ((v & 1) == inv) { /* insert vtop->c jump list in t */ - p = &vtop->c.i; // I guess the idea is to traverse to the // null at the end of the list and store t // there - n = *p; + n = vtop->c.i; while (n != 0) { p = (int *) (cur_text_section->data + n); @@ -2304,7 +2303,7 @@ void gen_opf(int op) gv2(RC_FLOAT, RC_FLOAT); // make sure src2 is on b side ft = vtop->type.t; - fc = vtop->c.ul; + fc = vtop->c.i; r = vtop->r; fr = vtop[-1].r; -- cgit v1.3.1