Fix RVCT compiler warnings, and a bug in the GdbStub

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

diff --git a/ArmPkg/Drivers/CpuDxe/Mmu.c b/ArmPkg/Drivers/CpuDxe/Mmu.c
index 6d512592c29bc05c2daa82fc3b5153f8ffcf2bbe..f2669fc32a83c3bf2f22937035a571dc4e7af7ab 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/Mmu.c
@@ -438,6 +438,8 @@ UpdatePageEntries (
   volatile ARM_FIRST_LEVEL_DESCRIPTOR   *FirstLevelTable;\r
   volatile ARM_PAGE_TABLE_ENTRY         *PageTable;\r
 \r
   volatile ARM_FIRST_LEVEL_DESCRIPTOR   *FirstLevelTable;\r
   volatile ARM_PAGE_TABLE_ENTRY         *PageTable;\r
 \r

+  Status = EFI_SUCCESS;\r
+\r

   // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone)\r
   // EntryValue: values at bit positions specified by EntryMask\r
   EntryMask = ARM_PAGE_DESC_TYPE_MASK;\r
   // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone)\r
   // EntryValue: values at bit positions specified by EntryMask\r
   EntryMask = ARM_PAGE_DESC_TYPE_MASK;\r

diff --git a/BeagleBoardPkg/PciEmulation/PciEmulation.c b/BeagleBoardPkg/PciEmulation/PciEmulation.c
index f558597932f7d81837e48606232054a2f27bde8d..fa44570b4c0453f702e4052c9ba0588b8e159533 100644 (file)
--- a/BeagleBoardPkg/PciEmulation/PciEmulation.c
+++ b/BeagleBoardPkg/PciEmulation/PciEmulation.c
@@ -436,7 +436,6 @@ PciIoAttributes (
   case EfiPciIoAttributeOperationDisable:
     // Since we are not a real PCI device no enable/set or disable operations exist.
     return EFI_SUCCESS;
   case EfiPciIoAttributeOperationDisable:
     // Since we are not a real PCI device no enable/set or disable operations exist.
     return EFI_SUCCESS;

-    break;

     
   default:
   ASSERT (FALSE);
     
   default:
   ASSERT (FALSE);

diff --git a/BeagleBoardPkg/Sec/Cache.c b/BeagleBoardPkg/Sec/Cache.c
index d7c906244c5ab21345bd8e22efdb21c1d896c141..12b585e7cf92fb42bf64c1389192990992354aa7 100755 (executable)
--- a/BeagleBoardPkg/Sec/Cache.c
+++ b/BeagleBoardPkg/Sec/Cache.c
@@ -38,14 +38,11 @@ InitCache (
   IN  UINT32  MemoryLength\r
   )\r
 {\r
   IN  UINT32  MemoryLength\r
   )\r
 {\r

-  UINTN                         UncachedMemoryMask;\r

   UINT32                        CacheAttributes;\r
   ARM_MEMORY_REGION_DESCRIPTOR  MemoryTable[5];\r
   VOID                          *TranslationTableBase;\r
   UINTN                         TranslationTableSize;\r
 \r
   UINT32                        CacheAttributes;\r
   ARM_MEMORY_REGION_DESCRIPTOR  MemoryTable[5];\r
   VOID                          *TranslationTableBase;\r
   UINTN                         TranslationTableSize;\r
 \r

-  UncachedMemoryMask = PcdGet64(PcdArmUncachedMemoryMask);\r
-\r

   if (FeaturePcdGet(PcdCacheEnable) == TRUE) {\r
     CacheAttributes = DDR_ATTRIBUTES_CACHED;\r
   } else {\r
   if (FeaturePcdGet(PcdCacheEnable) == TRUE) {\r
     CacheAttributes = DDR_ATTRIBUTES_CACHED;\r
   } else {\r

diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c
index 5b4d2946dbef39ab7e031d505e0a28779aac552d..537475204ca99728de6bb161e2266d5d93fa65ad 100755 (executable)
--- a/BeagleBoardPkg/Sec/Sec.c
+++ b/BeagleBoardPkg/Sec/Sec.c
@@ -239,7 +239,7 @@ CEntryPoint (
         //
 #ifdef __CC_ARM
         // Print out the command for the RVD debugger to load symbols for this image
         //
 #ifdef __CC_ARM
         // Print out the command for the RVD debugger to load symbols for this image

-        DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", SecDeCygwinPathIfNeeded (FilePath), PeCoffImage + Offset));
+        DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", SecDeCygwinPathIfNeeded (FilePath), (CHAR8 *)PeCoffImage + Offset));

 #elif __GNUC__\r
         // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required
         DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", FilePath, PeCoffImage + Offset));
 #elif __GNUC__\r
         // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required
         DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", FilePath, PeCoffImage + Offset));

diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf
index 79a5eb4b10929179ddac0ece13727fc8091a14fb..0f611e31320453940b386310ceb646c227e94b92 100755 (executable)
--- a/BeagleBoardPkg/Sec/Sec.inf
+++ b/BeagleBoardPkg/Sec/Sec.inf
@@ -52,8 +52,6 @@
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
 
 [FixedPcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
 
 [FixedPcd]

-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask
-

   gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
   gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase
   gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
   gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase

diff --git a/EmbeddedPkg/GdbStub/GdbStub.c b/EmbeddedPkg/GdbStub/GdbStub.c
index b121e413f3517c9561c56d02d41d237061097dbf..cc0e118f63093ab4d5d392b96e22ba4c94b5671f 100644 (file)
--- a/EmbeddedPkg/GdbStub/GdbStub.c
+++ b/EmbeddedPkg/GdbStub/GdbStub.c
@@ -976,7 +976,7 @@ PeCoffLoaderGetDebuggerInfo (
         case CODEVIEW_SIGNATURE_RSDS:
           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));
         case CODEVIEW_SIGNATURE_MTOC:
         case CODEVIEW_SIGNATURE_RSDS:
           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));
         case CODEVIEW_SIGNATURE_MTOC:

-          *DebugBase = (VOID *)(UINTN)((UINTN)DebugBase + SizeOfHeaders);
+          *DebugBase = (VOID *)(UINTN)((UINTN)DebugBase - SizeOfHeaders);

           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));
         default:
           break;
           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));
         default:
           break;