mirror of
https://github.com/upx/upx
synced 2025-09-28 19:06:07 +08:00
Merge and fix conflics
Conflicts: src/stub/src/arch/powerpc/64le/lzma_d.S src/stub/src/powerpc64le-darwin.dylib-entry.S src/stub/src/powerpc64le-darwin.macho-entry.S src/stub/src/powerpc64le-linux.elf-entry.S src/stub/src/powerpc64le-linux.kernel.vmlinux.S modified: stub/src/arch/powerpc/32/lzma_d.S
This commit is contained in:
commit
02e7981e10
|
@ -82,7 +82,7 @@ retaddr = 2*4 // (sp,cr,pc, xx,yy,zz) save area per calling convention
|
|||
stw r0,0(a6) // outSizeProcessed= 0;
|
||||
1:
|
||||
stwu r0,-4(a0) // clear CLZmaDecoderState on stack
|
||||
cmpl cr0,sp,a0 // compare logical ==> compare unsigned
|
||||
cmpl cr0,0,sp,a0 // compare logical ==> compare unsigned
|
||||
blt cr0,1b
|
||||
stw a3,0(sp) // frame chain
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user