diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-09-02 07:33:37 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-09-10 13:38:32 +0200 |
| commit | 4fda26a7b0d6ffbb4055ab8b756cd94647f5fd22 (patch) | |
| tree | d87134a5de3b4735752e7546f301e4140b1c9861 /target-s390x/int_helper.c | |
| parent | 449c0d70b6d5692bafd8b028e2a8a4e0ed7076fe (diff) | |
| download | qemu-4fda26a7b0d6ffbb4055ab8b756cd94647f5fd22.zip qemu-4fda26a7b0d6ffbb4055ab8b756cd94647f5fd22.tar.gz qemu-4fda26a7b0d6ffbb4055ab8b756cd94647f5fd22.tar.bz2 | |
target-s390x: avoid AREG0 for integer helpers
Make integer helpers take a parameter for CPUState instead
of relying on global env.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/int_helper.c')
| -rw-r--r-- | target-s390x/int_helper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c index e2eeb07..f202a7e 100644 --- a/target-s390x/int_helper.c +++ b/target-s390x/int_helper.c @@ -19,7 +19,6 @@ */ #include "cpu.h" -#include "dyngen-exec.h" #include "host-utils.h" #include "helper.h" @@ -31,7 +30,7 @@ #endif /* 64/64 -> 128 unsigned multiplication */ -void HELPER(mlg)(uint32_t r1, uint64_t v2) +void HELPER(mlg)(CPUS390XState *env, uint32_t r1, uint64_t v2) { #if HOST_LONG_BITS == 64 && defined(__GNUC__) /* assuming 64-bit hosts have __uint128_t */ @@ -46,7 +45,7 @@ void HELPER(mlg)(uint32_t r1, uint64_t v2) } /* 128 -> 64/64 unsigned division */ -void HELPER(dlg)(uint32_t r1, uint64_t v2) +void HELPER(dlg)(CPUS390XState *env, uint32_t r1, uint64_t v2) { uint64_t divisor = v2; @@ -129,7 +128,7 @@ uint32_t HELPER(addc_u32)(uint32_t cc, uint32_t v1, uint32_t v2) } /* subtract unsigned v2 from v1 with borrow */ -uint32_t HELPER(slb)(uint32_t cc, uint32_t r1, uint32_t v2) +uint32_t HELPER(slb)(CPUS390XState *env, uint32_t cc, uint32_t r1, uint32_t v2) { uint32_t v1 = env->regs[r1]; uint32_t res = v1 + (~v2) + (cc >> 1); @@ -144,7 +143,8 @@ uint32_t HELPER(slb)(uint32_t cc, uint32_t r1, uint32_t v2) } /* subtract unsigned v2 from v1 with borrow */ -uint32_t HELPER(slbg)(uint32_t cc, uint32_t r1, uint64_t v1, uint64_t v2) +uint32_t HELPER(slbg)(CPUS390XState *env, uint32_t cc, uint32_t r1, + uint64_t v1, uint64_t v2) { uint64_t res = v1 + (~v2) + (cc >> 1); @@ -158,7 +158,7 @@ uint32_t HELPER(slbg)(uint32_t cc, uint32_t r1, uint64_t v1, uint64_t v2) } /* find leftmost one */ -uint32_t HELPER(flogr)(uint32_t r1, uint64_t v2) +uint32_t HELPER(flogr)(CPUS390XState *env, uint32_t r1, uint64_t v2) { uint64_t res = 0; uint64_t ov2 = v2; |