Fixed binarch signedness bug(s)

src/binwalk/config/extract.conf

@@ -13,7 +13,6 @@
 #
 #   o zlib
 #   o cpio
-#   o jffs2
 #   o Raw LZMA/deflate streams
 #
 # There are also alternative extractors for the following file formats, implemented as plugins:

src/binwalk/magic/binarch

@@ -17,15 +17,15 @@
 #
 # addiu $sp, XX
 # jr $ra
-0	belong	0x03e00008	MIPS instructions, function epilogue
->4	beshort	!0x27BD		{invalid}
-0	beshort	0x27BD		MIPS instructions, function epilogue
->2	belong	!0x03e00008	{invalid}
+0	ubelong	0x03e00008	MIPS instructions, function epilogue
+>4	ubeshort	!0x27BD		{invalid}
+0	ubeshort	0x27BD		MIPS instructions, function epilogue
+>2	ubelong	!0x03e00008	{invalid}
 
-0	lelong	0x03e00008	MIPSEL instructions, function epilogue
->6	leshort	!0x27BD		{invalid}
-0	leshort	0x27BD		MIPS instructions, function epilogue
->2	lelong	!0x03e00008	{invalid}
+0	ulelong	0x03e00008	MIPSEL instructions, function epilogue
+>6	uleshort	!0x27BD		{invalid}
+0	uleshort	0x27BD		MIPS instructions, function epilogue
+>2	ulelong	!0x03e00008	{invalid}
 
 # MIPS16e
 # nop (x4)
@@ -41,63 +41,63 @@
 # move $sp, $s1
 # restore XX, XX, XX
 # jrc $ra
-0	beshort	0x65B9			MIPS16e instructions, function epilogue
->3	byte	!0x64			{invalid}
->4	beshort	!0xE8A0			{invalid}
-0	leshort	0x65B9			MIPSEL16e instructions, function epilogue
->3	byte	!0x64			{invalid}
->4	leshort	!0xE8A0			{invalid}
+0	ubeshort	0x65B9			MIPS16e instructions, function epilogue
+>3	byte	    !0x64			{invalid}
+>4	ubeshort	!0xE8A0			{invalid}
+0	uleshort	0x65B9			MIPSEL16e instructions, function epilogue
+>3	byte	    !0x64			{invalid}
+>4	uleshort	!0xE8A0			{invalid}
 
 # jrc $ra
 # nop
-0	belong	0xe8a06500		MIPS16e instructions, function epilogue
-0	lelong	0xe8a06500		MIPSEL16e instructions, function epilogue
+0	ubelong	0xe8a06500		MIPS16e instructions, function epilogue
+0	ulelong	0xe8a06500		MIPSEL16e instructions, function epilogue
 
 # PowerPC prologue
 # mflr r0
-0	belong 0x7C0802A6	PowerPC big endian instructions, function prologue
-0	lelong 0x7C0802A6	PowerPC little endian instructions, function prologue
+0	ubelong 0x7C0802A6	PowerPC big endian instructions, function prologue
+0	ulelong 0x7C0802A6	PowerPC little endian instructions, function prologue
 
 # PowerPC epilogue
 # blr
-0	belong 0x4E800020	PowerPC big endian instructions, function epilogue
-0	lelong 0x4E800020	PowerPC little endian instructions, function epilogue
+0	ubelong 0x4E800020	PowerPC big endian instructions, function epilogue
+0	ulelong 0x4E800020	PowerPC little endian instructions, function epilogue
 
 # TODO: Add ARM Thumb dectection
 # ARM prologue
 # STMFD SP!, {XX}
 # <any instruction whose opcode begins with 0xE>
-0	beshort		0xE92D	ARMEB instructions, function prologue
+0	ubeshort	0xE92D	ARMEB instructions, function prologue
 >4	byte&0xF0	!0xE0	{invalid}
 >8	byte&0xF0	!0xE0	{invalid}
-0	leshort		0xE92D	ARM instructions, function prologue{adjust:-2}
+0	uleshort	0xE92D	ARM instructions, function prologue{adjust:-2}
 >5	byte&0xF0	!0xE0	{invalid}
 >9	byte&0xF0	!0xE0	{invalid}
 
 # ARM epilogue
 # MOV R0, XX
 # LDMFD SP!, {XX}
-0	beshort		0xE1A0	ARMEB instructions, function epilogue
+0	ubeshort	0xE1A0	ARMEB instructions, function epilogue
 >4	beshort		!0xE8BD	{invalid}
-0	leshort		0xE1A0	ARM instructions, function epilogue{adjust:-2}
+0	uleshort	0xE1A0	ARM instructions, function epilogue{adjust:-2}
 >4	leshort		!0xE8BD	{invalid}
 
 
 # Ubicom32 prologue
 # move.4 -4($sp)++, $ra
-0	belong	0x02FF6125	Ubicom32 instructions, function prologue
+0	ubelong	    0x02FF6125	Ubicom32 instructions, function prologue
 
 # Ubicom32 epilogues
 # calli $ra, 0($ra)
 # ret ($sp)4++
-0	belong	0xF0A000A0	Ubicom32 instructions, function epilogue
-0	belong	0x000022E1	Ubicom32 instructions, function epilogue
+0	ubelong	    0xF0A000A0	Ubicom32 instructions, function epilogue
+0	ubelong	    0x000022E1	Ubicom32 instructions, function epilogue
 
 # AVR8 prologue
 # push r28
 # push r29
-0	belong	0x93CF93DF	AVR8 instructions, function prologue
-0	belong	0x93DF93CF	AVR8 instructions, function prologue
+0	ubelong	    0x93CF93DF	AVR8 instructions, function prologue
+0	ubelong	    0x93DF93CF	AVR8 instructions, function prologue
 
 # AVR32 prologue
 # pushm   r7,lr