Added new PeCoffGetEntryPoint lib function to get size of PE/COFF header. This is needed for debug prints with PE/COFF images that started as ELF or Mach-O. Moved and debugged ARM semihosting lib for RVD that prints out the debugger symbol load commands in a window on the debugger. Trying to write a script file, but that crashes RVD. Added debug print to BeagleBoard Sec that prints out RVD debugger command to load symbols for the Sec. Synced the rest of the code.

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

2 files changed, 26 insertions, 28 deletions

diff --git a/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c b/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c
index e1a515ef21..31efc0a16e 100644
--- a/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/Arm/SemihostLib.c
@@ -36,8 +36,9 @@ SemihostFileOpen (
   SEMIHOST_FILE_OPEN_BLOCK  OpenBlock;
   INT32                     Result;
 
-  if (FileHandle == NULL)
+  if (FileHandle == NULL) {
     return EFI_INVALID_PARAMETER;
+  }
 
   OpenBlock.FileName    = FileName;
   OpenBlock.Mode        = Mode;
@@ -45,12 +46,9 @@ SemihostFileOpen (
 
   Result = Semihost_SYS_OPEN(&OpenBlock);
 
-  if (Result == -1)
-  {
+  if (Result == -1) {
     return EFI_NOT_FOUND;
-  }
-  else
-  {
+  } else {
     *FileHandle = Result;
     return EFI_SUCCESS;
   }
@@ -70,10 +68,11 @@ SemihostFileSeek (
 
   Result = Semihost_SYS_SEEK(&SeekBlock);
 
-  if (Result == 0)
+  if (Result == 0) {
     return EFI_SUCCESS;
-  else
+  } else {
     return EFI_ABORTED;
+  }
 }
 
 EFI_STATUS
@@ -86,8 +85,9 @@ SemihostFileRead (
   SEMIHOST_FILE_READ_WRITE_BLOCK  ReadBlock;
   UINT32                          Result;
 
-  if ((Length == NULL) || (Buffer == NULL))
-      return EFI_INVALID_PARAMETER;
+  if ((Length == NULL) || (Buffer == NULL)) {
+    return EFI_INVALID_PARAMETER;
+  }
 
   ReadBlock.Handle = FileHandle;
   ReadBlock.Buffer = Buffer;
@@ -95,12 +95,9 @@ SemihostFileRead (
 
   Result = Semihost_SYS_READ(&ReadBlock);
 
-  if (Result == *Length)
-  {
+  if (Result == *Length) {
     return EFI_ABORTED;
-  }
-  else
-  {
+  } else {
     *Length -= Result;
     return EFI_SUCCESS;
   }
@@ -115,8 +112,9 @@ SemihostFileWrite (
 {
   SEMIHOST_FILE_READ_WRITE_BLOCK  WriteBlock;
 
-  if ((Length == NULL) || (Buffer == NULL))
+  if ((Length == NULL) || (Buffer == NULL)) {
     return EFI_INVALID_PARAMETER;
+  }
 
   WriteBlock.Handle = FileHandle;
   WriteBlock.Buffer = Buffer;
@@ -134,10 +132,11 @@ SemihostFileClose (
 {
   INT32 Result = Semihost_SYS_CLOSE(&FileHandle);
 
-  if (Result == -1)
+  if (Result == -1) {
     return EFI_INVALID_PARAMETER;
-  else
+  } else {
     return EFI_SUCCESS;
+  }
 }
 
 EFI_STATUS
@@ -148,17 +147,15 @@ SemihostFileLength (
 {
   INT32       Result;
 
-  if (Length == NULL)
+  if (Length == NULL) {
     return EFI_INVALID_PARAMETER;
+  }
 
   Result = Semihost_SYS_FLEN(&FileHandle);
 
-  if (Result == -1)
-  {
+  if (Result == -1) {
     return EFI_ABORTED;
-  }
-  else
-  {
+  } else {
     *Length = Result;
     return EFI_SUCCESS;
   }
@@ -177,10 +174,11 @@ SemihostFileRemove (
 
   Result = Semihost_SYS_REMOVE(&RemoveBlock);
 
-  if (Result == 0)
+  if (Result == 0) {
     return EFI_SUCCESS;
-  else
+  } else {
     return EFI_ABORTED;
+  }
 }
 
 CHAR8
diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.inf b/ArmPkg/Library/SemihostLib/SemihostLib.inf
index d05188c771..c4b5c682d0 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.inf
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.inf
@@ -1,5 +1,5 @@
 #/** @file

-# Semihosting  serail port lib

+# Semihosting JTAG lib

 #

 # Copyright (c) 2008 - 2010, Apple Inc.

 #

@@ -17,7 +17,7 @@
   INF_VERSION                    = 0x00010005

   BASE_NAME                      = SemihostLib

   FILE_GUID                      = C40D08BA-DB7B-4F07-905A-C5FE4B5AF987

-  MODULE_TYPE                    = UEFI_DRIVER

+  MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = SemihostLib