mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
fix arm/powerpc build
This commit is contained in:
parent
db19c7b3a2
commit
2ac9070399
@ -814,7 +814,9 @@ class MyAssembler: public Assembler {
|
||||
unsigned blockOffset = 0;
|
||||
for (PoolEvent* e = b->poolEventHead; e; e = e->next) {
|
||||
unsigned size = e->offset - blockOffset;
|
||||
memcpy(dst + dstOffset, con.code.data + b->offset + blockOffset, size);
|
||||
memcpy(dst + dstOffset,
|
||||
con.code.data.begin() + b->offset + blockOffset,
|
||||
size);
|
||||
blockOffset = e->offset;
|
||||
dstOffset += size;
|
||||
|
||||
@ -857,7 +859,7 @@ class MyAssembler: public Assembler {
|
||||
unsigned size = b->size - blockOffset;
|
||||
|
||||
memcpy(dst + dstOffset,
|
||||
con.code.data + b->offset + blockOffset,
|
||||
con.code.data.begin() + b->offset + blockOffset,
|
||||
size);
|
||||
|
||||
dstOffset += size;
|
||||
|
@ -1065,9 +1065,10 @@ void branchLong(Context* con, lir::TernaryOperation op, lir::Operand* al,
|
||||
}
|
||||
|
||||
if (next) {
|
||||
updateOffset
|
||||
(con->s, con->code.data + next, reinterpret_cast<intptr_t>
|
||||
(con->code.data + con->code.length()));
|
||||
updateOffset(con->s,
|
||||
con->code.data.begin() + next,
|
||||
reinterpret_cast<intptr_t>(con->code.data.begin()
|
||||
+ con->code.length()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -869,7 +869,9 @@ class MyAssembler: public Assembler {
|
||||
unsigned blockOffset = 0;
|
||||
for (JumpEvent* e = b->jumpEventHead; e; e = e->next) {
|
||||
unsigned size = e->offset - blockOffset;
|
||||
memcpy(dst + dstOffset, c.code.data + b->offset + blockOffset, size);
|
||||
memcpy(dst + dstOffset,
|
||||
c.code.data.begin() + b->offset + blockOffset,
|
||||
size);
|
||||
blockOffset = e->offset;
|
||||
dstOffset += size;
|
||||
|
||||
@ -903,9 +905,8 @@ class MyAssembler: public Assembler {
|
||||
|
||||
unsigned size = b->size - blockOffset;
|
||||
|
||||
memcpy(dst + dstOffset,
|
||||
c.code.data + b->offset + blockOffset,
|
||||
size);
|
||||
memcpy(
|
||||
dst + dstOffset, c.code.data.begin() + b->offset + blockOffset, size);
|
||||
|
||||
dstOffset += size;
|
||||
}
|
||||
|
@ -924,9 +924,12 @@ void branchLong(Context* c, lir::TernaryOperation op, lir::Operand* al,
|
||||
}
|
||||
|
||||
if (next) {
|
||||
updateOffset
|
||||
(c->s, c->code.data + next, true, reinterpret_cast<intptr_t>
|
||||
(c->code.data + c->code.length()), 0);
|
||||
updateOffset(
|
||||
c->s,
|
||||
c->code.data.begin() + next,
|
||||
true,
|
||||
reinterpret_cast<intptr_t>(c->code.data.begin() + c->code.length()),
|
||||
0);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user