#define ENDIAN_FORMAT 21\r
#define DATA_CBZ 22\r
#define ADR_FORMAT 23\r
+#define IT_BLOCK 24\r
\r
// Thumb2 address modes\r
#define B_T3 200\r
THUMB_INSTRUCTIONS gOpThumb[] = {\r
// Thumb 16-bit instrucitons\r
// Op Mask Format\r
- { "ADC" , 0x4140, 0xffc0, DATA_FORMAT5 },\r
+ { "ADC" , 0x4140, 0xffc0, DATA_FORMAT5 }, // ADC <Rndn>, <Rm>\r
{ "ADR", 0xa000, 0xf800, ADR_FORMAT }, // ADR <Rd>, <label>\r
{ "ADD" , 0x1c00, 0xfe00, DATA_FORMAT2 },\r
{ "ADD" , 0x3000, 0xf800, DATA_FORMAT3 },\r
{ "EOR" , 0x4040, 0xffc0, DATA_FORMAT5 },\r
\r
{ "LDMIA" , 0xc800, 0xf800, LOAD_STORE_MULTIPLE_FORMAT1 },\r
- { "LDR" , 0x6800, 0xf800, LOAD_STORE_FORMAT1 },\r
- { "LDR" , 0x5800, 0xfe00, LOAD_STORE_FORMAT2 },\r
+ { "LDR" , 0x6800, 0xf800, LOAD_STORE_FORMAT1 }, // LDR <Rt>, [<Rn> {,#<imm>}]\r
+ { "LDR" , 0x5800, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>]\r
{ "LDR" , 0x4800, 0xf800, LOAD_STORE_FORMAT3 },\r
- { "LDR" , 0x9800, 0xf800, LOAD_STORE_FORMAT4 },\r
+ { "LDR" , 0x9800, 0xf800, LOAD_STORE_FORMAT4 }, // LDR <Rt>, [SP, #<imm>]\r
{ "LDRB" , 0x7800, 0xf800, LOAD_STORE_FORMAT1_B },\r
- { "LDRB" , 0x5c00, 0xfe00, LOAD_STORE_FORMAT2 },\r
+ { "LDRB" , 0x5c00, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>]\r
{ "LDRH" , 0x8800, 0xf800, LOAD_STORE_FORMAT1_H },\r
{ "LDRH" , 0x7a00, 0xfe00, LOAD_STORE_FORMAT2 },\r
- { "LDRSB" , 0x5600, 0xfe00, LOAD_STORE_FORMAT2 },\r
+ { "LDRSB" , 0x5600, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>]\r
{ "LDRSH" , 0x5e00, 0xfe00, LOAD_STORE_FORMAT2 },\r
\r
{ "MOVS", 0x0000, 0xffc0, DATA_FORMAT5 }, // LSL with imm5 == 0 is a MOVS, so this must go before LSL\r
{ "MUL" , 0x4340, 0xffc0, DATA_FORMAT5 },\r
{ "MVN" , 0x41c0, 0xffc0, DATA_FORMAT5 },\r
{ "NEG" , 0x4240, 0xffc0, DATA_FORMAT5 },\r
- { "ORR" , 0x4180, 0xffc0, DATA_FORMAT5 },\r
+ { "ORR" , 0x4300, 0xffc0, DATA_FORMAT5 },\r
{ "POP" , 0xbc00, 0xfe00, POP_FORMAT },\r
{ "PUSH", 0xb400, 0xfe00, PUSH_FORMAT },\r
\r
{ "SETEND" , 0xb650, 0xfff0, ENDIAN_FORMAT },\r
\r
{ "STMIA" , 0xc000, 0xf800, LOAD_STORE_MULTIPLE_FORMAT1 },\r
- { "STR" , 0x6000, 0xf800, LOAD_STORE_FORMAT1 },\r
- { "STR" , 0x5000, 0xfe00, LOAD_STORE_FORMAT2 },\r
- { "STR" , 0x4000, 0xf800, LOAD_STORE_FORMAT3 },\r
- { "STR" , 0x9000, 0xf800, LOAD_STORE_FORMAT4 },\r
- { "STRB" , 0x7000, 0xf800, LOAD_STORE_FORMAT1_B },\r
- { "STRB" , 0x5800, 0xfe00, LOAD_STORE_FORMAT2 },\r
- { "STRH" , 0x8000, 0xf800, LOAD_STORE_FORMAT1_H },\r
- { "STRH" , 0x5200, 0xfe00, LOAD_STORE_FORMAT2 },\r
+ { "STR" , 0x6000, 0xf800, LOAD_STORE_FORMAT1 }, // STR <Rt>, [<Rn> {,#<imm>}]\r
+ { "STR" , 0x5000, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>]\r
+ { "STR" , 0x9000, 0xf800, LOAD_STORE_FORMAT4 }, // STR <Rt>, [SP, #<imm>]\r
+ { "STRB" , 0x7000, 0xf800, LOAD_STORE_FORMAT1_B }, // STRB <Rt>, [<Rn>, #<imm5>]\r
+ { "STRB" , 0x5400, 0xfe00, LOAD_STORE_FORMAT2 }, // STRB <Rt>, [<Rn>, <Rm>]\r
+ { "STRH" , 0x8000, 0xf800, LOAD_STORE_FORMAT1_H }, // STRH <Rt>, [<Rn>{,#<imm>}]\r
+ { "STRH" , 0x5200, 0xfe00, LOAD_STORE_FORMAT2 }, // STRH <Rt>, [<Rn>, <Rm>]\r
\r
{ "SUB" , 0x1e00, 0xfe00, DATA_FORMAT2 },\r
{ "SUB" , 0x3800, 0xf800, DATA_FORMAT3 },\r
{ "SUB" , 0x1a00, 0xfe00, DATA_FORMAT1 },\r
{ "SUB" , 0xb080, 0xff80, DATA_FORMAT7 },\r
\r
+ { "SBC" , 0x4180, 0xffc0, DATA_FORMAT5 },\r
+\r
{ "SWI" , 0xdf00, 0xff00, IMMED_8 },\r
{ "SXTB", 0xb240, 0xffc0, DATA_FORMAT5 },\r
{ "SXTH", 0xb200, 0xffc0, DATA_FORMAT5 },\r
{ "TST" , 0x4200, 0xffc0, DATA_FORMAT5 },\r
{ "UXTB", 0xb2c0, 0xffc0, DATA_FORMAT5 },\r
- { "UXTH", 0xb280, 0xffc0, DATA_FORMAT5 }\r
+ { "UXTH", 0xb280, 0xffc0, DATA_FORMAT5 },\r
+\r
+ { "IT", 0xbf00, 0xff00, IT_BLOCK }\r
\r
};\r
\r
IN UINT16 **OpCodePtrPtr,\r
OUT CHAR8 *Buf,\r
OUT UINTN Size,\r
+ OUT UINT32 *ItBlock,\r
IN BOOLEAN Extended\r
)\r
{\r
UINT32 Offset;\r
UINT16 Rd, Rn, Rm, Rt, Rt2;\r
BOOLEAN H1, H2, imod;\r
+ BOOLEAN ItFlag;\r
UINT32 PC, Target, msbit, lsbit;\r
CHAR8 *Cond;\r
BOOLEAN S, J1, J2, P, U, W;\r
UINT32 coproc, opc1, opc2, CRd, CRn, CRm; \r
+ UINT32 Mask;\r
\r
OpCodePtr = *OpCodePtrPtr;\r
OpCode = **OpCodePtrPtr;\r
// Increment by the minimum instruction size, Thumb2 could be bigger\r
*OpCodePtrPtr += 1;\r
\r
+ // Manage IT Block ItFlag TRUE means we are in an IT block\r
+ if (*ItBlock != 0) {\r
+ ItFlag = TRUE;\r
+ *ItBlock -= 1;\r
+ } else {\r
+ ItFlag = FALSE;\r
+ }\r
+\r
for (Index = 0; Index < sizeof (gOpThumb)/sizeof (THUMB_INSTRUCTIONS); Index++) {\r
if ((OpCode & gOpThumb[Index].Mask) == gOpThumb[Index].OpCode) {\r
if (Extended) {\r
Target = (OpCode & 0xff) << 2;\r
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %08x", gReg[(OpCode >> 8) & 7], PCAlign4 (PC) + Target); \r
return;\r
+\r
+ case IT_BLOCK:\r
+ // ITSTATE = cond:mask OpCode[7:4]:OpCode[3:0]\r
+ // ITSTATE[7:5] == cond[3:1]\r
+ // ITSTATE[4] == 1st Instruction cond[0] \r
+ // ITSTATE[3] == 2st Instruction cond[0] \r
+ // ITSTATE[2] == 3st Instruction cond[0] \r
+ // ITSTATE[1] == 4st Instruction cond[0]\r
+ // ITSTATE[0] == 1 4 instruction IT block. 0 means 0,1,2 or 3 instructions\r
+ // 1st one in ITSTATE low bits defines the number of instructions\r
+ Mask = (OpCode & 0xf);\r
+ if ((Mask & 0x1) == 0x1) {\r
+ *ItBlock = 4;\r
+ Offset += AsciiSPrint (&Buf[Offset], Size - Offset, "%a%a%a", (Mask & BIT3)?"T":"E", (Mask & BIT2)?"T":"E", (Mask & BIT1)?"T":"E");\r
+ } else if ((OpCode & 0x3) == 0x2) {\r
+ *ItBlock = 3;\r
+ Offset += AsciiSPrint (&Buf[Offset], Size - Offset, "%a%a", (Mask & BIT3)?"T":"E", (Mask & BIT2)?"T":"E");\r
+ } else if ((OpCode & 0x7) == 0x4) {\r
+ *ItBlock = 2;\r
+ Offset += AsciiSPrint (&Buf[Offset], Size - Offset, "%a", (Mask & BIT3)?"T":"E");\r
+ } else if ((OpCode & 0xf) == 0x8) {\r
+ *ItBlock = 1;\r
+ }\r
+ AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gCondition[(OpCode >> 4) & 0xf]); \r
+ return;\r
}\r
}\r
}\r
@param OpCodePtrPtr Pointer to pointer of ARM Thumb instruction to disassemble. \r
@param Thumb TRUE for Thumb(2), FALSE for ARM instruction stream\r
@param Extended TRUE dump hex for instruction too.\r
+ @param ItBlock Size of IT Block\r
@param Buf Buffer to sprintf disassembly into.\r
@param Size Size of Buf in bytes. \r
\r
IN UINT8 **OpCodePtr,\r
IN BOOLEAN Thumb,\r
IN BOOLEAN Extended,\r
+ IN OUT UINT32 *ItBlock,\r
OUT CHAR8 *Buf,\r
OUT UINTN Size\r
)\r
{\r
if (Thumb) {\r
- DisassembleThumbInstruction ((UINT16 **)OpCodePtr, Buf, Size, Extended);\r
+ DisassembleThumbInstruction ((UINT16 **)OpCodePtr, Buf, Size, &ItBlock, Extended);\r
} else {\r
DisassembleArmInstruction ((UINT32 **)OpCodePtr, Buf, Size, Extended);\r
}\r
--- /dev/null
+//\r
+// Quick hack to work around not having sed, or any other reasonable \r
+// way to edit a file from a script on Windows......\r
+//\r
+// Copyright (c) 2010, Apple Inc. All rights reserved.\r
+// \r
+// All rights reserved. This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution. The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r
+\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <limits.h>\r
+\r
+#define TRUE 1\r
+#define FALSE 0\r
+\r
+typedef struct {\r
+ char *Match;\r
+ int MatchSize;\r
+ char *Replace;\r
+} MATCH_PAIR;\r
+\r
+//\r
+// argv[1] - Old File\r
+// argv[2] - New File\r
+// argv[3+n] - Match String\r
+// argv[4+n] - Replace string \r
+int\r
+main (int argc, char **argv)\r
+{\r
+ FILE *In, *Out;\r
+ char *Key, *Replace;\r
+ int c, i, n, Len, MaxLenKey = 0, MinLenKey = INT_MAX;\r
+ unsigned long InFileSize, InFilePos;\r
+ MATCH_PAIR *Match;\r
+ int MaxMatch;\r
+ int ReadCount;\r
+ int Found;\r
+\r
+ if (argc < 5) {\r
+ // Need at least two files and two strings\r
+ return -1;\r
+ } else if ((argc % 2) == 0) {\r
+ // Match and Replace string must come in pairs\r
+ return -4;\r
+ }\r
+\r
+ In = fopen (argv[1], "r");\r
+ fseek (In, 0, SEEK_END);\r
+ InFileSize = ftell (In);\r
+ if (InFileSize == 0) {\r
+ return -6;\r
+ }\r
+ fseek (In, 0, SEEK_SET);\r
+\r
+\r
+ Out = fopen (argv[2], "w+");\r
+ if ((In == NULL) || (Out == NULL)) {\r
+ return -2;\r
+ }\r
+\r
+ MaxMatch = (argc - 2)/2;\r
+ printf ("\nMaxMatch = %d:%d\n", MaxMatch, argc);\r
+ Match = calloc (MaxMatch, sizeof (MATCH_PAIR));\r
+ if (Match == NULL) {\r
+ return -7;\r
+ }\r
+\r
+ for (n=0; n < MaxMatch; n++) {\r
+ Match[n].Match = argv[3 + n*2];\r
+ Match[n].MatchSize = strlen (argv[3 + n*2]);\r
+ Match[n].Replace = argv[3 + n*2 + 1];\r
+printf ("%s > %s\n", Match[n].Match, Match[n].Replace);\r
+ if (Match[n].MatchSize > MaxLenKey) {\r
+ // Max size of match/replace string pair\r
+ MaxLenKey = Match[n].MatchSize;\r
+ }\r
+ if (Match[n].MatchSize < MinLenKey) {\r
+ MinLenKey = Match[n].MatchSize;\r
+ }\r
+ }\r
+\r
+ Key = malloc (MaxLenKey);\r
+ if (Key == NULL) {\r
+ return -5;\r
+ }\r
+\r
+ InFilePos = 0;\r
+ while (InFilePos < (InFileSize - MinLenKey)) {\r
+ fseek (In, InFilePos, SEEK_SET);\r
+ ReadCount = fread (Key, 1, MaxLenKey, In);\r
+ for (i = 0, Found = FALSE;i < MaxMatch; i++) {\r
+ if (ReadCount >= Match[i].MatchSize) {\r
+ if (!memcmp (Key, Match[i].Match, Match[i].MatchSize)) {\r
+ printf ("Found [%s] @ %u\n", Match[i].Match, InFilePos);\r
+ InFilePos += (Match[i].MatchSize - 1);\r
+ printf ("InFilePos = %u", InFilePos);\r
+ fputs (Match[i].Replace, Out);\r
+ Found = TRUE;\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ if (!Found) {\r
+ fputc (Key[0], Out);\r
+ }\r
+ \r
+ InFilePos++;\r
+ }\r
+\r
+ \r
+ fclose (In);\r
+ fclose (Out);\r
+ free (Key);\r
+ return 0;\r
+}\r
+\r
projects / mirror_edk2.git / commitdiff