ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 07:38:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into armvfp

Browse Source
This commit is contained in:
JET
2012-01-16 11:26:03 -07:00
parent fab278f09d d29513c653
commit c989ea0529
39 changed files with 742 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/arm.cpp
View File

@ -2626,12 +2626,13 @@ class MyAssembler: public Assembler {
poolSize += TargetBytesPerWord;
}
if (needJump(b)) {
bool jump = needJump(b);
if (jump) {
write4
(dst + dstOffset, ::b((poolSize + TargetBytesPerWord - 8) >> 2));
}
dstOffset += poolSize + TargetBytesPerWord;
dstOffset += poolSize + (jump ? TargetBytesPerWord : 0);
}
unsigned size = b->size - blockOffset;