diff --git a/src/stub/arm64-darwin.macho-entry.h b/src/stub/arm64-darwin.macho-entry.h index 2be60872..6ada77d6 100644 --- a/src/stub/arm64-darwin.macho-entry.h +++ b/src/stub/arm64-darwin.macho-entry.h @@ -32,8 +32,8 @@ #define STUB_ARM64_DARWIN_MACHO_ENTRY_SIZE 8233 -#define STUB_ARM64_DARWIN_MACHO_ENTRY_ADLER32 0xbb791a9f -#define STUB_ARM64_DARWIN_MACHO_ENTRY_CRC32 0x4c579503 +#define STUB_ARM64_DARWIN_MACHO_ENTRY_ADLER32 0x6ea71aaf +#define STUB_ARM64_DARWIN_MACHO_ENTRY_CRC32 0x6727b992 unsigned char stub_arm64_darwin_macho_entry[8233] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -115,7 +115,7 @@ unsigned char stub_arm64_darwin_macho_entry[8233] = { /* 0x04c0 */ 197, 0, 64,185,228, 3, 2,170,227, 35, 0,145, 34, 8, 0, 81, /* 0x04d0 */ 225, 3, 0,170,224, 3, 0,145, 39, 20, 64, 56,231, 8, 0, 18, /* 0x04e0 */ 7, 8, 0, 57, 39, 20, 64, 56,232,124, 4, 83, 8, 4, 0, 57, -/* 0x04f0 */ 231, 12, 0, 18, 7, 0, 0, 57, 19, 0, 0,148,191, 3, 0,145, +/* 0x04f0 */ 231, 12, 0, 18, 7, 0, 0, 57, 35, 0, 0,148,191, 3, 0,145, /* 0x0500 */ 229, 3, 0,170,253,123, 65,169,224, 7,194,168, 33, 0, 64,249, /* 0x0510 */ 33, 0, 0,139, 35, 0, 59,213, 99, 1,224, 55, 98, 76, 80,211, /* 0x0520 */ 100, 0,128,146,132, 32,194,154, 2, 0, 4,138, 95, 0, 1,235, diff --git a/src/stub/arm64-linux.elf-entry.h b/src/stub/arm64-linux.elf-entry.h index 24409346..9aeaa760 100644 --- a/src/stub/arm64-linux.elf-entry.h +++ b/src/stub/arm64-linux.elf-entry.h @@ -32,8 +32,8 @@ #define STUB_ARM64_LINUX_ELF_ENTRY_SIZE 8386 -#define STUB_ARM64_LINUX_ELF_ENTRY_ADLER32 0xfafe35da -#define STUB_ARM64_LINUX_ELF_ENTRY_CRC32 0xbf96f88d +#define STUB_ARM64_LINUX_ELF_ENTRY_ADLER32 0xb7bc35ea +#define STUB_ARM64_LINUX_ELF_ENTRY_CRC32 0x1e95a1af unsigned char stub_arm64_linux_elf_entry[8386] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -115,7 +115,7 @@ unsigned char stub_arm64_linux_elf_entry[8386] = { /* 0x04c0 */ 197, 0, 64,185,228, 3, 2,170,227, 35, 0,145, 34, 8, 0, 81, /* 0x04d0 */ 225, 3, 0,170,224, 3, 0,145, 39, 20, 64, 56,231, 8, 0, 18, /* 0x04e0 */ 7, 8, 0, 57, 39, 20, 64, 56,232,124, 4, 83, 8, 4, 0, 57, -/* 0x04f0 */ 231, 12, 0, 18, 7, 0, 0, 57, 19, 0, 0,148,191, 3, 0,145, +/* 0x04f0 */ 231, 12, 0, 18, 7, 0, 0, 57, 35, 0, 0,148,191, 3, 0,145, /* 0x0500 */ 229, 3, 0,170,253,123, 65,169,224, 7,194,168, 33, 0, 64,249, /* 0x0510 */ 33, 0, 0,139, 35, 0, 59,213, 99, 1,224, 55, 98, 76, 80,211, /* 0x0520 */ 100, 0,128,146,132, 32,194,154, 2, 0, 4,138, 95, 0, 1,235, diff --git a/src/stub/arm64-linux.shlib-init.h b/src/stub/arm64-linux.shlib-init.h index d390e1cc..5d7cb735 100644 --- a/src/stub/arm64-linux.shlib-init.h +++ b/src/stub/arm64-linux.shlib-init.h @@ -32,8 +32,8 @@ #define STUB_ARM64_LINUX_SHLIB_INIT_SIZE 8974 -#define STUB_ARM64_LINUX_SHLIB_INIT_ADLER32 0xf44cffc6 -#define STUB_ARM64_LINUX_SHLIB_INIT_CRC32 0x8944d6f3 +#define STUB_ARM64_LINUX_SHLIB_INIT_ADLER32 0xd54affd6 +#define STUB_ARM64_LINUX_SHLIB_INIT_CRC32 0x45d2f82f unsigned char stub_arm64_linux_shlib_init[8974] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -116,7 +116,7 @@ unsigned char stub_arm64_linux_shlib_init[8974] = { /* 0x04d0 */ 227, 35, 0,145, 34, 8, 0, 81,225, 3, 0,170,224, 3, 0,145, /* 0x04e0 */ 39, 20, 64, 56,231, 8, 0, 18, 7, 8, 0, 57, 39, 20, 64, 56, /* 0x04f0 */ 232,124, 4, 83, 8, 4, 0, 57,231, 12, 0, 18, 7, 0, 0, 57, -/* 0x0500 */ 19, 0, 0,148,191, 3, 0,145,229, 3, 0,170,253,123, 65,169, +/* 0x0500 */ 35, 0, 0,148,191, 3, 0,145,229, 3, 0,170,253,123, 65,169, /* 0x0510 */ 224, 7,194,168, 33, 0, 64,249, 33, 0, 0,139, 35, 0, 59,213, /* 0x0520 */ 99, 1,224, 55, 98, 76, 80,211,100, 0,128,146,132, 32,194,154, /* 0x0530 */ 2, 0, 4,138, 95, 0, 1,235,162, 0, 0, 84, 34,123, 11,213, diff --git a/src/stub/src/arch/arm64/v8/lzma_d.S b/src/stub/src/arch/arm64/v8/lzma_d.S index 553efa42..a26c20ae 100644 --- a/src/stub/src/arch/arm64/v8/lzma_d.S +++ b/src/stub/src/arch/arm64/v8/lzma_d.S @@ -90,7 +90,7 @@ fp .req x29 mov a6,ldst // &outSizeProcessed ldr a5,[a6] // outSize mov a4,dst // outp - add a3,sp,#8 // &inSizeProcessed + add a3,sp,#NBPW // &inSizeProcessed sub w2,lsrc,#2 // inSize mov a1,src // inp State= 0 @@ -104,7 +104,7 @@ State= 0 strb t1,[a0,#1] and t0,t0,#0xf // lib_context_bits strb t0,[a0,#0] - bl 1f // the call + bl ClangLzmaDecode // the call eof_lzma: mov sp,fp @@ -135,7 +135,7 @@ cache_lzma: #undef a5 #undef a6 -1: // entry to C-lang LzmaDecode +ClangLzmaDecode: // entry to C-lang LzmaDecode in next section section LZMA_DEC20 #include "lzma_d_cf.S" diff --git a/src/stub/src/arch/arm64/v8/macros.S b/src/stub/src/arch/arm64/v8/macros.S index d33bbb36..1c954f80 100644 --- a/src/stub/src/arch/arm64/v8/macros.S +++ b/src/stub/src/arch/arm64/v8/macros.S @@ -52,7 +52,7 @@ fp .req x29 #define POP4(r1,r2,r3,r4) ldp r3,r4,[sp,#2*8]; ldp r1,r2,[sp],#4*8 .macro section name - .section \name + .section \name //,"ax" .endm .macro do_sys N