Updated code signatures

src/binwalk/magic/binarch

@@ -27,6 +27,31 @@
 0	leshort	0x27BD		MIPS instructions, function epilogue
 >2	lelong	!0x03e00008	(invalid)
 
+# MIPS16e
+# nop (x4)
+0	string	\x65\x00\x65\x00\x65\x00\x65\x00	MIPS16e instructions, nops{jump-to-offset:8}
+0	string	\x00\x65\x00\x65\x00\x65\x00\x65	MIPSEL16e instructions, nops{jump-to-offset:8}
+
+# save a0-a1, XX
+# addiu XX, XX
+0	string	\xf0\x08\x64	MIPS16e instructions, function prologue
+>4	byte	!0x01			(invalid)
+
+# 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)
+
+# jrc $ra
+# nop
+0	belong	0xe8a06500		MIPS16e instructions, function epilogue
+0	lelong	0xe8a06500		MIPSEL16e instructions, function epilogue
+
 # PowerPC prologue
 # mflr r0
 0	belong 0x7C0802A6	PowerPC big endian instructions, function prologue
@@ -37,13 +62,13 @@
 0	belong 0x4E800020	PowerPC big endian instructions, function epilogue
 0	lelong 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
->5	byte&0xF0	!0xE0	(invalid)
->9	byte&0xF0	!0xE0	(invalid)
-
+>4	byte&0xF0	!0xE0	(invalid)
+>8	byte&0xF0	!0xE0	(invalid)
 0	leshort		0xE92D	ARM instructions, function prologue{offset-adjust:-2}
 >5	byte&0xF0	!0xE0	(invalid)
 >9	byte&0xF0	!0xE0	(invalid)

src/magic/firmware

@@ -70,7 +70,8 @@
 >32	string	x		image name: "%s"
 
 #IMG0 header, found in VxWorks-based Mercury router firmware
-0	string		IMG0		IMG0 (VxWorks) header,
+0	string		IMG0	IMG0 (VxWorks) header,
+>4	belong		<1		invalid
 >4	belong		x		size: %d
 
 #Mediatek bootloader signature
@@ -79,13 +80,13 @@
 
 #CSYS header formats
 0	string		CSYS\x00	CSYS header, little endian, 
->8	lelong		x		size: %d
+>8	lelong		x			size: %d
 
 0	string		CSYS\x80	CSYS header, big endian,
->8	belong		x		size: %d
+>8	belong		x			size: %d
 
 # wrgg firmware image
-0	string		wrgg02		WRGG firmware header,
+0	string		wrgg02	WRGG firmware header,
 >6	string		x		name: "%s",
 >48	string		x		root device: "%s"
 
@@ -108,7 +109,7 @@
 
 
 # Ubicom firmware image
-0	belong	0xFA320080		Ubicom firmware header,
+0	belong	0xFA320080	Ubicom firmware header,
 >12	belong	x			checksum: 0x%X,
 >24	belong	<0			invalid
 >24	belong	x			image size: %d