X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/2363a0d6a8cf44f7288e0795ff29e081ecf3a08f..b0ddcea9fa3e1e680a8b1264d365d1f336c1f346:/rsb-lz.c diff --git a/rsb-lz.c b/rsb-lz.c index c90f5df..644e8bb 100644 --- a/rsb-lz.c +++ b/rsb-lz.c @@ -8,426 +8,6 @@ #include "rsb-lz.h" #include "filesystem.h" -/* TODO: IMPLEMET THIS! */ -/* Probably very broken lzw implementation by Agilent: - * - * 59508: e3a00078 mov r0, #120 ; 0x78 - * 5950c: ee010f10 mcr 15, 0, r0, cr1, cr0, {0} - * 59510: e3a00000 mov r0, #0 ; 0x0 - * 59514: ee070f15 mcr 15, 0, r0, cr7, cr5, {0} - * 59518: ee070f16 mcr 15, 0, r0, cr7, cr6, {0} - * 5951c: ee020f30 mcr 15, 0, r0, cr2, cr0, {1} - * 59520: ee020f10 mcr 15, 0, r0, cr2, cr0, {0} - * 59524: ee030f10 mcr 15, 0, r0, cr3, cr0, {0} - * 59528: ee050f70 mcr 15, 0, r0, cr5, cr0, {3} - * 5952c: ee050f50 mcr 15, 0, r0, cr5, cr0, {2} - * 59530: ee050f30 mcr 15, 0, r0, cr5, cr0, {1} - * 59534: ee050f10 mcr 15, 0, r0, cr5, cr0, {0} - * 59538: e3a00016 mov r0, #22 ; 0x16 - * 5953c: ee060f10 mcr 15, 0, r0, cr6, cr0, {0} - * 59540: ee060f11 mcr 15, 0, r0, cr6, cr1, {0} - * 59544: ee060f12 mcr 15, 0, r0, cr6, cr2, {0} - * 59548: ee060f13 mcr 15, 0, r0, cr6, cr3, {0} - * 5954c: ee060f14 mcr 15, 0, r0, cr6, cr4, {0} - * 59550: ee060f15 mcr 15, 0, r0, cr6, cr5, {0} - * 59554: ee060f16 mcr 15, 0, r0, cr6, cr6, {0} - * 59558: ee060f17 mcr 15, 0, r0, cr6, cr7, {0} - * 5955c: e1a0f00e mov r15, r14 - * 59560: e3a01000 mov r1, #0 ; 0x0 - * 59564: ee071f15 mcr 15, 0, r1, cr7, cr5, {0} - * 59568: ee071f16 mcr 15, 0, r1, cr7, cr6, {0} - * 5956c: e3800078 orr r0, r0, #120 ; 0x78 - * 59570: ee010f10 mcr 15, 0, r0, cr1, cr0, {0} - * 59574: e1a0f00e mov r15, r14 - * 59578: e92d00f0 push {r4, r5, r6, r7} - * 5957c: e3500007 cmp r0, #7 ; 0x7 - * 59580: 8a00003c bhi 0x59678 - * 59584: e3e04ef0 mvn r4, #3840 ; 0xf00 - * 59588: e22440ff eor r4, r4, #255 ; 0xff - * 5958c: e1d14004 bics r4, r1, r4 - * 59590: 1a000038 bne 0x59678 - * 59594: e3a0403f mov r4, #63 ; 0x3f - * 59598: e1d24004 bics r4, r2, r4 - * 5959c: 1a000035 bne 0x59678 - * 595a0: e3a06001 mov r6, #1 ; 0x1 - * 595a4: e1a04423 lsr r4, r3, #8 - * 595a8: e2044001 and r4, r4, #1 ; 0x1 - * 595ac: ee125f30 mrc 15, 0, r5, cr2, cr0, {1} - * 595b0: e1c55016 bic r5, r5, r6, lsl r0 - * 595b4: e1855014 orr r5, r5, r4, lsl r0 - * 595b8: ee025f30 mcr 15, 0, r5, cr2, cr0, {1} - * 595bc: e1a044a3 lsr r4, r3, #9 - * 595c0: e2044001 and r4, r4, #1 ; 0x1 - * 595c4: ee125f10 mrc 15, 0, r5, cr2, cr0, {0} - * 595c8: e1c55016 bic r5, r5, r6, lsl r0 - * 595cc: e1855014 orr r5, r5, r4, lsl r0 - * 595d0: ee025f10 mcr 15, 0, r5, cr2, cr0, {0} - * 595d4: e1a04523 lsr r4, r3, #10 - * 595d8: e2044001 and r4, r4, #1 ; 0x1 - * 595dc: ee135f10 mrc 15, 0, r5, cr3, cr0, {0} - * 595e0: e1c55016 bic r5, r5, r6, lsl r0 - * 595e4: e1855014 orr r5, r5, r4, lsl r0 - * 595e8: ee035f10 mcr 15, 0, r5, cr3, cr0, {0} - * 595ec: e3a0600f mov r6, #15 ; 0xf - * 595f0: e3a07004 mov r7, #4 ; 0x4 - * 595f4: e0070790 mul r7, r0, r7 - * 595f8: e0034006 and r4, r3, r6 - * 595fc: ee155f70 mrc 15, 0, r5, cr5, cr0, {3} - * 59600: e1c55716 bic r5, r5, r6, lsl r7 - * 59604: e1855714 orr r5, r5, r4, lsl r7 - * 59608: ee055f70 mcr 15, 0, r5, cr5, cr0, {3} - * 5960c: e1a04223 lsr r4, r3, #4 - * 59610: e0044006 and r4, r4, r6 - * 59614: ee155f50 mrc 15, 0, r5, cr5, cr0, {2} - * 59618: e1c55716 bic r5, r5, r6, lsl r7 - * 5961c: e1855714 orr r5, r5, r4, lsl r7 - * 59620: ee055f50 mcr 15, 0, r5, cr5, cr0, {2} - * 59624: e1814002 orr r4, r1, r2 - * 59628: e08ff180 add r15, r15, r0, lsl #3 - * 5962c: e1a00000 nop (mov r0,r0) - * 59630: ee064f10 mcr 15, 0, r4, cr6, cr0, {0} - * 59634: ea00000c b 0x5966c - * 59638: ee064f11 mcr 15, 0, r4, cr6, cr1, {0} - * 5963c: ea00000a b 0x5966c - * 59640: ee064f12 mcr 15, 0, r4, cr6, cr2, {0} - * 59644: ea000008 b 0x5966c - * 59648: ee064f13 mcr 15, 0, r4, cr6, cr3, {0} - * 5964c: ea000006 b 0x5966c - * 59650: ee064f14 mcr 15, 0, r4, cr6, cr4, {0} - * 59654: ea000004 b 0x5966c - * 59658: ee064f15 mcr 15, 0, r4, cr6, cr5, {0} - * 5965c: ea000002 b 0x5966c - * 59660: ee064f16 mcr 15, 0, r4, cr6, cr6, {0} - * 59664: ea000000 b 0x5966c - * 59668: ee064f17 mcr 15, 0, r4, cr6, cr7, {0} - * 5966c: e3a00000 mov r0, #0 ; 0x0 - * 59670: e8bd00f0 pop {r4, r5, r6, r7} - * 59674: e1a0f00e mov r15, r14 - * 59678: e3e00000 mvn r0, #0 ; 0x0 - * 5967c: e8bd00f0 pop {r4, r5, r6, r7} - * 59680: e1a0f00e mov r15, r14 - * 59684: e92d43f8 push {r3, r4, r5, r6, r7, r8, r9, r14} - * 59688: eb000000 bl 0x59690 - * 5968c: e8bd83f8 pop {r3, r4, r5, r6, r7, r8, r9, r15} - * 59690: e3a08001 mov r8, #1 ; 0x1 - * 59694: e3a034c0 mov r3, #-1073741824 ; 0xc0000000 - * 59698: e1500003 cmp r0, r3 - * 5969c: da000022 ble 0x5972c - * 596a0: e3a03020 mov r3, #32 ; 0x20 - * 596a4: e7b34000 ldr r4, [r3, r0]! - * 596a8: e3a08002 mov r8, #2 ; 0x2 - * 596ac: e5935004 ldr r5, [r3, #4] - * 596b0: e1550002 cmp r5, r2 - * 596b4: 1a00001c bne 0x5972c - * 596b8: e3a08003 mov r8, #3 ; 0x3 - * 596bc: e1510004 cmp r1, r4 - * 596c0: 23b05000 movscs r5, #0 ; 0x0 - * 596c4: 33b05001 movscc r5, #1 ; 0x1 - * 596c8: 1a000017 bne 0x5972c - * 596cc: e3a08004 mov r8, #4 ; 0x4 - * 596d0: e1a03000 mov r3, r0 - * 596d4: e0804004 add r4, r0, r4 - * 596d8: e3e05000 mvn r5, #0 ; 0x0 - * 596dc: e59f7050 ldr r7, [pc, #80] ; 0x59734 - * 596e0: e1530004 cmp r3, r4 - * 596e4: 2a00000c bcs 0x5971c - * 596e8: e3c39003 bic r9, r3, #3 ; 0x3 - * 596ec: e5996000 ldr r6, [r9] - * 596f0: e2039003 and r9, r3, #3 ; 0x3 - * 596f4: e1a09189 lsl r9, r9, #3 - * 596f8: e1a06936 lsr r6, r6, r9 - * 596fc: e0255c06 eor r5, r5, r6, lsl #24 - * 59700: e3a06008 mov r6, #8 ; 0x8 - * 59704: e1b05085 lsls r5, r5, #1 - * 59708: 20255007 eorcs r5, r5, r7 - * 5970c: e2566001 subs r6, r6, #1 ; 0x1 - * 59710: 1afffffb bne 0x59704 - * 59714: e2833001 add r3, r3, #1 ; 0x1 - * 59718: eafffff0 b 0x596e0 - * 5971c: e1e05005 mvn r5, r5 - * 59720: e5943000 ldr r3, [r4] - * 59724: e0533005 subs r3, r3, r5 - * 59728: 03a08000 moveq r8, #0 ; 0x0 - * 5972c: e1a00008 mov r0, r8 - * 59730: e1a0f00e mov r15, r14 - * 59734: 04c11db7 strbeq r1, [r1], #3511 - * 59738: e10f1000 mrs r1, CPSR - * 5973c: e3c12080 bic r2, r1, #128 ; 0x80 - * 59740: e3500001 cmp r0, #1 ; 0x1 - * 59744: 23822080 orrcs r2, r2, #128 ; 0x80 - * 59748: e129f002 msr CPSR_fc, r2 - * 5974c: e1b01c81 lsls r1, r1, #25 - * 59750: e3a00000 mov r0, #0 ; 0x0 - * 59754: 23a00001 movcs r0, #1 ; 0x1 - * 59758: e1a0f00e mov r15, r14 - * 5975c: e10f1000 mrs r1, CPSR - * 59760: e3a02001 mov r2, #1 ; 0x1 - * 59764: e00203e1 and r0, r2, r1, ror #7 - * 59768: e1a0f00e mov r15, r14 - * 5976c: ee151f70 mrc 15, 0, r1, cr5, cr0, {3} - * 59770: e3a02001 mov r2, #1 ; 0x1 - * 59774: e0020261 and r0, r2, r1, ror #4 - * 59778: e1a0f00e mov r15, r14 - * 5977c: e3a00000 mov r0, #0 ; 0x0 - * 59780: ee070f16 mcr 15, 0, r0, cr7, cr6, {0} - * 59784: e1a0f00e mov r15, r14 - * 59788: e92d0300 push {r8, r9} - * 5978c: e3a00001 mov r0, #1 ; 0x1 - * 59790: e59f83bc ldr r8, [pc, #956] ; 0x59b54 - * 59794: e5880000 str r0, [r8] - * 59798: e3a0000a mov r0, #10 ; 0xa - * 5979c: e59f83b4 ldr r8, [pc, #948] ; 0x59b58 - * 597a0: e5880000 str r0, [r8] - * 597a4: e3a00004 mov r0, #4 ; 0x4 - * 597a8: e59f83ac ldr r8, [pc, #940] ; 0x59b5c - * 597ac: e5880000 str r0, [r8] - * 597b0: e59f93a8 ldr r9, [pc, #936] ; 0x59b60 - * 597b4: e5990000 ldr r0, [r9] - * 597b8: e3800001 orr r0, r0, #1 ; 0x1 - * 597bc: e59f839c ldr r8, [pc, #924] ; 0x59b60 - * 597c0: e5880000 str r0, [r8] - * 597c4: eafffffe b 0x597c4 - * 597c8: e92d4370 push {r4, r5, r6, r8, r9, r14} - * 597cc: e1a06000 mov r6, r0 - * 597d0: e3a05000 mov r5, #0 ; 0x0 - * 597d4: e5960000 ldr r0, [r6] - * 597d8: e5961004 ldr r1, [r6, #4] - * 597dc: e1500001 cmp r0, r1 - * 597e0: 2a000006 bcs 0x59800 - * 597e4: e5960000 ldr r0, [r6] - * 597e8: e5d05000 ldrb r5, [r0] - * 597ec: e5960000 ldr r0, [r6] - * 597f0: e2800001 add r0, r0, #1 ; 0x1 - * 597f4: e5860000 str r0, [r6] - * 597f8: e1a00005 mov r0, r5 - * 597fc: ea000001 b 0x59808 - * 59800: ebffffe0 bl 0x59788 - * 59804: e1a00005 mov r0, r5 - * 59808: e8bd8370 pop {r4, r5, r6, r8, r9, r15} - * 5980c: e92d43f0 push {r4, r5, r6, r7, r8, r9, r14} - * 59810: e1a07000 mov r7, r0 - * 59814: e1a06001 mov r6, r1 - * 59818: e5961000 ldr r1, [r6] - * 5981c: e5962004 ldr r2, [r6, #4] - * 59820: e1510002 cmp r1, r2 - * 59824: 2a000005 bcs 0x59840 - * 59828: e5961000 ldr r1, [r6] - * 5982c: e5c17000 strb r7, [r1] - * 59830: e5961000 ldr r1, [r6] - * 59834: e2811001 add r1, r1, #1 ; 0x1 - * 59838: e5861000 str r1, [r6] - * 5983c: ea000000 b 0x59844 - * 59840: ebffffd0 bl 0x59788 - * 59844: e8bd83f0 pop {r4, r5, r6, r7, r8, r9, r15} - * 59848: e92d4370 push {r4, r5, r6, r8, r9, r14} - * 5984c: e1a06000 mov r6, r0 - * 59850: e5d61008 ldrb r1, [r6, #8] - * 59854: e3510080 cmp r1, #128 ; 0x80 - * 59858: 1a000002 bne 0x59868 - * 5985c: e1a00006 mov r0, r6 - * 59860: ebffffd8 bl 0x597c8 - * 59864: e5c60009 strb r0, [r6, #9] - * 59868: e5d61008 ldrb r1, [r6, #8] - * 5986c: e5d62009 ldrb r2, [r6, #9] - * 59870: e0011002 and r1, r1, r2 - * 59874: e20110ff and r1, r1, #255 ; 0xff - * 59878: e1a05001 mov r5, r1 - * 5987c: e5d61008 ldrb r1, [r6, #8] - * 59880: e1a010a1 lsr r1, r1, #1 - * 59884: e5c61008 strb r1, [r6, #8] - * 59888: e5d61008 ldrb r1, [r6, #8] - * 5988c: e3510000 cmp r1, #0 ; 0x0 - * 59890: 1a000001 bne 0x5989c - * 59894: e3a01080 mov r1, #128 ; 0x80 - * 59898: e5c61008 strb r1, [r6, #8] - * 5989c: e3550000 cmp r5, #0 ; 0x0 - * 598a0: 0a000001 beq 0x598ac - * 598a4: e3a00001 mov r0, #1 ; 0x1 - * 598a8: ea000000 b 0x598b0 - * 598ac: e3a00000 mov r0, #0 ; 0x0 - * 598b0: e8bd8370 pop {r4, r5, r6, r8, r9, r15} - * 598b4: e92d4ff0 push {r4, r5, r6, r7, r8, r9, r10, r11, r14} - * 598b8: e1a0b000 mov r11, r0 - * 598bc: e1a0a001 mov r10, r1 - * 598c0: e24a1001 sub r1, r10, #1 ; 0x1 - * 598c4: e3a02001 mov r2, #1 ; 0x1 - * 598c8: e1a06112 lsl r6, r2, r1 - * 598cc: e3a07000 mov r7, #0 ; 0x0 - * 598d0: ea000015 b 0x5992c - * 598d4: e5db1008 ldrb r1, [r11, #8] - * 598d8: e3510080 cmp r1, #128 ; 0x80 - * 598dc: 1a000003 bne 0x598f0 - * 598e0: e1a0000b mov r0, r11 - * 598e4: ebffffb7 bl 0x597c8 - * 598e8: e1a01000 mov r1, r0 - * 598ec: e5cb1009 strb r1, [r11, #9] - * 598f0: e5db1008 ldrb r1, [r11, #8] - * 598f4: e5db2009 ldrb r2, [r11, #9] - * 598f8: e0011002 and r1, r1, r2 - * 598fc: e3510000 cmp r1, #0 ; 0x0 - * 59900: 0a000000 beq 0x59908 - * 59904: e1877006 orr r7, r7, r6 - * 59908: e1a060a6 lsr r6, r6, #1 - * 5990c: e5db2008 ldrb r2, [r11, #8] - * 59910: e1a020a2 lsr r2, r2, #1 - * 59914: e5cb2008 strb r2, [r11, #8] - * 59918: e5db1008 ldrb r1, [r11, #8] - * 5991c: e3510000 cmp r1, #0 ; 0x0 - * 59920: 1a000001 bne 0x5992c - * 59924: e3a01080 mov r1, #128 ; 0x80 - * 59928: e5cb1008 strb r1, [r11, #8] - * 5992c: e3560000 cmp r6, #0 ; 0x0 - * 59930: 1affffe7 bne 0x598d4 - * 59934: e1a00007 mov r0, r7 - * 59938: e8bd8ff0 pop {r4, r5, r6, r7, r8, r9, r10, r11, r15} - * 5993c: e92d4ff0 push {r4, r5, r6, r7, r8, r9, r10, r11, r14} - * 59940: e24dd004 sub r13, r13, #4 ; 0x4 - * 59944: e1a0a000 mov r10, r0 - * 59948: e58d1000 str r1, [r13] - * 5994c: e3a05001 mov r5, #1 ; 0x1 - * 59950: e1a0000a mov r0, r10 - * 59954: ebffffbb bl 0x59848 - * 59958: e1a02000 mov r2, r0 - * 5995c: e3520000 cmp r2, #0 ; 0x0 - * 59960: 0a00000f beq 0x599a4 - * 59964: e1a0000a mov r0, r10 - * 59968: e3a01008 mov r1, #8 ; 0x8 - * 5996c: ebffffd0 bl 0x598b4 - * 59970: e20020ff and r2, r0, #255 ; 0xff - * 59974: e1a04002 mov r4, r2 - * 59978: e59d1000 ldr r1, [r13] - * 5997c: e1a00004 mov r0, r4 - * 59980: ebffffa1 bl 0x5980c - * 59984: e59f21d8 ldr r2, [pc, #472] ; 0x59b64 - * 59988: e0852002 add r2, r5, r2 - * 5998c: e5c24000 strb r4, [r2] - * 59990: e2852001 add r2, r5, #1 ; 0x1 - * 59994: e1a02b02 lsl r2, r2, #22 - * 59998: e1a02b22 lsr r2, r2, #22 - * 5999c: e1a05002 mov r5, r2 - * 599a0: eaffffea b 0x59950 - * 599a4: e1a0000a mov r0, r10 - * 599a8: e3a0100a mov r1, #10 ; 0xa - * 599ac: ebffffc0 bl 0x598b4 - * 599b0: e1a02000 mov r2, r0 - * 599b4: e1a0b002 mov r11, r2 - * 599b8: e35b0000 cmp r11, #0 ; 0x0 - * 599bc: 0a00001b beq 0x59a30 - * 599c0: e1a0000a mov r0, r10 - * 599c4: e3a01004 mov r1, #4 ; 0x4 - * 599c8: ebffffb9 bl 0x598b4 - * 599cc: e1a02000 mov r2, r0 - * 599d0: e1a07002 mov r7, r2 - * 599d4: e2877001 add r7, r7, #1 ; 0x1 - * 599d8: e3a06000 mov r6, #0 ; 0x0 - * 599dc: ea000010 b 0x59a24 - * 599e0: e086200b add r2, r6, r11 - * 599e4: e1a02b02 lsl r2, r2, #22 - * 599e8: e1a02b22 lsr r2, r2, #22 - * 599ec: e59f3170 ldr r3, [pc, #368] ; 0x59b64 - * 599f0: e0822003 add r2, r2, r3 - * 599f4: e5d24000 ldrb r4, [r2] - * 599f8: e59d1000 ldr r1, [r13] - * 599fc: e1a00004 mov r0, r4 - * 59a00: ebffff81 bl 0x5980c - * 59a04: e59f2158 ldr r2, [pc, #344] ; 0x59b64 - * 59a08: e0852002 add r2, r5, r2 - * 59a0c: e5c24000 strb r4, [r2] - * 59a10: e2852001 add r2, r5, #1 ; 0x1 - * 59a14: e1a02b02 lsl r2, r2, #22 - * 59a18: e1a02b22 lsr r2, r2, #22 - * 59a1c: e1a05002 mov r5, r2 - * 59a20: e2866001 add r6, r6, #1 ; 0x1 - * 59a24: e1560007 cmp r6, r7 - * 59a28: daffffec ble 0x599e0 - * 59a2c: eaffffc7 b 0x59950 - * 59a30: e28dd004 add r13, r13, #4 ; 0x4 - * 59a34: e8bd8ff0 pop {r4, r5, r6, r7, r8, r9, r10, r11, r15} - * 59a38: e92d4ff0 push {r4, r5, r6, r7, r8, r9, r10, r11, r14} - * 59a3c: e1a07000 mov r7, r0 - * 59a40: e1a0a001 mov r10, r1 - * 59a44: e1a0b002 mov r11, r2 - * 59a48: ebfffeae bl 0x59508 - * 59a4c: e3a03033 mov r3, #51 ; 0x33 - * 59a50: e3a0203f mov r2, #63 ; 0x3f - * 59a54: e3a01000 mov r1, #0 ; 0x0 - * 59a58: e3a00000 mov r0, #0 ; 0x0 - * 59a5c: ebfffec5 bl 0x59578 - * 59a60: e59f3100 ldr r3, [pc, #256] ; 0x59b68 - * 59a64: e3a02033 mov r2, #51 ; 0x33 - * 59a68: e3a01540 mov r1, #268435456 ; 0x10000000 - * 59a6c: e3a00004 mov r0, #4 ; 0x4 - * 59a70: ebfffec0 bl 0x59578 - * 59a74: e59f30f0 ldr r3, [pc, #240] ; 0x59b6c - * 59a78: e3a0201b mov r2, #27 ; 0x1b - * 59a7c: e3a01550 mov r1, #335544320 ; 0x14000000 - * 59a80: e3a00005 mov r0, #5 ; 0x5 - * 59a84: ebfffebb bl 0x59578 - * 59a88: e3a03033 mov r3, #51 ; 0x33 - * 59a8c: e3a0203b mov r2, #59 ; 0x3b - * 59a90: e3a014c0 mov r1, #-1073741824 ; 0xc0000000 - * 59a94: e3a00007 mov r0, #7 ; 0x7 - * 59a98: ebfffeb6 bl 0x59578 - * 59a9c: e59f00cc ldr r0, [pc, #204] ; 0x59b70 - * 59aa0: ebfffeae bl 0x59560 - * 59aa4: e59b5000 ldr r5, [r11] - * 59aa8: e59f20c4 ldr r2, [pc, #196] ; 0x59b74 - * 59aac: e1550002 cmp r5, r2 - * 59ab0: 0a000000 beq 0x59ab8 - * 59ab4: ebffff33 bl 0x59788 - * 59ab8: e28b3004 add r3, r11, #4 ; 0x4 - * 59abc: e5935000 ldr r5, [r3] - * 59ac0: e0853007 add r3, r5, r7 - * 59ac4: e153000a cmp r3, r10 - * 59ac8: 3a000000 bcc 0x59ad0 - * 59acc: ebffff2d bl 0x59788 - * 59ad0: e28b2008 add r2, r11, #8 ; 0x8 - * 59ad4: e59f809c ldr r8, [pc, #156] ; 0x59b78 - * 59ad8: e5882000 str r2, [r8] - * 59adc: e085200b add r2, r5, r11 - * 59ae0: e59f8090 ldr r8, [pc, #144] ; 0x59b78 - * 59ae4: e5882004 str r2, [r8, #4] - * 59ae8: e3a02000 mov r2, #0 ; 0x0 - * 59aec: e59f8084 ldr r8, [pc, #132] ; 0x59b78 - * 59af0: e5c82009 strb r2, [r8, #9] - * 59af4: e3a02080 mov r2, #128 ; 0x80 - * 59af8: e59f8078 ldr r8, [pc, #120] ; 0x59b78 - * 59afc: e5c82008 strb r2, [r8, #8] - * 59b00: e59f8074 ldr r8, [pc, #116] ; 0x59b7c - * 59b04: e5887000 str r7, [r8] - * 59b08: e0853007 add r3, r5, r7 - * 59b0c: e59f8068 ldr r8, [pc, #104] ; 0x59b7c - * 59b10: e5883004 str r3, [r8, #4] - * 59b14: e59f1060 ldr r1, [pc, #96] ; 0x59b7c - * 59b18: e59f0058 ldr r0, [pc, #88] ; 0x59b78 - * 59b1c: ebffff86 bl 0x5993c - * 59b20: e2873020 add r3, r7, #32 ; 0x20 - * 59b24: e5935000 ldr r5, [r3] - * 59b28: e59f2050 ldr r2, [pc, #80] ; 0x59b80 - * 59b2c: e1a01005 mov r1, r5 - * 59b30: e1a00007 mov r0, r7 - * 59b34: ebfffed2 bl 0x59684 - * 59b38: e1a01000 mov r1, r0 - * 59b3c: e1a04001 mov r4, r1 - * 59b40: e3540000 cmp r4, #0 ; 0x0 - * 59b44: 0a000000 beq 0x59b4c - * 59b48: ebffff0e bl 0x59788 - * 59b4c: ebfffe6d bl 0x59508 - * 59b50: e8bd8ff0 pop {r4, r5, r6, r7, r8, r9, r10, r11, r15} - * 59b54: c00b003c andgt r0, r11, r12, lsr r0 - * 59b58: c00b0038 andgt r0, r11, r8, lsr r0 - * 59b5c: c00b0034 andgt r0, r11, r4, lsr r0 - * 59b60: c00b0030 andgt r0, r11, r0, lsr r0 - * 59b64: 14000418 strne r0, [r0], #-1048 - * 59b68: 00000366 andeq r0, r0, r6, ror #6 - * 59b6c: 00000733 andeq r0, r0, r3, lsr r7 - * 59b70: 00001005 andeq r1, r0, r5 - * 59b74: 6110beef tstvs r0, r15, ror #29 <- LZW Header... - * 59b78: 14000404 strne r0, [r0], #-1028 - * 59b7c: 14000410 strne r0, [r0], #-1040 - * 59b80: 46335053 undefined - */ - void err_exit(const char *fname) { fprintf(stderr,"%s: error extracting...\n", fname); @@ -446,48 +26,32 @@ struct data_out_s { unsigned char *end; }; -unsigned char fn_597c8(struct data_in_s *r6_data) +unsigned char get_next_in_byte(struct data_in_s *data_in) { - unsigned char *r0; - unsigned char *r1; - unsigned char r5; - - r5 = 0; - - r0 = r6_data->start; - r1 = r6_data->stop; + unsigned char byte; - if (r1 < r0) + if (data_in->stop < data_in->start) err_exit(__func__); - r5 = *r0; - r0++; - r6_data->start = r0; + byte = *(data_in->start); + data_in->start++; - return r5; + return byte; } -unsigned int fn_59848(struct data_in_s *r6_data) +unsigned char fn_59848(struct data_in_s *data_in) { - unsigned char r1; - unsigned char r2; - unsigned int r5; + unsigned char r5; - r1 = r6_data->bit; - if (r1 == 0x80) { - r6_data->x = fn_597c8(r6_data); + if (data_in->bit == 0x80) { + data_in->x = get_next_in_byte(data_in); } - r1 = r6_data->bit; - r2 = r6_data->x; - r1 = r1 & r2; - r5 = r1 & 0xff; - - r1 = r6_data->bit; - r1 = r1 >> 1; - r6_data->bit = r1; - if (r1 == 0) { - r1 = 0x80; - r6_data->bit = r1; + + r5 = data_in->bit & data_in->x; + + data_in->bit >>= 1; + if (data_in->bit == 0) { + data_in->bit = 0x80; } if (r5 == 0) @@ -498,35 +62,24 @@ unsigned int fn_59848(struct data_in_s *r6_data) unsigned int fn_598b4(struct data_in_s *r11_data, unsigned int r10_arg2) { - unsigned int r1; - unsigned int r2; unsigned int r6; unsigned int r7; - r1 = r10_arg2 - 1; - r6 = 1 << r1; + r6 = 1 << (r10_arg2 - 1); r7 = 0; while (r6 != 0) { - r1 = r11_data->bit; - if (r1 == 0x80) { - r1 = fn_597c8(r11_data); - r11_data->x = r1; + if (r11_data->bit == 0x80) { + r11_data->x = get_next_in_byte(r11_data); } - r1 = r11_data->bit; - r2 = r11_data->x; - r1 = r1 & r2; - if (r1 != 0) + if ((r11_data->bit & r11_data->x) != 0) r7 = r7 | r6; r6 = r6 >> 1; - r2 = r11_data->bit; - r2 = r2 >> 1; - r11_data->bit = r2; + r11_data->bit >>= 1; - r1 = r11_data->bit; - if(r1 == 0) { + if(r11_data->bit == 0) { r11_data->bit = 0x80; } } @@ -534,23 +87,14 @@ unsigned int fn_598b4(struct data_in_s *r11_data, unsigned int r10_arg2) return r7; } -void fn_5980c(unsigned int arg1, struct data_out_s *data_out) +void write_byte(unsigned char byte, struct data_out_s *data_out) { - unsigned char *r1; - unsigned char *r2; - - r1 = data_out->pos; - r2 = data_out->end; - - if (r1 > r2) { - printf("r1: 0x%08x, r2: 0x%08x\n", (unsigned int)r1, (unsigned int)r2); + if (data_out->pos > data_out->end) { err_exit(__func__); } - *r1 = arg1 & 0xff; - - r1++; - data_out->pos = r1; + *(data_out->pos) = byte; + data_out->pos++; } void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out) @@ -561,7 +105,7 @@ void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out) unsigned int r6; unsigned int r7; unsigned int r11; - unsigned char arr_59b64[2048]; + unsigned char arr_59b64[1024]; r5 = 1; @@ -572,14 +116,10 @@ void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out) break; r2 = fn_598b4(r10_data, 8) & 0xff; - r4 = r2; - - fn_5980c(r4, data_out); - arr_59b64[r5] = r4 & 0xff; - r2 = r5 + 1; - r2 = r2 << 22; - r2 = r2 >> 22; - r5 = r2; + + write_byte(r2, data_out); + arr_59b64[r5] = r2 & 0xff; + r5 = (r5 + 1) & 0x3ff; } r11 = fn_598b4(r10_data, 0x0a); @@ -590,21 +130,18 @@ void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out) r7 = r2 + 1; r6 = 0; while (r6 <= r7) { - r2 = r6 + r11; - r2 = r2 << 22; - r2 = r2 >> 22; + r2 = (r6 + r11) & 0x3ff; r4 = arr_59b64[r2]; - fn_5980c(r4, data_out); + write_byte(r4, data_out); arr_59b64[r5] = r4; - r2 = r5 + 1; - r2 = r2 << 22; - r2 = r2 >> 22; - r5 = r2; + r5 = (r5 + 1) & 0x3ff; r6++; } } } +/* Checksum is only used for the compressed firmware in 'firmware' */ +#if 0 unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned int magic) { unsigned int r3; @@ -638,6 +175,7 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in return 4; } +#endif void extract_lz_file(unsigned char *inbuf, unsigned char *name) { @@ -670,7 +208,7 @@ void extract_lz_file(unsigned char *inbuf, unsigned char *name) lz_expand(&data_in, &data_out); #if 0 - /* This seems to still be completely broken */ + /* Checksum is only used for the compressed firmware in 'firmware' */ r3 = r7 + 0x20; r5 = *((unsigned int*)r3);