ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

64-bit arithmetic bugfixes

Browse Source
This commit is contained in:
Joel Dice 2007-10-09 11:15:40 -06:00
parent 8c2437abb0
commit defa8c62ac
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compile.cpp
View File

@ -518,6 +518,12 @@ isByte(int32_t v)
return v == static_cast<int8_t>(v); return v == static_cast<int8_t>(v);
} }
inline bool
isInt32(uintptr_t v)
{
return v == static_cast<uintptr_t>(static_cast<int32_t>(v));
}
enum Register { enum Register {
rax = 0, rax = 0,
rcx = 1, rcx = 1,
@ -761,7 +767,7 @@ class Assembler {
} }
void pushAddress(uintptr_t v) { void pushAddress(uintptr_t v) {
if (BytesPerWord == 8) { if (BytesPerWord == 8 and not isInt32(v)) {
mov(v, rsi); mov(v, rsi);
push(rsi); push(rsi);
} else { } else {
@ -812,6 +818,11 @@ class Assembler {
} }
} }
void add(Register src, Register dst, unsigned dstOffset) {
rex();
offsetInstruction(0x01, 0, 0x40, 0x80, src, dst, dstOffset);
}
void adc(int32_t v, Register dst) { void adc(int32_t v, Register dst) {
assert(code.s, isByte(v)); // todo assert(code.s, isByte(v)); // todo
@ -997,6 +1008,7 @@ class Assembler {
} }
void cmp(Register a, Register b) { void cmp(Register a, Register b) {
rex();
code.append(0x39); code.append(0x39);
code.append(0xc0 | (a << 3) | b); code.append(0xc0 | (a << 3) | b);
} }
@ -1133,6 +1145,12 @@ class Compiler: public Assembler {
} }
} }
void pushLong(Register r) {
assert(t, BytesPerWord == 8);
push(r);
sub(8, rsp);
}
void pushLong(Register low, Register high) { void pushLong(Register low, Register high) {
assert(t, BytesPerWord == 4); assert(t, BytesPerWord == 4);
push(high); push(high);
@ -2226,8 +2244,8 @@ class Compiler: public Assembler {
case lrem: case lrem:
if (BytesPerWord == 8) { if (BytesPerWord == 8) {
popLong(rax);
popLong(rcx); popLong(rcx);
popLong(rax);
cqo(); cqo();
Assembler::idiv(rcx); Assembler::idiv(rcx);
pushLong(rdx); pushLong(rdx);