Update input of disasmembler to support IfThen construct. Add prototype dos script to build BeagleBoard.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9936 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 1 deletions

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c
index a0f327d654..86d1c7cec6 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c
@@ -235,6 +235,7 @@ DefaultExceptionHandler (
     CHAR8   CpsrStr[32];  // char per bit. Lower 5-bits are mode that is a 3 char string

     CHAR8   Buffer[80];

     UINT8   *DisAsm;

+    UINT32  ItBlock;

     

     CpsrString (SystemContext.SystemContextArm->CPSR, CpsrStr);

     DEBUG ((EFI_D_ERROR, "%a\n", CpsrStr));

@@ -256,7 +257,8 @@ DefaultExceptionHandler (
       

       // If we come from an image it is safe to show the instruction. We know it should not fault

       DisAsm = (UINT8 *)(UINTN)SystemContext.SystemContextArm->PC;

-      DisassembleInstruction (&DisAsm, (SystemContext.SystemContextArm->CPSR & BIT5) == BIT5, TRUE, Buffer, sizeof (Buffer));

+      ItBlock = 0;

+      DisassembleInstruction (&DisAsm, (SystemContext.SystemContextArm->CPSR & BIT5) == BIT5, TRUE, &ItBlock, Buffer, sizeof (Buffer));

       DEBUG ((EFI_D_ERROR, "\n%a", Buffer));

 

     }