ARM Packages: Removed trailing spaces

Trailing spaces create issue/warning when generating/applying patches.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 575 insertions, 575 deletions

diff --git a/EmbeddedPkg/GdbStub/Arm/Processor.c b/EmbeddedPkg/GdbStub/Arm/Processor.c
index 38abb69d7e..80803b2d91 100644
--- a/EmbeddedPkg/GdbStub/Arm/Processor.c
+++ b/EmbeddedPkg/GdbStub/Arm/Processor.c
@@ -2,7 +2,7 @@
   Processor specific parts of the GDB stub

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -23,10 +23,10 @@
 //

 EFI_EXCEPTION_TYPE_ENTRY gExceptionType[] = {

   { EXCEPT_ARM_SOFTWARE_INTERRUPT,  GDB_SIGTRAP }

-//  { EXCEPT_ARM_UNDEFINED_INSTRUCTION, GDB_SIGTRAP },  

-//  { EXCEPT_ARM_PREFETCH_ABORT,        GDB_SIGTRAP }, 

-//  { EXCEPT_ARM_DATA_ABORT,            GDB_SIGEMT  },  

-//  { EXCEPT_ARM_RESERVED,              GDB_SIGILL  }  

+//  { EXCEPT_ARM_UNDEFINED_INSTRUCTION, GDB_SIGTRAP },

+//  { EXCEPT_ARM_PREFETCH_ABORT,        GDB_SIGTRAP },

+//  { EXCEPT_ARM_DATA_ABORT,            GDB_SIGEMT  },

+//  { EXCEPT_ARM_RESERVED,              GDB_SIGILL  }

 };

 

 // Shut up some annoying RVCT warnings

@@ -86,8 +86,8 @@ UINTN gRegisterOffsets[] = {
 

 /**

  Return the number of entries in the gExceptionType[]

- 

- @retval  UINTN, the number of entries in the gExceptionType[] array.    

+

+ @retval  UINTN, the number of entries in the gExceptionType[] array.

  **/

 UINTN

 MaxEfiException (

@@ -100,8 +100,8 @@ MaxEfiException (
 

 /**

  Return the number of entries in the gRegisters[]

- 

- @retval  UINTN, the number of entries (registers) in the gRegisters[] array.    

+

+ @retval  UINTN, the number of entries (registers) in the gRegisters[] array.

  **/

 UINTN

 MaxRegisterCount (

@@ -113,10 +113,10 @@ MaxRegisterCount (
 

 

 /**

- Check to see if the ISA is supported. 

+ Check to see if the ISA is supported.

  ISA = Instruction Set Architecture

 

- @retval TRUE if Isa is supported    

+ @retval TRUE if Isa is supported

 

 **/

 BOOLEAN

@@ -135,14 +135,14 @@ CheckIsa (
 /**

  This takes in the register number and the System Context, and returns a pointer to the RegNumber-th register in gdb ordering

  It is, by default, set to find the register pointer of the ARM member

- @param   SystemContext     Register content at time of the exception 

+ @param   SystemContext     Register content at time of the exception

  @param   RegNumber       The register to which we want to find a pointer

  @retval  the pointer to the RegNumber-th pointer

- **/ 

+ **/

 UINTN *

 FindPointerToRegister (

   IN  EFI_SYSTEM_CONTEXT      SystemContext,

-  IN  UINTN           RegNumber  

+  IN  UINTN           RegNumber

   )

 {

   UINT8 *TempPtr;

@@ -168,7 +168,7 @@ BasicReadRegister (
 {

   UINTN RegSize;

   CHAR8 Char;

-  

+

   if (gRegisterOffsets[RegNumber] > 0xF00) {

     AsciiSPrint (OutBufPtr, 9, "00000000");

     OutBufPtr += 8;

@@ -182,13 +182,13 @@ BasicReadRegister (
       Char = Char - 'A' + 'a';

     }

     *OutBufPtr++ = Char;

-    

+

     Char = mHexToStr[(UINT8)((*FindPointerToRegister (SystemContext, RegNumber) >> RegSize) & 0xf)];

     if ((Char >= 'A') && (Char <= 'F')) {

       Char = Char - 'A' + 'a';

     }

     *OutBufPtr++ = Char;

-    

+

     RegSize = RegSize + 8;

   }

   return OutBufPtr;

@@ -196,7 +196,7 @@ BasicReadRegister (
 

 

 /**

- Reads the n-th register's value into an output buffer and sends it as a packet 

+ Reads the n-th register's value into an output buffer and sends it as a packet

  @param   SystemContext   Register content at time of the exception

  @param   InBuffer      Pointer to the input buffer received from gdb server

  **/

@@ -209,29 +209,29 @@ ReadNthRegister (
   UINTN RegNumber;

   CHAR8 OutBuffer[9]; // 1 reg=8 hex chars, and the end '\0' (escape seq)

   CHAR8 *OutBufPtr;   // pointer to the output buffer

-  

+

   RegNumber = AsciiStrHexToUintn (&InBuffer[1]);

-  

+

   if (RegNumber >= MaxRegisterCount ()) {

-    SendError (GDB_EINVALIDREGNUM); 

+    SendError (GDB_EINVALIDREGNUM);

     return;

   }

-  

+

   OutBufPtr = OutBuffer;

   OutBufPtr = BasicReadRegister (SystemContext, RegNumber, OutBufPtr);

-  

+

   *OutBufPtr = '\0';  // the end of the buffer

   SendPacket (OutBuffer);

 }

 

 

 /**

- Reads the general registers into an output buffer  and sends it as a packet 

+ Reads the general registers into an output buffer  and sends it as a packet

  @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

-ReadGeneralRegisters (  

+ReadGeneralRegisters (

   IN  EFI_SYSTEM_CONTEXT      SystemContext

   )

 {

@@ -239,14 +239,14 @@ ReadGeneralRegisters (
   CHAR8   *OutBuffer;

   CHAR8   *OutBufPtr;

   UINTN   RegisterCount = MaxRegisterCount ();

-  

+

   // It is not safe to allocate pool here....

   OutBuffer = AllocatePool ((RegisterCount * 8) + 1); // 8 bytes per register in string format plus a null to terminate

   OutBufPtr = OutBuffer;

   for (Index = 0; Index < RegisterCount; Index++) {

     OutBufPtr = BasicReadRegister (SystemContext, Index, OutBufPtr);

   }

-  

+

   *OutBufPtr = '\0';

   SendPacket (OutBuffer);

   FreePool (OutBuffer);

@@ -270,7 +270,7 @@ CHAR8
   UINTN RegSize;

   UINTN TempValue; // the value transferred from a hex char

   UINT32 NewValue; // the new value of the RegNumber-th Register

-  

+

   if (gRegisterOffsets[RegNumber] > 0xF00) {

     return InBufPtr + 8;

   }

@@ -279,21 +279,21 @@ CHAR8
   RegSize = 0;

   while (RegSize < 32) {

     TempValue = HexCharToInt (*InBufPtr++);

-    

+

     if ((INTN)TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

     }

-    

+

     NewValue += (TempValue << (RegSize+4));

     TempValue = HexCharToInt (*InBufPtr++);

-    

+

     if ((INTN)TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

     }

-    

-    NewValue += (TempValue << RegSize); 

+

+    NewValue += (TempValue << RegSize);

     RegSize = RegSize + 8;

   }

   *(FindPointerToRegister (SystemContext, RegNumber)) = NewValue;

@@ -316,19 +316,19 @@ WriteNthRegister (
   CHAR8 RegNumBuffer[MAX_REG_NUM_BUF_SIZE];  // put the 'n..' part of the message into this array

   CHAR8 *RegNumBufPtr;

   CHAR8 *InBufPtr; // pointer to the input buffer

-  

+

   // find the register number to write

   InBufPtr = &InBuffer[1];

   RegNumBufPtr = RegNumBuffer;

   while (*InBufPtr != '=') {

     *RegNumBufPtr++ = *InBufPtr++;

-  } 

+  }

   *RegNumBufPtr = '\0';

-  RegNumber = AsciiStrHexToUintn (RegNumBuffer); 

-  

+  RegNumber = AsciiStrHexToUintn (RegNumBuffer);

+

   // check if this is a valid Register Number

   if (RegNumber >= MaxRegisterCount ()) {

-    SendError (GDB_EINVALIDREGNUM); 

+    SendError (GDB_EINVALIDREGNUM);

     return;

   }

   InBufPtr++;  // skips the '=' character

@@ -356,21 +356,21 @@ WriteGeneralRegisters (
   UINTN  RegisterCount = MaxRegisterCount ();

 

   MinLength = (RegisterCount * 8) + 1;  // 'G' plus the registers in ASCII format

-  

+

   if (AsciiStrLen (InBuffer) < MinLength) {

-    //Bad message. Message is not the right length 

-    SendError (GDB_EBADBUFSIZE); 

+    //Bad message. Message is not the right length

+    SendError (GDB_EBADBUFSIZE);

     return;

   }

-  

+

   InBufPtr = &InBuffer[1];

-  

+

   // Read the new values for the registers from the input buffer to an array, NewValueArray.

   // The values in the array are in the gdb ordering

   for (i = 0; i < RegisterCount; i++) {

     InBufPtr = BasicWriteRegister (SystemContext, i, InBufPtr);

   }

-  

+

   SendSuccess ();

 }

 

@@ -395,9 +395,9 @@ typedef struct {
 

 LIST_ENTRY  BreakpointList;

 

-/** 

+/**

  Insert Single Step in the SystemContext

- 

+

  @param	SystemContext	Register content at time of the exception

  **/

 VOID

@@ -410,11 +410,11 @@ AddSingleStep (
     return;

   }

   mSingleStepActive = TRUE;

-  

+

   mSingleStepPC = SystemContext.SystemContextArm->PC;

 

   mSingleStepDataSize = sizeof (UINT32);

-  mSingleStepData = (*(UINT32 *)mSingleStepPC); 

+  mSingleStepData = (*(UINT32 *)mSingleStepPC);

   *(UINT32 *)mSingleStepPC = GDB_ARM_BKPT;

   if (*(UINT32 *)mSingleStepPC != GDB_ARM_BKPT) {

     // For some reason our breakpoint did not take

@@ -425,10 +425,10 @@ AddSingleStep (
   //DEBUG((EFI_D_ERROR, "AddSingleStep at 0x%08x (was: 0x%08x is:0x%08x)\n", SystemContext.SystemContextArm->PC, mSingleStepData, *(UINT32 *)mSingleStepPC));

 }

 

-  

-/** 

+

+/**

  Remove Single Step in the SystemContext

- 

+

  @param	SystemContext	Register content at time of the exception

  **/

 VOID

@@ -439,7 +439,7 @@ RemoveSingleStep (
   if (!mSingleStepActive) {

     return;

   }

-  

+

   if (mSingleStepDataSize == sizeof (UINT16)) {

     *(UINT16 *)mSingleStepPC = (UINT16)mSingleStepData;

   } else {

@@ -453,10 +453,10 @@ RemoveSingleStep (
 

 

 /**

- Continue. addr is Address to resume. If addr is omitted, resume at current 

+ Continue. addr is Address to resume. If addr is omitted, resume at current

  Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -467,15 +467,15 @@ ContinueAtAddress (
 {

   if (PacketData[1] != '\0') {

     SystemContext.SystemContextArm->PC = AsciiStrHexToUintn (&PacketData[1]);

-  } 

+  }

 }

 

 

 /** ‘s [addr ]’

- Single step. addr is the Address at which to resume. If addr is omitted, resume 

+ Single step. addr is the Address at which to resume. If addr is omitted, resume

  at same Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -554,7 +554,7 @@ SetBreakpoint (
   Breakpoint->Signature   = ARM_SOFTWARE_BREAKPOINT_SIGNATURE;

   Breakpoint->Address     = Address;

   Breakpoint->Instruction = *(UINT32 *)Address;

-  

+

   // Add it to the list

   InsertTailList (&BreakpointList, &Breakpoint->Link);

 

@@ -645,7 +645,7 @@ RemoveBreakPoint (
   switch (Type) {

     case 0:   //Software breakpoint

       break;

-    

+

     default:

       SendError (GDB_EINVALIDBRKPOINTTYPE);

       return;

@@ -679,13 +679,13 @@ ValidateAddress (
 

 BOOLEAN

 ValidateException (

-  IN  EFI_EXCEPTION_TYPE    ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT SystemContext 

+  IN  EFI_EXCEPTION_TYPE    ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT SystemContext

   )

 {

   UINT32  ExceptionAddress;

   UINT32  Instruction;

-  

+

   // Is it a debugger SWI?

   ExceptionAddress = SystemContext.SystemContextArm->PC -= 4;

   Instruction      = *(UINT32 *)ExceptionAddress;

diff --git a/EmbeddedPkg/GdbStub/GdbStub.c b/EmbeddedPkg/GdbStub/GdbStub.c
index 9136c14b2b..213038ad08 100644
--- a/EmbeddedPkg/GdbStub/GdbStub.c
+++ b/EmbeddedPkg/GdbStub/GdbStub.c
@@ -1,12 +1,12 @@
 /** @file

   UEFI driver that implements a GDB stub

-  

+

   Note: Any code in the path of the Serial IO output can not call DEBUG as will

   will blow out the stack. Serial IO calls DEBUG, debug calls Serail IO, ...

-  

+

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -29,7 +29,7 @@ UINTN     gMaxProcessorIndex = 0;
 CHAR8 gInBuffer[MAX_BUF_SIZE];

 CHAR8 gOutBuffer[MAX_BUF_SIZE];

 

-// Assume gdb does a "qXfer:libraries:read::offset,length" when it connects so we can default 

+// Assume gdb does a "qXfer:libraries:read::offset,length" when it connects so we can default

 // this value to FALSE. Since gdb can reconnect its self a global default is not good enough

 BOOLEAN   gSymbolTableUpdate = FALSE;

 EFI_EVENT gEvent;

@@ -59,12 +59,12 @@ GdbSymbolEventHandler (
 

 /**

   The user Entry Point for Application. The user code starts with this function

-  as the real entry point for the image goes into a library that calls this 

+  as the real entry point for the image goes into a library that calls this

   function.

 

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  

+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.

   @param[in] SystemTable    A pointer to the EFI System Table.

-  

+

   @retval EFI_SUCCESS       The entry point is executed successfully.

   @retval other             Some error occurs when executing this entry point.

 

@@ -76,7 +76,7 @@ GdbStubEntry (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                  Status;  

+  EFI_STATUS                  Status;

   EFI_DEBUG_SUPPORT_PROTOCOL  *DebugSupport;

   UINTN                       HandleCount;

   EFI_HANDLE                  *Handles;

@@ -101,7 +101,7 @@ GdbStubEntry (
 

     return Status;

   }

-  

+

   DebugSupport = NULL;

   IsaSupported = FALSE;

   do {

@@ -120,19 +120,19 @@ GdbStubEntry (
     }

   } while (HandleCount > 0);

   FreePool (Handles);

-  

+

   if (!IsaSupported) {

     DEBUG ((EFI_D_ERROR, "Debug Support Protocol does not support our ISA\n"));

 

     return EFI_NOT_FOUND;

   }

-  

+

   Status = DebugSupport->GetMaximumProcessorIndex (DebugSupport, &gMaxProcessorIndex);

   ASSERT_EFI_ERROR (Status);

-  

+

   DEBUG ((EFI_D_INFO, "Debug Support Protocol ISA %x\n", DebugSupport->Isa));

   DEBUG ((EFI_D_INFO, "Debug Support Protocol Processor Index %d\n", gMaxProcessorIndex));

-  

+

   // Call processor-specific init routine

   InitializeProcessor ();

 

@@ -147,10 +147,10 @@ GdbStubEntry (
     Status = DebugSupport->RegisterPeriodicCallback (DebugSupport, Processor, GdbPeriodicCallBack);

     ASSERT_EFI_ERROR (Status);

   }

- 

+

   //

   // This even fires every time an image is added. This allows the stub to know when gdb needs

-  // to update the symbol table. 

+  // to update the symbol table.

   //

   Status = gBS->CreateEvent (

                   EVT_NOTIFY_SIGNAL,

@@ -171,11 +171,11 @@ GdbStubEntry (
                   );

   ASSERT_EFI_ERROR (Status);

 

- 

+

  if (PcdGetBool (PcdGdbSerial)) {

    GdbInitializeSerialConsole ();

  }

-   

+

   return EFI_SUCCESS;

 }

 

@@ -196,14 +196,14 @@ TransferFromInBufToMem (
 {

   CHAR8 c1;

   CHAR8 c2;

-   

+

   while (Length-- > 0) {

     c1 = (CHAR8)HexCharToInt (*NewData++);

     c2 = (CHAR8)HexCharToInt (*NewData++);

 

     if ((c1 < 0) || (c2 < 0)) {

       Print ((CHAR16 *)L"Bad message from write to memory..\n");

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return;

     }

     *Address++ = (UINT8)((c1 << 4) + c2);

@@ -239,7 +239,7 @@ TransferFromMemToOutBufAndSend (
 

   OutBufPtr = OutBuffer;

   while (Length > 0) {

-    

+

     Char = mHexToStr[*Address >> 4];

     if ((Char >= 'A') && (Char <= 'F')) {

       Char = Char - 'A' + 'a';

@@ -264,16 +264,16 @@ TransferFromMemToOutBufAndSend (
 

 /**

   Send a GDB Remote Serial Protocol Packet

-  

-  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$', 

+

+  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$',

   the packet teminating character '#' and the two digit checksum.

-  

-  If an ack '+' is not sent resend the packet, but timeout eventually so we don't end up 

+

+  If an ack '+' is not sent resend the packet, but timeout eventually so we don't end up

   in an infinit loop. This is so if you unplug the debugger code just keeps running

 

-  @param PacketData   Payload data for the packet  

+  @param PacketData   Payload data for the packet

+

 

-  

   @retval             Number of bytes of packet data sent.

 

 **/

@@ -287,7 +287,7 @@ SendPacket (
   CHAR8 *Ptr;

   CHAR8 TestChar;

   UINTN Count;

-  

+

   Timeout = PcdGet32 (PcdGdbMaxPacketRetryCount);

 

   Count = 0;

@@ -299,38 +299,38 @@ SendPacket (
       // Only try a finite number of times so we don't get stuck in the loop

       return Count;

     }

-  

+

     // Packet prefix

     GdbPutChar ('$');

-  

+

     for (CheckSum = 0, Count =0 ; *Ptr != '\0'; Ptr++, Count++) {

       GdbPutChar (*Ptr);

       CheckSum = CheckSum + *Ptr;

     }

-  

-    // Packet terminating character and checksum 

+

+    // Packet terminating character and checksum

     GdbPutChar ('#');

     GdbPutChar (mHexToStr[CheckSum >> 4]);

     GdbPutChar (mHexToStr[CheckSum & 0x0F]);

-    

+

     TestChar =  GdbGetChar ();

   } while (TestChar != '+');

-  

+

   return Count;

 }

 

 /**

   Receive a GDB Remote Serial Protocol Packet

-  

-  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$', 

+

+  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$',

   the packet teminating character '#' and the two digit checksum.

- 

+

   If host re-starts sending a packet without ending the previous packet, only the last valid packet is proccessed.

   (In other words, if received packet is '$12345$12345$123456#checksum', only '$123456#checksum' will be processed.)

- 

+

   If an ack '+' is not sent resend the packet

 

-  @param PacketData   Payload data for the packet  

+  @param PacketData   Payload data for the packet

 

   @retval             Number of bytes of packet data received.

 

@@ -346,16 +346,16 @@ ReceivePacket (
   CHAR8 Char;

   CHAR8 SumString[3];

   CHAR8 TestChar;

-  

+

   ZeroMem (PacketData, PacketDataSize);

-  

+

   for (;;) {

       // wait for the start of a packet

     TestChar = GdbGetChar ();

     while (TestChar != '$') {

       TestChar = GdbGetChar ();

     };

-    

+

   retry:

     for (Index = 0, CheckSum = 0; Index < (PacketDataSize - 1); Index++) {

       Char = GdbGetChar ();

@@ -375,14 +375,14 @@ ReceivePacket (
       continue;

     }

 

-    SumString[0] = GdbGetChar ();  

+    SumString[0] = GdbGetChar ();

     SumString[1] = GdbGetChar ();

     SumString[2] = '\0';

-    

+

     if (AsciiStrHexToUintn (SumString) == CheckSum) {

       // Ack: Success

       GdbPutChar ('+');

-  

+

       // Null terminate the callers string

       PacketData[Index] = '\0';

       return Index;

@@ -391,27 +391,27 @@ ReceivePacket (
       GdbPutChar ('-');

     }

   }

-  

+

   //return 0;

 }

 

 

 /**

- Empties the given buffer 

+ Empties the given buffer

  @param   Buf          pointer to the first element in buffer to be emptied

  **/

 VOID

-EmptyBuffer ( 

+EmptyBuffer (

   IN  CHAR8           *Buf

   )

-{ 

+{

   *Buf = '\0';

 }

 

 

 /**

  Converts an 8-bit Hex Char into a INTN.

- 

+

  @param   Char the hex character to be converted into UINTN

  @retval  a INTN, from 0 to 15, that corressponds to Char

  -1 if Char is not a hex character

@@ -428,7 +428,7 @@ HexCharToInt (
   } else if ((Char >= '0') && (Char <= '9')) {

     return Char - '0';

   } else { // if not a hex value, return a negative value

-    return -1; 

+    return -1;

   }

 }

 

@@ -439,7 +439,7 @@ CHAR8 *gError = "E__";
  Send an error with the given error number after converting to hex.

  The error number is put into the buffer in hex. '255' is the biggest errno we can send.

  ex: 162 will be sent as A2.

- 

+

  @param   errno           the error number that will be sent

  **/

 VOID

@@ -453,7 +453,7 @@ SendError (
   //

   gError[1] = mHexToStr [ErrorNum >> 4];

   gError[2] = mHexToStr [ErrorNum & 0x0f];

-    

+

   SendPacket (gError); // send buffer

 }

 

@@ -466,7 +466,7 @@ VOID
 EFIAPI

 SendSuccess (

   VOID

-  ) 

+  )

 {

   SendPacket ("OK"); // send buffer

 }

@@ -475,11 +475,11 @@ SendSuccess (
 /**

  Send empty packet to specify that particular command/functionality is not supported.

  **/

-VOID        

-EFIAPI      

+VOID

+EFIAPI

 SendNotSupported (

-  VOID          

-  )             

+  VOID

+  )

 {

   SendPacket ("");

 }

@@ -487,7 +487,7 @@ SendNotSupported (
 

 /**

  Send the T signal with the given exception type (in gdb order) and possibly with n:r pairs related to the watchpoints

- 

+

  @param  SystemContext        Register content at time of the exception

  @param  GdbExceptionType     GDB exception type

  **/

@@ -513,9 +513,9 @@ GdbSendTSignal (
   //

   // replace _, or previous value, with Exception type

   //

-  *TSignalPtr++ = mHexToStr [GdbExceptionType >> 4]; 

+  *TSignalPtr++ = mHexToStr [GdbExceptionType >> 4];

   *TSignalPtr++ = mHexToStr [GdbExceptionType & 0x0f];

-  

+

   if (GdbExceptionType == GDB_SIGTRAP) {

     if (gSymbolTableUpdate) {

       //

@@ -531,17 +531,17 @@ GdbSendTSignal (
 

       //

       // possible n:r pairs

-      // 

+      //

 

       //Retrieve the breakpoint number

       BreakpointDetected = GetBreakpointDetected (SystemContext);

 

       //Figure out if the exception is happend due to watch, rwatch or awatch.

-      BreakType = GetBreakpointType (SystemContext, BreakpointDetected); 

+      BreakType = GetBreakpointType (SystemContext, BreakpointDetected);

 

       //INFO: rwatch is not supported due to the way IA32 debug registers work

       if ((BreakType == DataWrite) || (BreakType == DataRead) || (BreakType == DataReadWrite)) {

-        

+

         //Construct n:r pair

         DataAddress = GetBreakpointDataAddress (SystemContext, BreakpointDetected);

 

@@ -559,7 +559,7 @@ GdbSendTSignal (
         }

 

         *TSignalPtr++ = ':';

-        

+

         //Set up series of bytes in big-endian byte order. "awatch" won't work with little-endian byte order.

         RegSize = REG_SIZE;

         while (RegSize > 0) {

@@ -575,23 +575,23 @@ GdbSendTSignal (
 

   *TSignalPtr = '\0';

 

-  SendPacket (TSignalBuffer); 

+  SendPacket (TSignalBuffer);

 }

 

 

 /**

  Translates the EFI mapping to GDB mapping

- 

+

  @param   EFIExceptionType    EFI Exception that is being processed

  @retval  UINTN that corresponds to EFIExceptionType's GDB exception type number

  **/

 UINT8

-ConvertEFItoGDBtype ( 

+ConvertEFItoGDBtype (

   IN  EFI_EXCEPTION_TYPE      EFIExceptionType

   )

-{ 

+{

   UINTN Index;

-  

+

   for (Index = 0; Index < MaxEfiException () ; Index++) {

     if (gExceptionType[Index].Exception == EFIExceptionType) {

       return gExceptionType[Index].SignalNo;

@@ -602,8 +602,8 @@ ConvertEFItoGDBtype (
 

 

 /** "m addr,length"

- Find the Length of the area to read and the start addres. Finally, pass them to 

- another function, TransferFromMemToOutBufAndSend, that will read from that memory space and 

+ Find the Length of the area to read and the start addres. Finally, pass them to

+ another function, TransferFromMemToOutBufAndSend, that will read from that memory space and

  send it as a packet.

  **/

 

@@ -618,39 +618,39 @@ ReadFromMemory (
   CHAR8 AddressBuffer[MAX_ADDR_SIZE]; // the buffer that will hold the address in hex chars

   CHAR8 *AddrBufPtr; // pointer to the address buffer

   CHAR8 *InBufPtr; /// pointer to the input buffer

-  

+

   AddrBufPtr = AddressBuffer;

   InBufPtr = &PacketData[1];

   while (*InBufPtr != ',') {

     *AddrBufPtr++ = *InBufPtr++;

   }

   *AddrBufPtr = '\0';

-  

+

   InBufPtr++; // this skips ',' in the buffer

-  

+

   /* Error checking */

   if (AsciiStrLen (AddressBuffer) >= MAX_ADDR_SIZE) {

     Print((CHAR16 *)L"Address is too long\n");

-    SendError (GDB_EBADMEMADDRBUFSIZE); 

+    SendError (GDB_EBADMEMADDRBUFSIZE);

     return;

   }

-  

+

   // 2 = 'm' + ','

   if (AsciiStrLen (PacketData) - AsciiStrLen (AddressBuffer) - 2 >= MAX_LENGTH_SIZE) {

     Print((CHAR16 *)L"Length is too long\n");

-    SendError (GDB_EBADMEMLENGTH); 

+    SendError (GDB_EBADMEMLENGTH);

     return;

   }

-  

+

   Address = AsciiStrHexToUintn (AddressBuffer);

   Length = AsciiStrHexToUintn (InBufPtr);

-  

+

   TransferFromMemToOutBufAndSend (Length, (unsigned char *)Address);

 }

 

 

 /** "M addr,length :XX..."

- Find the Length of the area in bytes to write and the start addres. Finally, pass them to 

+ Find the Length of the area in bytes to write and the start addres. Finally, pass them to

  another function, TransferFromInBufToMem, that will write to that memory space the info in

  the input buffer.

  **/

@@ -668,50 +668,50 @@ WriteToMemory (
   CHAR8 *AddrBufPtr; // pointer to the Address buffer

   CHAR8 *LengthBufPtr; // pointer to the Length buffer

   CHAR8 *InBufPtr; /// pointer to the input buffer

-  

+

   AddrBufPtr = AddressBuffer;

   LengthBufPtr = LengthBuffer;

   InBufPtr = &PacketData[1];

-  

+

   while (*InBufPtr != ',') {

     *AddrBufPtr++ = *InBufPtr++;

   }

   *AddrBufPtr = '\0';

-  

+

   InBufPtr++; // this skips ',' in the buffer

-  

+

   while (*InBufPtr != ':') {

     *LengthBufPtr++ = *InBufPtr++;

   }

   *LengthBufPtr = '\0';

-  

+

   InBufPtr++; // this skips ':' in the buffer

-  

+

   Address = AsciiStrHexToUintn (AddressBuffer);

   Length = AsciiStrHexToUintn (LengthBuffer);

-  

+

   /* Error checking */

-  

+

   //Check if Address is not too long.

   if (AsciiStrLen (AddressBuffer) >= MAX_ADDR_SIZE) {

     Print ((CHAR16 *)L"Address too long..\n");

-    SendError (GDB_EBADMEMADDRBUFSIZE); 

+    SendError (GDB_EBADMEMADDRBUFSIZE);

     return;

   }

-  

+

   //Check if message length is not too long

   if (AsciiStrLen (LengthBuffer) >= MAX_LENGTH_SIZE) {

     Print ((CHAR16 *)L"Length too long..\n");

-    SendError (GDB_EBADMEMLENGBUFSIZE); 

+    SendError (GDB_EBADMEMLENGBUFSIZE);

     return;

   }

-  

+

   // Check if Message is not too long/short.

   // 3 = 'M' + ',' + ':'

   MessageLength = (AsciiStrLen (PacketData) - AsciiStrLen (AddressBuffer) - AsciiStrLen (LengthBuffer) - 3);

   if (MessageLength != (2*Length)) {

     //Message too long/short. New data is not the right size.

-    SendError (GDB_EBADMEMDATASIZE);   

+    SendError (GDB_EBADMEMDATASIZE);

     return;

   }

   TransferFromInBufToMem (Length, (unsigned char *)Address, InBufPtr);

@@ -800,7 +800,7 @@ gXferObjectReadResponse (
   *OutBufPtr++ = Type;

   Count = 1;

 

-  // Binary data encoding 

+  // Binary data encoding

   OutBufPtr = gOutBuffer;

   while (*Str != '\0') {

     Char = *Str++;

@@ -816,17 +816,17 @@ gXferObjectReadResponse (
 

   *OutBufPtr = '\0' ;  // the end of the buffer

   SendPacket (gOutBuffer);

-  

+

   return Count;

 }

 

 

 /**

-  Note: This should be a library function.  In the Apple case you have to add 

-  the size of the PE/COFF header into the starting address to make things work 

+  Note: This should be a library function.  In the Apple case you have to add

+  the size of the PE/COFF header into the starting address to make things work

   right as there is no way to pad the Mach-O for the size of the PE/COFF header.

-  

-  

+

+

   Returns a pointer to the PDB file name for a PE/COFF image that has been

   loaded into system memory with the PE/COFF Loader Library functions.

 

@@ -844,7 +844,7 @@ gXferObjectReadResponse (
 

   @return The PDB file name for the PE/COFF image specified by Pe32Data or NULL

           if it cannot be retrieved. DebugBase is only valid if PDB file name is

-          valid. 

+          valid.

 

 **/

 VOID *

@@ -895,14 +895,14 @@ PeCoffLoaderGetDebuggerInfo (
                     TEImageAdjust);

     }

     SizeOfHeaders = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN)Hdr.Te->BaseOfCode - (UINTN)Hdr.Te->StrippedSize;

-    

+

     // __APPLE__ check this math...

     *DebugBase = ((CHAR8 *)Pe32Data) -  TEImageAdjust;

   } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {

-    

+

     *DebugBase = Pe32Data;

-    

-    

+

+

     //

     // NOTE: We use Machine field to identify PE32/PE32+, instead of Magic.

     //       It is due to backward-compatibility, for some system might

@@ -983,38 +983,38 @@ PeCoffLoaderGetDebuggerInfo (
 }

 

 

-/** 

+/**

   Process "qXfer:object:read:annex:offset,length" request.

-  

-  Returns an XML document that contains loaded libraries. In our case it is 

+

+  Returns an XML document that contains loaded libraries. In our case it is

   information in the EFI Debug Image Table converted into an XML document.

-  

-  GDB will call with an arbitrary length (it can't know the real length and 

-  will reply with chunks of XML that are easy for us to deal with. Gdb will 

+

+  GDB will call with an arbitrary length (it can't know the real length and

+  will reply with chunks of XML that are easy for us to deal with. Gdb will

   keep calling until we say we are done. XML doc looks like:

-  

+

   <library-list>

     <library name="/a/a/c/d.dSYM"><segment address="0x10000000"/></library>

     <library name="/a/m/e/e.pdb"><segment address="0x20000000"/></library>

     <library name="/a/l/f/f.dll"><segment address="0x30000000"/></library>

   </library-list>

-  

+

   Since we can not allocate memory in interrupt context this module has

   assumptions about how it will get called:

   1) Length will generally be max remote packet size (big enough)

   2) First Offset of an XML document read needs to be 0

   3) This code will return back small chunks of the XML document on every read.

      Each subsequent call will ask for the next available part of the document.

-     

+

   Note: The only variable size element in the XML is:

-  "  <library name=\"%s\"><segment address=\"%p\"/></library>\n" and it is 

+  "  <library name=\"%s\"><segment address=\"%p\"/></library>\n" and it is

   based on the file path and name of the symbol file. If the symbol file name

   is bigger than the max gdb remote packet size we could update this code

   to respond back in chunks.

 

  @param Offset  offset into special data area

- @param Length  number of bytes to read starting at Offset  

-  

+ @param Length  number of bytes to read starting at Offset

+

  **/

 VOID

 QxferLibrary (

@@ -1029,8 +1029,8 @@ QxferLibrary (
   if (Offset != gPacketqXferLibraryOffset) {

     SendError (GDB_EINVALIDARG);

     Print (L"\nqXferLibrary (%d, %d) != %d\n", Offset, Length, gPacketqXferLibraryOffset);

-    

-    // Force a retry from the beginning 

+

+    // Force a retry from the beginning

     gPacketqXferLibraryOffset = 0;

 

     return;

@@ -1038,41 +1038,41 @@ QxferLibrary (
 

   if (Offset == 0) {

     gPacketqXferLibraryOffset += gXferObjectReadResponse ('m', "<library-list>\n");

-    

+

     // The owner of the table may have had to ralloc it so grab a fresh copy every time

-    // we assume qXferLibrary will get called over and over again until the entire XML table is 

+    // we assume qXferLibrary will get called over and over again until the entire XML table is

     // returned in a tight loop. Since we are in the debugger the table should not get updated

     gDebugTable = gDebugImageTableHeader->EfiDebugImageInfoTable;

     gEfiDebugImageTableEntry = 0;

     return;

   }

-  

+

   if (gDebugTable != NULL) {

     for (; gEfiDebugImageTableEntry < gDebugImageTableHeader->TableSize; gEfiDebugImageTableEntry++, gDebugTable++) {

       if (gDebugTable->NormalImage != NULL) {

-        if ((gDebugTable->NormalImage->ImageInfoType == EFI_DEBUG_IMAGE_INFO_TYPE_NORMAL) && 

+        if ((gDebugTable->NormalImage->ImageInfoType == EFI_DEBUG_IMAGE_INFO_TYPE_NORMAL) &&

             (gDebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {

           Pdb = PeCoffLoaderGetDebuggerInfo (

-                 gDebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase, 

+                 gDebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase,

                  &LoadAddress

                  );

           if (Pdb != NULL) {

             Size = AsciiSPrint (

-                    gXferLibraryBuffer, 

-                    sizeof (gXferLibraryBuffer), 

-                    "  <library name=\"%a\"><segment address=\"0x%p\"/></library>\n", 

+                    gXferLibraryBuffer,

+                    sizeof (gXferLibraryBuffer),

+                    "  <library name=\"%a\"><segment address=\"0x%p\"/></library>\n",

                     Pdb,

                     LoadAddress

                     );

             if ((Size != 0) && (Size != (sizeof (gXferLibraryBuffer) - 1))) {

               gPacketqXferLibraryOffset += gXferObjectReadResponse ('m', gXferLibraryBuffer);

-              

+

               // Update loop variables so we are in the right place when we get back

               gEfiDebugImageTableEntry++;

               gDebugTable++;

               return;

             } else {

-              // We could handle <library> entires larger than sizeof (gXferLibraryBuffer) here if 

+              // We could handle <library> entires larger than sizeof (gXferLibraryBuffer) here if

               // needed by breaking up into N packets

               // "<library name=\"%s

               // the rest of the string (as many packets as required

@@ -1080,13 +1080,13 @@ QxferLibrary (
               //

               // But right now we just skip any entry that is too big

             }

-          }           

+          }

         }

-      }  

+      }

     }

   }

-  

-  

+

+

   gXferObjectReadResponse ('l', "</library-list>\n");

   gPacketqXferLibraryOffset = 0;

   return;

@@ -1096,55 +1096,55 @@ QxferLibrary (
 /**

  Exception Hanldler for GDB. It will be called for all exceptions

  registered via the gExceptionType[] array.

- 

+

  @param ExceptionType     Exception that is being processed

- @param SystemContext     Register content at time of the exception  

+ @param SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

-GdbExceptionHandler ( 

-  IN  EFI_EXCEPTION_TYPE        ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT     SystemContext 

+GdbExceptionHandler (

+  IN  EFI_EXCEPTION_TYPE        ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT     SystemContext

   )

 {

   UINT8   GdbExceptionType;

   CHAR8   *Ptr;

-      

-  

+

+

   if (ValidateException (ExceptionType, SystemContext) == FALSE) {

     return;

   }

 

   RemoveSingleStep (SystemContext);

-  

+

   GdbExceptionType = ConvertEFItoGDBtype (ExceptionType);

   GdbSendTSignal (SystemContext, GdbExceptionType);

-  

+

   for( ; ; ) {

     ReceivePacket (gInBuffer, MAX_BUF_SIZE);

-    

+

     switch (gInBuffer[0]) {

       case '?':

         GdbSendTSignal (SystemContext, GdbExceptionType);

         break;

-          

+

       case 'c':

-        ContinueAtAddress (SystemContext, gInBuffer);          

+        ContinueAtAddress (SystemContext, gInBuffer);

         return;

 

       case 'g':

         ReadGeneralRegisters (SystemContext);

         break;

-          

+

       case 'G':

         WriteGeneralRegisters (SystemContext, gInBuffer);

         break;

-          

+

       case 'H':

-        //Return "OK" packet since we don't have more than one thread. 

+        //Return "OK" packet since we don't have more than one thread.

         SendSuccess ();

         break;

-          

+

       case 'm':

         ReadFromMemory (gInBuffer);

         break;

@@ -1160,7 +1160,7 @@ GdbExceptionHandler (
       //

       // Still debugging this code. Not used in Darwin

       //

-      case 'q': 

+      case 'q':

         // General Query Packets

         if (AsciiStrnCmp (gInBuffer, "qSupported", 10) == 0) {

           // return what we currently support, we don't parse what gdb suports

@@ -1170,7 +1170,7 @@ GdbExceptionHandler (
           // ‘qXfer:libraries:read::offset,length

           // gInBuffer[22] is offset string, ++Ptr is length string’

           for (Ptr = &gInBuffer[22]; *Ptr != ','; Ptr++);

-        

+

           // Not sure if multi-radix support is required. Currently only support decimal

           QxferLibrary (AsciiStrHexToUintn (&gInBuffer[22]), AsciiStrHexToUintn (++Ptr));

         } if (AsciiStrnCmp (gInBuffer, "qOffsets", 10) == 0) {

@@ -1183,18 +1183,18 @@ GdbExceptionHandler (
         break;

 

       case 's':

-        SingleStep (SystemContext, gInBuffer);          

+        SingleStep (SystemContext, gInBuffer);

         return;

-          

+

       case 'z':

         RemoveBreakPoint (SystemContext, gInBuffer);

         break;

-  

+

       case 'Z':

         InsertBreakPoint (SystemContext, gInBuffer);

         break;

-                  

-      default:  

+

+      default:

         //Send empty packet

         SendNotSupported ();

         break;

@@ -1204,28 +1204,28 @@ GdbExceptionHandler (
 

 

 /**

- Periodic callback for GDB. This function is used to catch a ctrl-c or other 

+ Periodic callback for GDB. This function is used to catch a ctrl-c or other

  break in type command from GDB.

- 

- @param SystemContext     Register content at time of the call  

+

+ @param SystemContext     Register content at time of the call

  **/

 VOID

 EFIAPI

-GdbPeriodicCallBack ( 

-  IN OUT EFI_SYSTEM_CONTEXT     SystemContext 

+GdbPeriodicCallBack (

+  IN OUT EFI_SYSTEM_CONTEXT     SystemContext

   )

 {

   //

-  // gCtrlCBreakFlag may have been set from a previous F response package 

-  // and we set the global as we need to process it at a point where we 

+  // gCtrlCBreakFlag may have been set from a previous F response package

+  // and we set the global as we need to process it at a point where we

   // can update the system context. If we are in the middle of processing

   // a F Packet it is not safe to read the GDB serial stream so we need

   // to skip it on this check

   //

   if (!gCtrlCBreakFlag && !gProcessingFPacket) {

     //

-    // Ctrl-C was not pending so grab any pending characters and see if they 

-    // are a Ctrl-c (0x03). If so set the Ctrl-C global. 

+    // Ctrl-C was not pending so grab any pending characters and see if they

+    // are a Ctrl-c (0x03). If so set the Ctrl-C global.

     //

     while (TRUE) {

       if (!GdbIsCharAvailable ()) {

@@ -1234,7 +1234,7 @@ GdbPeriodicCallBack (
         //

         break;

       }

-      

+

       if (GdbGetChar () == 0x03) {

         gCtrlCBreakFlag = TRUE;

         //

@@ -1244,7 +1244,7 @@ GdbPeriodicCallBack (
       }

     }

   }

-  

+

   if (gCtrlCBreakFlag) {

     //

     // Update the context to force a single step trap when we exit the GDB

diff --git a/EmbeddedPkg/GdbStub/GdbStub.inf b/EmbeddedPkg/GdbStub/GdbStub.inf
index fd4e9d2e1a..ecb5c61b82 100644
--- a/EmbeddedPkg/GdbStub/GdbStub.inf
+++ b/EmbeddedPkg/GdbStub/GdbStub.inf
@@ -34,39 +34,39 @@
 

 [Sources.ARM]

   Arm/Processor.c

-  

+

 [Sources.IA32]

   Ia32/Processor.c

-  

+

 [Sources.X64]

   X64/Processor.c

-  

-  

+

+

 [Packages]

   MdePkg/MdePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

-  

+

 [LibraryClasses]

-  BaseLib  

-  DebugLib  

-  UefiLib  

-  UefiDriverEntryPoint  

-  UefiBootServicesTableLib  

-  UefiRuntimeServicesTableLib  

-  BaseMemoryLib  

-  MemoryAllocationLib  

-  DevicePathLib  

-  PcdLib  

+  BaseLib

+  DebugLib

+  UefiLib

+  UefiDriverEntryPoint

+  UefiBootServicesTableLib

+  UefiRuntimeServicesTableLib

+  BaseMemoryLib

+  MemoryAllocationLib

+  DevicePathLib

+  PcdLib

   GdbSerialLib

   PrintLib

   CacheMaintenanceLib

 

 

-[Protocols]  

-  gEfiDebugSupportProtocolGuid                   

-  gEfiDebugPortProtocolGuid                     

-  gEfiSerialIoProtocolGuid                     

-  

+[Protocols]

+  gEfiDebugSupportProtocolGuid

+  gEfiDebugPortProtocolGuid

+  gEfiSerialIoProtocolGuid

+

 [Guids]

   gEfiDebugImageInfoTableGuid

 

diff --git a/EmbeddedPkg/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/GdbStubInternal.h
index e84ca3a0ab..659be6b38f 100644
--- a/EmbeddedPkg/GdbStub/GdbStubInternal.h
+++ b/EmbeddedPkg/GdbStub/GdbStubInternal.h
@@ -37,7 +37,7 @@
 extern CONST CHAR8 mHexToStr[];

 

 // maximum size of input and output buffers

-// This value came from the show remote command of the gdb we tested against 

+// This value came from the show remote command of the gdb we tested against

 #define MAX_BUF_SIZE 2000

 

 // maximum size of address buffer

@@ -59,7 +59,7 @@ extern CONST CHAR8 mHexToStr[];
 //

 // GDB Signal definitions - generic names for interrupts

 //

-#define GDB_SIGILL      4  // Illegal instruction       

+#define GDB_SIGILL      4  // Illegal instruction

 #define GDB_SIGTRAP     5  // Trace Trap (Breakpoint and SingleStep)

 #define GDB_SIGEMT      7  // Emulator Trap

 #define GDB_SIGFPE      8  // Floating point exception

@@ -71,9 +71,9 @@ extern CONST CHAR8 mHexToStr[];
 // Includes all general GDB Unix like error values

 //

 #define GDB_EBADMEMADDRBUFSIZE   11  // the buffer that stores memory Address to be read from/written to is not the right size

-#define GDB_EBADMEMLENGBUFSIZE   12  // the buffer that stores Length is not the right size 

+#define GDB_EBADMEMLENGBUFSIZE   12  // the buffer that stores Length is not the right size

 #define GDB_EBADMEMLENGTH        13  // Length, the given number of bytes to read or write, is not the right size

-#define GDB_EBADMEMDATA          14  // one of the bytes or nibbles of the memory is leess than 0 

+#define GDB_EBADMEMDATA          14  // one of the bytes or nibbles of the memory is leess than 0

 #define GDB_EBADMEMDATASIZE      15  // the memory data, 'XX..', is too short or too long

 #define GDB_EBADBUFSIZE          21  // the buffer created is not the correct size

 #define GDB_EINVALIDARG          31  // argument is invalid

@@ -93,7 +93,7 @@ extern CONST CHAR8 mHexToStr[];
 //

 //Define Register size for different architectures

 //

-#if defined (MDE_CPU_IA32) 

+#if defined (MDE_CPU_IA32)

 #define REG_SIZE  32

 #elif defined (MDE_CPU_X64)

 #define REG_SIZE  64

@@ -151,7 +151,7 @@ typedef union {
     UINT32  B1:1;           // Breakpoint condition detected

     UINT32  B2:1;           // Breakpoint condition detected

     UINT32  B3:1;           // Breakpoint condition detected

-    UINT32  Reserved_1:9;   // Reserved 

+    UINT32  Reserved_1:9;   // Reserved

     UINT32  BD:1;           // Debug register access detected

     UINT32  BS:1;           // Single step

     UINT32  BT:1;           // Task switch

@@ -210,7 +210,7 @@ extern EFI_EXCEPTION_TYPE_ENTRY gExceptionType[];
 

 //

 // Set TRUE if F Reply package signals a ctrl-c. We can not process the Ctrl-c

-// here we need to wait for the periodic callback to do this. 

+// here we need to wait for the periodic callback to do this.

 //

 extern BOOLEAN gCtrlCBreakFlag;

 

@@ -229,8 +229,8 @@ extern UINTN    gRegisterOffsets[];
 

 /**

  Return the number of entries in the gExceptionType[]

- 

- @retval    UINTN, the number of entries in the gExceptionType[] array.    

+

+ @retval    UINTN, the number of entries in the gExceptionType[] array.

  **/

 UINTN

 MaxEfiException (

@@ -240,8 +240,8 @@ MaxEfiException (
 

 /**

  Return the number of entries in the gRegisters[]

- 

- @retval    UINTN, the number of entries (registers) in the gRegisters[] array.    

+

+ @retval    UINTN, the number of entries (registers) in the gRegisters[] array.

  **/

 UINTN

 MaxRegisterCount (

@@ -250,9 +250,9 @@ MaxRegisterCount (
 

 

 /**

- Check to see if the ISA is supported. 

+ Check to see if the ISA is supported.

  ISA = Instruction Set Architecture

- 

+

  @retval    TRUE if Isa is supported,

  FALSE otherwise.

  **/

@@ -264,7 +264,7 @@ CheckIsa (
 

 /**

  Send the T signal with the given exception type (in gdb order) and possibly with n:r pairs related to the watchpoints

- 

+

  @param  SystemContext        Register content at time of the exception

  @param  GdbExceptionType     GDB exception type

  **/

@@ -278,29 +278,29 @@ GdbSendTSignal (
 

 /**

  Translates the EFI mapping to GDB mapping

- 

+

  @param     EFIExceptionType        EFI Exception that is being processed

  @retval    UINTN that corresponds to EFIExceptionType's GDB exception type number

  **/

 UINT8

-ConvertEFItoGDBtype ( 

+ConvertEFItoGDBtype (

   IN  EFI_EXCEPTION_TYPE EFIExceptionType

   );

 

 

 /**

- Empties the given buffer 

+ Empties the given buffer

  @param *Buf pointer to the first element in buffer to be emptied

  **/

 VOID

-EmptyBuffer ( 

+EmptyBuffer (

   IN CHAR8  *Buf

   );

 

 

 /**

  Converts an 8-bit Hex Char into a INTN.

- 

+

  @param     Char  - the hex character to be converted into UINTN

  @retval    a INTN, from 0 to 15, that corressponds to Char

  -1 if Char is not a hex character

@@ -315,7 +315,7 @@ HexCharToInt (
  Send an error with the given error number after converting to hex.

  The error number is put into the buffer in hex. '255' is the biggest errno we can send.

  ex: 162 will be sent as A2.

- 

+

  @param   errno    the error number that will be sent

  **/

 VOID

@@ -342,8 +342,8 @@ SendNotSupported (
   VOID

   );

 

-/** ‘p n’ 

- Reads the n-th register's value into an output buffer and sends it as a packet 

+/** ‘p n’

+ Reads the n-th register's value into an output buffer and sends it as a packet

  @param     SystemContext       Register content at time of the exception

  @param     InBuffer            This is the input buffer received from gdb server

  **/

@@ -354,12 +354,12 @@ ReadNthRegister (
   );

 

 

-/** ‘g’ 

- Reads the general registers into an output buffer  and sends it as a packet 

+/** ‘g’

+ Reads the general registers into an output buffer  and sends it as a packet

  @param     SystemContext           Register content at time of the exception

  **/

 VOID

-ReadGeneralRegisters (  

+ReadGeneralRegisters (

   IN    EFI_SYSTEM_CONTEXT  SystemContext

   );

 

@@ -390,10 +390,10 @@ WriteGeneralRegisters (
 

 

 /** ‘m addr,length ’

- Find the Length of the area to read and the start addres. Finally, pass them to 

- another function, TransferFromMemToOutBufAndSend, that will read from that memory space and 

+ Find the Length of the area to read and the start addres. Finally, pass them to

+ another function, TransferFromMemToOutBufAndSend, that will read from that memory space and

  send it as a packet.

- 

+

  @param  *PacketData  Pointer to Payload data for the packet

  **/

 VOID

@@ -403,10 +403,10 @@ ReadFromMemory (
 

 

 /** ‘M addr,length :XX...’

- Find the Length of the area in bytes to write and the start addres. Finally, pass them to 

+ Find the Length of the area in bytes to write and the start addres. Finally, pass them to

  another function, TransferFromInBufToMem, that will write to that memory space the info in

  the input buffer.

- 

+

  @param   PacketData     Pointer to Payload data for the packet

  **/

 VOID

@@ -415,11 +415,11 @@ WriteToMemory (
   );

 

 

-/** ‘c [addr ]’ 

- Continue. addr is Address to resume. If addr is omitted, resume at current 

+/** ‘c [addr ]’

+ Continue. addr is Address to resume. If addr is omitted, resume at current

  Address.

- 

- @param SystemContext Register content at time of the exception  

+

+ @param SystemContext Register content at time of the exception

  @param *PacketData   Pointer to PacketData

  **/

 

@@ -431,9 +431,9 @@ ContinueAtAddress (
 

 

 /** ‘s [addr ]’

- Single step. addr is the Address at which to resume. If addr is omitted, resume 

+ Single step. addr is the Address at which to resume. If addr is omitted, resume

  at same Address.

- 

+

  @param SystemContext   Register content at time of the exception

  @param PacketData      Pointer to Payload data for the packet

  **/

@@ -443,27 +443,27 @@ SingleStep (
   IN  CHAR8               *PacketData

   );

 

-/** 

+/**

  Insert Single Step in the SystemContext

- 

+

  @param SystemContext   Register content at time of the exception

  **/

 VOID

 AddSingleStep (

   IN  EFI_SYSTEM_CONTEXT  SystemContext

   );

-  

-/** 

+

+/**

  Remove Single Step in the SystemContext

- 

+

  @param SystemContext   Register content at time of the exception

  **/

 VOID

 RemoveSingleStep (

   IN  EFI_SYSTEM_CONTEXT  SystemContext

   );

-  

-  

+

+

 /**

   ‘Z1, [addr], [length]’

   ‘Z2, [addr], [length]’

@@ -507,36 +507,36 @@ RemoveBreakPoint(
 /**

  Exception Hanldler for GDB. It will be called for all exceptions

  registered via the gExceptionType[] array.

- 

+

  @param ExceptionType   Exception that is being processed

- @param SystemContext   Register content at time of the exception  

- 

+ @param SystemContext   Register content at time of the exception

+

  **/

 VOID

 EFIAPI

-GdbExceptionHandler ( 

-  IN     EFI_EXCEPTION_TYPE  ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT  SystemContext 

+GdbExceptionHandler (

+  IN     EFI_EXCEPTION_TYPE  ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT  SystemContext

   );

 

 

 /**

- Periodic callback for GDB. This function is used to catch a ctrl-c or other 

+ Periodic callback for GDB. This function is used to catch a ctrl-c or other

  break in type command from GDB.

- 

+

  @param SystemContext           Register content at time of the call

- 

+

  **/

 VOID

 EFIAPI

-GdbPeriodicCallBack ( 

-  IN OUT EFI_SYSTEM_CONTEXT  SystemContext 

+GdbPeriodicCallBack (

+  IN OUT EFI_SYSTEM_CONTEXT  SystemContext

   );

 

 

 /**

   Make two serail consoles: 1) StdIn and StdOut via GDB. 2) StdErr via GDB.

-  

+

   These console show up on the remote system running GDB

 

 **/

@@ -549,15 +549,15 @@ GdbInitializeSerialConsole (
 

 /**

   Send a GDB Remote Serial Protocol Packet

-  

-  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$', 

+

+  $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$',

   the packet teminating character '#' and the two digit checksum.

-  

-  If an ack '+' is not sent resend the packet, but timeout eventually so we don't end up 

+

+  If an ack '+' is not sent resend the packet, but timeout eventually so we don't end up

   in an infinit loop. This is so if you unplug the debugger code just keeps running

 

-  @param PacketData   Payload data for the packet  

-  

+  @param PacketData   Payload data for the packet

+

   @retval             Number of bytes of packet data sent.

 

 **/

@@ -565,21 +565,21 @@ UINTN
 SendPacket (

   IN  CHAR8 *PacketData

   );

-  

+

 

 /**

  Receive a GDB Remote Serial Protocol Packet

- 

- $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$', 

+

+ $PacketData#checksum PacketData is passed in and this function adds the packet prefix '$',

  the packet teminating character '#' and the two digit checksum.

- 

+

  If host re-starts sending a packet without ending the previous packet, only the last valid packet is proccessed.

  (In other words, if received packet is '$12345$12345$123456#checksum', only '$123456#checksum' will be processed.)

- 

+

  If an ack '+' is not sent resend the packet

- 

- @param PacketData   Payload data for the packet  

- 

+

+ @param PacketData   Payload data for the packet

+

  @retval             Number of bytes of packet data received.

 

  **/

@@ -588,15 +588,15 @@ ReceivePacket (
  OUT  CHAR8 *PacketData,

  IN   UINTN PacketDataSize

  );

-  

+

 

 /**

-  Read data from a FileDescriptor. On success number of bytes read is returned. Zero indicates 

+  Read data from a FileDescriptor. On success number of bytes read is returned. Zero indicates

   the end of a file. On error -1 is returned. If count is zero, GdbRead returns zero.

 

   @param  FileDescriptor   Device to talk to.

   @param  Buffer           Buffer to hold Count bytes that were read

-  @param  Count            Number of bytes to transfer. 

+  @param  Count            Number of bytes to transfer.

 

   @retval -1               Error

   @retval {other}          Number of bytes read.

@@ -608,15 +608,15 @@ GdbRead (
   OUT VOID    *Buffer,

   IN  UINTN   Count

   );

-  

+

 

 /**

-  Write data to a FileDescriptor. On success number of bytes written is returned. Zero indicates 

-  nothing was written. On error -1 is returned. 

+  Write data to a FileDescriptor. On success number of bytes written is returned. Zero indicates

+  nothing was written. On error -1 is returned.

 

   @param  FileDescriptor   Device to talk to.

   @param  Buffer           Buffer to hold Count bytes that are to be written

-  @param  Count            Number of bytes to transfer. 

+  @param  Count            Number of bytes to transfer.

 

   @retval -1               Error

   @retval {other}          Number of bytes written.

@@ -629,13 +629,13 @@ GdbWrite (
   IN  UINTN         Count

   );

 

-UINTN *  

+UINTN *

 FindPointerToRegister (

   IN  EFI_SYSTEM_CONTEXT    SystemContext,

-  IN  UINTN                 RegNumber  

+  IN  UINTN                 RegNumber

   );

 

-CHAR8 * 

+CHAR8 *

 BasicReadRegister (

   IN  EFI_SYSTEM_CONTEXT      SystemContext,

   IN  UINTN                   RegNumber,

@@ -662,7 +662,7 @@ BasicWriteRegister (
   IN  CHAR8                 *InBufPtr

   );

 

-VOID  

+VOID

 PrintReg (

   EFI_SYSTEM_CONTEXT SystemContext

   );

@@ -678,7 +678,7 @@ ParseBreakpointPacket (
 UINTN

 GetBreakpointDataAddress (

   IN  EFI_SYSTEM_CONTEXT  SystemContext,

-  IN  UINTN               BreakpointNumber 

+  IN  UINTN               BreakpointNumber

   );

 

 UINTN

@@ -689,7 +689,7 @@ GetBreakpointDetected (
 BREAK_TYPE

 GetBreakpointType (

   IN  EFI_SYSTEM_CONTEXT  SystemContext,

-  IN  UINTN               BreakpointNumber  

+  IN  UINTN               BreakpointNumber

   );

 

 UINTN

@@ -739,8 +739,8 @@ ValidateAddress (
 

 BOOLEAN

 ValidateException (

-  IN  EFI_EXCEPTION_TYPE    ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT SystemContext 

+  IN  EFI_EXCEPTION_TYPE    ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT SystemContext

   );

 

 #endif

diff --git a/EmbeddedPkg/GdbStub/Ia32/Processor.c b/EmbeddedPkg/GdbStub/Ia32/Processor.c
index e327b3e6db..a4c4ded0c0 100644
--- a/EmbeddedPkg/GdbStub/Ia32/Processor.c
+++ b/EmbeddedPkg/GdbStub/Ia32/Processor.c
@@ -2,7 +2,7 @@
   Processor specific parts of the GDB stub

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -20,7 +20,7 @@
 // {EFI mapping, GDB mapping}

 //

 EFI_EXCEPTION_TYPE_ENTRY gExceptionType[] = {

-  { EXCEPT_IA32_DIVIDE_ERROR,     GDB_SIGFPE  }, 

+  { EXCEPT_IA32_DIVIDE_ERROR,     GDB_SIGFPE  },

   { EXCEPT_IA32_DEBUG,            GDB_SIGTRAP },

   { EXCEPT_IA32_NMI,              GDB_SIGEMT  },

   { EXCEPT_IA32_BREAKPOINT,       GDB_SIGTRAP },

@@ -62,7 +62,7 @@ UINTN gRegisterOffsets[] = {
 

 

 //Debug only..

-VOID 

+VOID

 PrintReg (

   IN EFI_SYSTEM_CONTEXT SystemContext

   )

@@ -80,7 +80,7 @@ PrintReg (
 }

 

 //Debug only..

-VOID 

+VOID

 PrintDRreg (

   IN EFI_SYSTEM_CONTEXT SystemContext

   )

@@ -96,8 +96,8 @@ PrintDRreg (
 

 /**

  Return the number of entries in the gExceptionType[]

- 

- @retval  UINTN, the number of entries in the gExceptionType[] array.    

+

+ @retval  UINTN, the number of entries in the gExceptionType[] array.

  **/

 UINTN

 MaxEfiException (

@@ -110,8 +110,8 @@ MaxEfiException (
 

 /**

  Return the number of entries in the gRegisters[]

- 

- @retval  UINTN, the number of entries (registers) in the gRegisters[] array.    

+

+ @retval  UINTN, the number of entries (registers) in the gRegisters[] array.

  **/

 UINTN

 MaxRegisterCount (

@@ -123,9 +123,9 @@ MaxRegisterCount (
 

 

 /**

-  Check to see if the ISA is supported. 

+  Check to see if the ISA is supported.

   ISA = Instruction Set Architecture

- 

+

   @retval TRUE if Isa is supported,

       FALSE otherwise.

 **/

@@ -142,14 +142,14 @@ CheckIsa (
  This takes in the register number and the System Context, and returns a pointer to the RegNumber-th register in gdb ordering

  It is, by default, set to find the register pointer of the IA32 member

 

- @param   SystemContext     Register content at time of the exception 

+ @param   SystemContext     Register content at time of the exception

  @param   RegNumber       The register to which we want to find a pointer

  @retval  the pointer to the RegNumber-th pointer

  **/

 UINTN *

 FindPointerToRegister (

   IN  EFI_SYSTEM_CONTEXT  SystemContext,

-  IN  UINTN               RegNumber  

+  IN  UINTN               RegNumber

   )

 {

   UINT8 *TempPtr;

@@ -174,7 +174,7 @@ BasicReadRegister (
   )

 {

   UINTN RegSize;

-  

+

   RegSize = 0;

   while (RegSize < REG_SIZE) {

     *OutBufPtr++ = mHexToStr[((*FindPointerToRegister (SystemContext, RegNumber) >> (RegSize+4)) & 0xf)];

@@ -185,8 +185,8 @@ BasicReadRegister (
 }

 

 

-/** ‘p n’ 

- Reads the n-th register's value into an output buffer and sends it as a packet 

+/** ‘p n’

+ Reads the n-th register's value into an output buffer and sends it as a packet

 

  @param   SystemContext   Register content at time of the exception

  @param   InBuffer      Pointer to the input buffer received from gdb server

@@ -201,7 +201,7 @@ ReadNthRegister (
   UINTN RegNumber;

   CHAR8 OutBuffer[9]; // 1 reg=8 hex chars, and the end '\0' (escape seq)

   CHAR8 *OutBufPtr;   // pointer to the output buffer

-  

+

   RegNumber = AsciiStrHexToUintn (&InBuffer[1]);

 

   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {

@@ -217,14 +217,14 @@ ReadNthRegister (
 }

 

 

-/** ‘g’ 

- Reads the general registers into an output buffer  and sends it as a packet 

+/** ‘g’

+ Reads the general registers into an output buffer  and sends it as a packet

 

  @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

-ReadGeneralRegisters (  

+ReadGeneralRegisters (

   IN  EFI_SYSTEM_CONTEXT      SystemContext

   )

 {

@@ -233,7 +233,7 @@ ReadGeneralRegisters (
   CHAR8 *OutBufPtr;   // pointer to the output buffer

 

   OutBufPtr = OutBuffer;

-  for (i = 0 ; i < MaxRegisterCount() ; i++) {  // there are only 16 registers to read   

+  for (i = 0 ; i < MaxRegisterCount() ; i++) {  // there are only 16 registers to read

     OutBufPtr = BasicReadRegister (SystemContext, i, OutBufPtr);

   }

 

@@ -260,26 +260,26 @@ BasicWriteRegister (
   UINTN RegSize;

   UINTN TempValue; // the value transferred from a hex char

   UINT32 NewValue; // the new value of the RegNumber-th Register

-  

+

   NewValue = 0;

   RegSize = 0;

   while (RegSize < REG_SIZE) {

     TempValue = HexCharToInt(*InBufPtr++);

-    

+

    if (TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

     }

 

     NewValue += (TempValue << (RegSize+4));

     TempValue = HexCharToInt(*InBufPtr++);

-    

+

     if (TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

     }

-    

-    NewValue += (TempValue << RegSize); 

+

+    NewValue += (TempValue << RegSize);

     RegSize = RegSize + 8;

   }

   *(FindPointerToRegister (SystemContext, RegNumber)) = NewValue;

@@ -304,19 +304,19 @@ WriteNthRegister (
   CHAR8 RegNumBuffer[MAX_REG_NUM_BUF_SIZE];  // put the 'n..' part of the message into this array

   CHAR8 *RegNumBufPtr;

   CHAR8 *InBufPtr; // pointer to the input buffer

-  

+

   // find the register number to write

   InBufPtr = &InBuffer[1];

   RegNumBufPtr = RegNumBuffer;

   while (*InBufPtr != '=') {

     *RegNumBufPtr++ = *InBufPtr++;

-  } 

+  }

   *RegNumBufPtr = '\0';

-  RegNumber = AsciiStrHexToUintn (RegNumBuffer); 

+  RegNumber = AsciiStrHexToUintn (RegNumBuffer);

 

   // check if this is a valid Register Number

   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {

-	SendError (GDB_EINVALIDREGNUM); 

+	SendError (GDB_EINVALIDREGNUM);

     return;

   }

   InBufPtr++;  // skips the '=' character

@@ -341,16 +341,16 @@ WriteGeneralRegisters (
   UINTN  i;

   CHAR8 *InBufPtr; /// pointer to the input buffer

 

-  // check to see if the buffer is the right size which is 

-  // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129 

+  // check to see if the buffer is the right size which is

+  // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129

   if (AsciiStrLen(InBuffer) != 129) { // 16 regs, 8 hex chars each, and the end '\0' (escape seq)

-	//Bad message. Message is not the right length 

-    SendError (GDB_EBADBUFSIZE); 

+	//Bad message. Message is not the right length

+    SendError (GDB_EBADBUFSIZE);

     return;

   }

 

   InBufPtr = &InBuffer[1];

-  

+

   // Read the new values for the registers from the input buffer to an array, NewValueArray.

   // The values in the array are in the gdb ordering

   for (i=0; i < MaxRegisterCount(); i++) {  // there are only 16 registers to write

@@ -361,9 +361,9 @@ WriteGeneralRegisters (
 }

 

 

-/** 

+/**

  Insert Single Step in the SystemContext

- 

+

  @param SystemContext Register content at time of the exception

  **/

 VOID

@@ -374,10 +374,10 @@ AddSingleStep (
   SystemContext.SystemContextIa32->Eflags |= TF_BIT; //Setting the TF bit.

 }

 

-  

-/** 

+

+/**

  Remove Single Step in the SystemContext

- 

+

  @param SystemContext Register content at time of the exception

  **/

 VOID

@@ -390,11 +390,11 @@ RemoveSingleStep (
 

 

 

-/** ‘c [addr ]’ 

- Continue. addr is Address to resume. If addr is omitted, resume at current 

+/** ‘c [addr ]’

+ Continue. addr is Address to resume. If addr is omitted, resume at current

  Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -405,15 +405,15 @@ ContinueAtAddress (
 {

   if (PacketData[1] != '\0') {

     SystemContext.SystemContextIa32->Eip = AsciiStrHexToUintn (&PacketData[1]);

-  } 

+  }

 }

 

 

 /** ‘s [addr ]’

- Single step. addr is the Address at which to resume. If addr is omitted, resume 

+ Single step. addr is the Address at which to resume. If addr is omitted, resume

  at same Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -425,7 +425,7 @@ SingleStep (
   if (PacketData[1] != '\0') {

     SystemContext.SystemContextIa32->Eip = AsciiStrHexToUintn (&PacketData[1]);

   }

-  

+

   AddSingleStep (SystemContext);

 }

 

@@ -469,9 +469,9 @@ GetBreakpointDataAddress (
 

   @param  SystemContext  Register content at time of the exception

 

-  @retval {1-4}          Currently detected breakpoint value   

+  @retval {1-4}          Currently detected breakpoint value

   @retval 0              No breakpoint detected.

- 

+

 **/

 UINTN

 GetBreakpointDetected (

@@ -492,7 +492,7 @@ GetBreakpointDetected (
   } else if (Dr6.Bits.B3 == 1) {

     BreakpointNumber = 4;

   } else {

-    BreakpointNumber = 0;  //No breakpoint detected 

+    BreakpointNumber = 0;  //No breakpoint detected

   }

 

   return BreakpointNumber;

@@ -502,13 +502,13 @@ GetBreakpointDetected (
 /**

   Returns Breakpoint type (InstructionExecution, DataWrite, DataRead or DataReadWrite)

   based on the Breakpoint number

-  

+

   @param  SystemContext        Register content at time of the exception

   @param  BreakpointNumber     Breakpoint number

-  

+

   @retval BREAK_TYPE           Breakpoint type value read from register DR7 RWn field

                                For unknown value, it returns NotSupported.

-  

+

 **/

 BREAK_TYPE

 GetBreakpointType (

@@ -522,22 +522,22 @@ GetBreakpointType (
   Dr7.UintN = SystemContext.SystemContextIa32->Dr7;

 

   if (BreakpointNumber == 1) {

-    Type = (BREAK_TYPE) Dr7.Bits.RW0;  

+    Type = (BREAK_TYPE) Dr7.Bits.RW0;

   } else if (BreakpointNumber == 2) {

-    Type = (BREAK_TYPE) Dr7.Bits.RW1;  

+    Type = (BREAK_TYPE) Dr7.Bits.RW1;

   } else if (BreakpointNumber == 3) {

-    Type = (BREAK_TYPE) Dr7.Bits.RW2;  

+    Type = (BREAK_TYPE) Dr7.Bits.RW2;

   } else if (BreakpointNumber == 4) {

-    Type = (BREAK_TYPE) Dr7.Bits.RW3;  

+    Type = (BREAK_TYPE) Dr7.Bits.RW3;

   }

 

   return Type;

 }

 

 

-/** 

+/**

   Parses Length and returns the length which DR7 LENn field accepts.

-  For example: If we receive 1-Byte length then we should return 0. 

+  For example: If we receive 1-Byte length then we should return 0.

                Zero gets written to DR7 LENn field.

 

   @param  Length  Breakpoint length in Bytes (1 byte, 2 byte, 4 byte)

@@ -550,7 +550,7 @@ ConvertLengthData (
   IN     UINTN   Length

   )

 {

-  if (Length == 1) {         //1-Byte length 

+  if (Length == 1) {         //1-Byte length

     return 0;

   } else if (Length == 2) {  //2-Byte length

     return 1;

@@ -563,8 +563,8 @@ ConvertLengthData (
 

 

 /**

-  Finds the next free debug register. If all the registers are occupied then 

-  EFI_OUT_OF_RESOURCES is returned.  

+  Finds the next free debug register. If all the registers are occupied then

+  EFI_OUT_OF_RESOURCES is returned.

 

   @param  SystemContext   Register content at time of the exception

   @param  Register        Register value (0 - 3 for the first free debug register)

@@ -601,11 +601,11 @@ FindNextFreeDebugRegister (
 /**

   Enables the debug register. Writes Address value to appropriate DR0-3 register.

   Sets LENn, Gn, RWn bits in DR7 register.

- 

+

   @param  SystemContext   Register content at time of the exception

-  @param  Register        Register value (0 - 3) 

+  @param  Register        Register value (0 - 3)

   @param  Address         Breakpoint address value

-  @param  Type            Breakpoint type (Instruction, Data write, Data read 

+  @param  Type            Breakpoint type (Instruction, Data write, Data read

                           or write etc.)

 

   @retval EFI_STATUS      Appropriate status value.

@@ -625,15 +625,15 @@ EnableDebugRegister (
   //Convert length data

   Length = ConvertLengthData (Length);

 

-  //For Instruction execution, length should be 0 

+  //For Instruction execution, length should be 0

   //(Ref. Intel reference manual 18.2.4)

   if ((Type == 0) && (Length != 0)) {

     return EFI_INVALID_PARAMETER;

   }

- 

+

   //Hardware doesn't support ReadWatch (z3 packet) type. GDB can handle

   //software breakpoint. We should send empty packet in both these cases.

-  if ((Type == (BREAK_TYPE)DataRead) || 

+  if ((Type == (BREAK_TYPE)DataRead) ||

       (Type == (BREAK_TYPE)SoftwareBreakpoint)) {

     return EFI_UNSUPPORTED;

   }

@@ -665,7 +665,7 @@ EnableDebugRegister (
     return EFI_INVALID_PARAMETER;

   }

 

-  //Update Dr7 with appropriate Gn, RWn and LENn bits 

+  //Update Dr7 with appropriate Gn, RWn and LENn bits

   SystemContext.SystemContextIa32->Dr7 = Dr7.UintN;

 

   return EFI_SUCCESS;

@@ -681,7 +681,7 @@ EnableDebugRegister (
   @param  SystemContext  Register content at time of the exception

   @param  Address        Breakpoint address value

   @param  Length         Breakpoint length value

-  @param  Type           Breakpoint type (Instruction, Data write, 

+  @param  Type           Breakpoint type (Instruction, Data write,

                          Data read or write etc.)

   @param  Register       Register value to be returned

 

@@ -701,7 +701,7 @@ FindMatchingDebugRegister (
 

   //Hardware doesn't support ReadWatch (z3 packet) type. GDB can handle

   //software breakpoint. We should send empty packet in both these cases.

-  if ((Type == (BREAK_TYPE)DataRead) || 

+  if ((Type == (BREAK_TYPE)DataRead) ||

       (Type == (BREAK_TYPE)SoftwareBreakpoint)) {

     return EFI_UNSUPPORTED;

   }

@@ -711,24 +711,24 @@ FindMatchingDebugRegister (
 

   Dr7.UintN = SystemContext.SystemContextIa32->Dr7;

 

-  if ((Dr7.Bits.G0 == 1) && 

+  if ((Dr7.Bits.G0 == 1) &&

       (Dr7.Bits.LEN0 == Length) &&

-      (Dr7.Bits.RW0 == Type) && 

+      (Dr7.Bits.RW0 == Type) &&

       (Address == SystemContext.SystemContextIa32->Dr0)) {

     *Register = 0;

-  } else if ((Dr7.Bits.G1 == 1) && 

+  } else if ((Dr7.Bits.G1 == 1) &&

              (Dr7.Bits.LEN1 == Length) &&

-             (Dr7.Bits.RW1 == Type) && 

+             (Dr7.Bits.RW1 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr1)) {

     *Register = 1;

-  } else if ((Dr7.Bits.G2 == 1) && 

+  } else if ((Dr7.Bits.G2 == 1) &&

              (Dr7.Bits.LEN2 == Length) &&

-             (Dr7.Bits.RW2 == Type) && 

+             (Dr7.Bits.RW2 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr2)) {

     *Register = 2;

-  } else if ((Dr7.Bits.G3 == 1) && 

+  } else if ((Dr7.Bits.G3 == 1) &&

              (Dr7.Bits.LEN3 == Length) &&

-             (Dr7.Bits.RW3 == Type) && 

+             (Dr7.Bits.RW3 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr3)) {

     *Register = 3;

   } else {

@@ -752,12 +752,12 @@ FindMatchingDebugRegister (
 EFI_STATUS

 DisableDebugRegister (

  IN  EFI_SYSTEM_CONTEXT  SystemContext,

- IN  UINTN               Register  

+ IN  UINTN               Register

  )

 {

   IA32_DR7  Dr7;

   UINTN Address = 0;

- 

+

   //Read DR7 register so appropriate Gn, RWn and LENn bits can be turned off.

   Dr7.UintN = SystemContext.SystemContextIa32->Dr7;

 

@@ -914,15 +914,15 @@ RemoveBreakPoint (
   }

 

   switch (Type) {

-  

+

     case    0:   //Software breakpoint

       BreakType = SoftwareBreakpoint;

       break;

-      

+

     case    1:   //Hardware breakpoint

       BreakType = InstructionExecution;

       break;

-      

+

     case    2:   //Write watchpoint

       BreakType = DataWrite;

       break;

@@ -984,8 +984,8 @@ ValidateAddress (
 

 BOOLEAN

 ValidateException (

-  IN  EFI_EXCEPTION_TYPE    ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT SystemContext 

+  IN  EFI_EXCEPTION_TYPE    ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT SystemContext

   )

 {

   return TRUE;

diff --git a/EmbeddedPkg/GdbStub/SerialIo.c b/EmbeddedPkg/GdbStub/SerialIo.c
index ed06268443..32ceaf1233 100644
--- a/EmbeddedPkg/GdbStub/SerialIo.c
+++ b/EmbeddedPkg/GdbStub/SerialIo.c
@@ -1,13 +1,13 @@
 /** @file

-  Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system 

+  Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system

   running GDB. One consle for error information and another console for user input/output.

-  

-  Basic packet format is $packet-data#checksum. So every comand has 4 bytes of overhead: $, 

-  #, 0, 0. The 0 and 0 are the ascii characters for the checksum. 

-  

+

+  Basic packet format is $packet-data#checksum. So every comand has 4 bytes of overhead: $,

+  #, 0, 0. The 0 and 0 are the ascii characters for the checksum.

+

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -22,7 +22,7 @@
 

 //

 // Set TRUE if F Reply package signals a ctrl-c. We can not process the Ctrl-c

-// here we need to wait for the periodic callback to do this. 

+// here we need to wait for the periodic callback to do this.

 //

 BOOLEAN gCtrlCBreakFlag = FALSE;

 

@@ -34,9 +34,9 @@ BOOLEAN gCtrlCBreakFlag = FALSE;
 BOOLEAN gProcessingFPacket = FALSE;

 

 /**

-  Process a control-C break message. 

-  

-  Currently a place holder, remove the ASSERT when it gets implemented. 

+  Process a control-C break message.

+

+  Currently a place holder, remove the ASSERT when it gets implemented.

 

   @param  ErrNo   Error infomration from the F reply packet or other source

 

@@ -62,55 +62,55 @@ GdbCtrlCBreakMessage (
   @param  Packet  Packet to parse like an F reply packet

   @param  ErrNo   Buffer to hold Count bytes that were read

 

-  @retval -1      Error, not a valid F reply packet 

-  @retval other   Return the return code from the F reply packet 

+  @retval -1      Error, not a valid F reply packet

+  @retval other   Return the return code from the F reply packet

 

 **/

 INTN

 GdbParseFReplyPacket (

   IN  CHAR8   *Packet,

-  OUT UINTN   *ErrNo   

+  OUT UINTN   *ErrNo

   )

 {

   INTN   RetCode;

-   

+

   if (Packet[0] != 'F') {

     // A valid responce would be an F packet

     return -1;

   }

-  

+

   RetCode = AsciiStrHexToUintn (&Packet[1]);

-  

-  // Find 1st comma 

-  for (;*Packet != '\0' && *Packet != ',';  Packet++);  

+

+  // Find 1st comma

+  for (;*Packet != '\0' && *Packet != ',';  Packet++);

   if (*Packet == '\0') {

     *ErrNo = 0;

     return RetCode;

   }

-  

+

   *ErrNo = AsciiStrHexToUintn (++Packet);

 

-  // Find 2nd comma 

-  for (;*Packet != '\0' && *Packet != ',';  Packet++);  

+  // Find 2nd comma

+  for (;*Packet != '\0' && *Packet != ',';  Packet++);

   if (*Packet == '\0') {

     return RetCode;

   }

-  

+

   if (*(++Packet) == 'C') {

-    GdbCtrlCBreakMessage (*ErrNo);  

+    GdbCtrlCBreakMessage (*ErrNo);

   }

-  

+

   return RetCode;

 }

 

 

 /**

-  Read data from a FileDescriptor. On success number of bytes read is returned. Zero indicates 

+  Read data from a FileDescriptor. On success number of bytes read is returned. Zero indicates

   the end of a file. On error -1 is returned. If count is zero, GdbRead returns zero.

 

   @param  FileDescriptor   Device to talk to.

   @param  Buffer           Buffer to hold Count bytes that were read

-  @param  Count            Number of bytes to transfer. 

+  @param  Count            Number of bytes to transfer.

 

   @retval -1               Error

   @retval {other}          Number of bytes read.

@@ -128,19 +128,19 @@ GdbRead (
   INTN    RetCode;

   UINTN   ErrNo;

   BOOLEAN ReceiveDone = FALSE;

-   

+

   // Send:

   // "Fread,XX,YYYYYYYY,XX

   //

   // XX - FileDescriptor in ASCII

-  // YYYYYYYY - Buffer address in ASCII 

+  // YYYYYYYY - Buffer address in ASCII

   // XX - Count in ASCII

   // SS - check sum

   //

   Size = AsciiSPrint (Packet, sizeof (Packet), "Fread,%x,%x,%x", FileDescriptor, Buffer, Count);

   // Packet array is too small if you got this ASSERT

   ASSERT (Size < sizeof (Packet));

-  

+

   gProcessingFPacket = TRUE;

   SendPacket (Packet);

   Print ((CHAR16 *)L"Packet sent..\n");

@@ -175,25 +175,25 @@ GdbRead (
 

   RetCode = GdbParseFReplyPacket (Packet, &ErrNo);

   Print ((CHAR16 *)L"RetCode: %x..ErrNo: %x..\n", RetCode, ErrNo);

-  

+

   if (ErrNo > 0) {

     //Send error to the host if there is any.

     SendError ((UINT8)ErrNo);

   }

-  

+

   gProcessingFPacket = FALSE;

 

   return RetCode;

-}  

-  

+}

+

 

 /**

-  Write data to a FileDescriptor. On success number of bytes written is returned. Zero indicates 

-  nothing was written. On error -1 is returned. 

+  Write data to a FileDescriptor. On success number of bytes written is returned. Zero indicates

+  nothing was written. On error -1 is returned.

 

   @param  FileDescriptor   Device to talk to.

   @param  Buffer           Buffer to hold Count bytes that are to be written

-  @param  Count            Number of bytes to transfer. 

+  @param  Count            Number of bytes to transfer.

 

   @retval -1               Error

   @retval {other}          Number of bytes written.

@@ -216,14 +216,14 @@ GdbWrite (
   // #Fwrite,XX,YYYYYYYY,XX$SS

   //

   // XX - FileDescriptor in ASCII

-  // YYYYYYYY - Buffer address in ASCII 

+  // YYYYYYYY - Buffer address in ASCII

   // XX - Count in ASCII

   // SS - check sum

   //

   Size = AsciiSPrint (Packet, sizeof (Packet), "Fwrite,%x,%x,%x", FileDescriptor, Buffer, Count);

   // Packet array is too small if you got this ASSERT

   ASSERT (Size < sizeof (Packet));

-  

+

   SendPacket (Packet);

   Print ((CHAR16 *)L"Packet sent..\n");

 

@@ -235,7 +235,7 @@ GdbWrite (
     // Process GDB commands

     switch (Packet[0]) {

       //Read memory command.

-      //m addr,length. 

+      //m addr,length.

       case    'm':

         ReadFromMemory (Packet);

         break;

@@ -243,13 +243,13 @@ GdbWrite (
       //Fretcode, errno, Ctrl-C flag

       //retcode - Count read

       case    'F':

-        //Once target receives F reply packet that means the previous 

+        //Once target receives F reply packet that means the previous

         //transactions are finished.

         ReceiveDone = TRUE;

         break;

-      

+

       //Send empty buffer

-      default    :  

+      default    :

         SendNotSupported();

         break;

     }

@@ -262,7 +262,7 @@ GdbWrite (
   if (ErrNo > 0) {

     SendError((UINT8)ErrNo);

   }

- 

+

   return RetCode;

 }

 

@@ -271,7 +271,7 @@ GdbWrite (
   Reset the serial device.

 

   @param  This              Protocol instance pointer.

-                            

+

   @retval EFI_SUCCESS       The device was reset.

   @retval EFI_DEVICE_ERROR  The serial device could not be reset.

 

@@ -287,7 +287,7 @@ GdbSerialReset (
 

 

 /**

-  Sets the baud rate, receive FIFO depth, transmit/receice time out, parity, 

+  Sets the baud rate, receive FIFO depth, transmit/receice time out, parity,

   data buts, and stop bits on a serial device.

 

   @param  This             Protocol instance pointer.

@@ -355,7 +355,7 @@ GdbSerialSetControl (
 

   @param  This              Protocol instance pointer.

   @param  Control           A pointer to return the current Control signals from the serial device.

-                            

+

   @retval EFI_SUCCESS       The control bits were read from the serial device.

   @retval EFI_DEVICE_ERROR  The serial device is not functioning correctly.

 

@@ -396,16 +396,16 @@ GdbSerialWrite (
   UINTN            Return;

 

   SerialDev = GDB_SERIAL_DEV_FROM_THIS (This);

-  

+

   Return = GdbWrite (SerialDev->OutFileDescriptor, Buffer, *BufferSize);

   if (Return == (UINTN)-1) {

     return EFI_DEVICE_ERROR;

   }

-  

+

   if (Return != *BufferSize) {

     *BufferSize = Return;

   }

-  

+

   return EFI_SUCCESS;

 }

 

@@ -435,27 +435,27 @@ GdbSerialRead (
   UINTN            Return;

 

   SerialDev = GDB_SERIAL_DEV_FROM_THIS (This);

-  

+

   Return = GdbRead (SerialDev->InFileDescriptor, Buffer, *BufferSize);

   if (Return == (UINTN)-1) {

     return EFI_DEVICE_ERROR;

   }

-  

+

   if (Return != *BufferSize) {

     *BufferSize = Return;

   }

-  

+

   return EFI_SUCCESS;

 }

 

 

-// 

+//

 // Template used to initailize the GDB Serial IO protocols

 //

 GDB_SERIAL_DEV gdbSerialDevTemplate = {

   GDB_SERIAL_DEV_SIGNATURE,

   NULL,

-  

+

   { // SerialIo

     SERIAL_IO_INTERFACE_REVISION,

     GdbSerialReset,

@@ -504,7 +504,7 @@ GDB_SERIAL_DEV gdbSerialDevTemplate = {
 

 /**

   Make two serial consoles: 1) StdIn and StdOut via GDB. 2) StdErr via GDB.

-  

+

   These console show up on the remote system running GDB

 

 **/

@@ -520,21 +520,21 @@ GdbInitializeSerialConsole (
   // Use the template to make a copy of the Serial Console private data structure.

   StdOutSerialDev = AllocateCopyPool (sizeof (GDB_SERIAL_DEV),  &gdbSerialDevTemplate);

   ASSERT (StdOutSerialDev != NULL);

-  

+

   // Fixup pointer after the copy

   StdOutSerialDev->SerialIo.Mode = &StdOutSerialDev->SerialMode;

-  

+

   StdErrSerialDev = AllocateCopyPool (sizeof (GDB_SERIAL_DEV),  &gdbSerialDevTemplate);

   ASSERT (StdErrSerialDev != NULL);

 

   // Fixup pointer and modify stuff that is different for StdError

-  StdErrSerialDev->SerialIo.Mode = &StdErrSerialDev->SerialMode;  

+  StdErrSerialDev->SerialIo.Mode = &StdErrSerialDev->SerialMode;

   StdErrSerialDev->DevicePath.Index = 1;

   StdErrSerialDev->OutFileDescriptor = GDB_STDERR;

-  

+

   // Make a new handle with Serial IO protocol and its device path on it.

   Status = gBS->InstallMultipleProtocolInterfaces (

-                  &StdOutSerialDev->Handle, 

+                  &StdOutSerialDev->Handle,

                   &gEfiSerialIoProtocolGuid,   &StdOutSerialDev->SerialIo,

                   &gEfiDevicePathProtocolGuid, &StdOutSerialDev->DevicePath,

                   NULL

@@ -543,7 +543,7 @@ GdbInitializeSerialConsole (
 

   // Make a new handle with Serial IO protocol and its device path on it.

   Status = gBS->InstallMultipleProtocolInterfaces (

-                  &StdErrSerialDev->Handle, 

+                  &StdErrSerialDev->Handle,

                   &gEfiSerialIoProtocolGuid,   &StdErrSerialDev->SerialIo,

                   &gEfiDevicePathProtocolGuid, &StdErrSerialDev->DevicePath,

                   NULL

diff --git a/EmbeddedPkg/GdbStub/X64/Processor.c b/EmbeddedPkg/GdbStub/X64/Processor.c
index 5d13c937ee..8a39c4828f 100644
--- a/EmbeddedPkg/GdbStub/X64/Processor.c
+++ b/EmbeddedPkg/GdbStub/X64/Processor.c
@@ -2,7 +2,7 @@
   Processor specific parts of the GDB stub

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -19,7 +19,7 @@
 // Array of exception types that need to be hooked by the debugger

 //

 EFI_EXCEPTION_TYPE_ENTRY gExceptionType[] = {

-  { EXCEPT_X64_DIVIDE_ERROR,    GDB_SIGFPE  },  

+  { EXCEPT_X64_DIVIDE_ERROR,    GDB_SIGFPE  },

   { EXCEPT_X64_DEBUG,           GDB_SIGTRAP },

   { EXCEPT_X64_NMI,             GDB_SIGEMT  },

   { EXCEPT_X64_BREAKPOINT,      GDB_SIGTRAP },

@@ -37,7 +37,7 @@ EFI_EXCEPTION_TYPE_ENTRY gExceptionType[] = {
 

 

 // The offsets of registers SystemContextX64.

-// The fields in the array are in the gdb ordering.  

+// The fields in the array are in the gdb ordering.

 // HAVE TO DOUBLE-CHECK THE ORDER of the 24 regs

 //

 UINTN gRegisterOffsets[] = {

@@ -70,8 +70,8 @@ UINTN gRegisterOffsets[] = {
 

 /**

  Return the number of entries in the gExceptionType[]

- 

- @retval  UINTN, the number of entries in the gExceptionType[] array.    

+

+ @retval  UINTN, the number of entries in the gExceptionType[] array.

  **/

 UINTN

 MaxEfiException (

@@ -84,8 +84,8 @@ MaxEfiException (
 

 /**

  Return the number of entries in the gRegisters[]

- 

- @retval  UINTN, the number of entries (registers) in the gRegisters[] array.    

+

+ @retval  UINTN, the number of entries (registers) in the gRegisters[] array.

  **/

 UINTN

 MaxRegisterCount (

@@ -95,9 +95,9 @@ MaxRegisterCount (
   return sizeof (gRegisterOffsets)/sizeof (UINTN);

 }

 

-  

+

 /**

-  Check to see if the ISA is supported. 

+  Check to see if the ISA is supported.

   ISA = Instruction Set Architecture

 

   @retval TRUE if Isa is supported

@@ -114,14 +114,14 @@ CheckIsa (
 /**

  This takes in the register number and the System Context, and returns a pointer to the RegNumber-th register in gdb ordering

  It is, by default, set to find the register pointer of the X64 member

- @param   SystemContext     Register content at time of the exception 

+ @param   SystemContext     Register content at time of the exception

  @param   RegNumber       The register to which we want to find a pointer

  @retval  the pointer to the RegNumber-th pointer

  **/

 UINTN *

 FindPointerToRegister(

   IN  EFI_SYSTEM_CONTEXT  SystemContext,

-  IN  UINTN               RegNumber  

+  IN  UINTN               RegNumber

   )

 {

   UINT8 *TempPtr;

@@ -145,7 +145,7 @@ BasicReadRegister (
   )

 {

   UINTN RegSize;

-  

+

   RegSize = 0;

   while (RegSize < 64) {

     *OutBufPtr++ = mHexToStr[((*FindPointerToRegister(SystemContext, RegNumber) >> (RegSize+4)) & 0xf)];

@@ -156,8 +156,8 @@ BasicReadRegister (
 }

 

 

-/** ‘p n’ 

- Reads the n-th register's value into an output buffer and sends it as a packet 

+/** ‘p n’

+ Reads the n-th register's value into an output buffer and sends it as a packet

  @param   SystemContext   Register content at time of the exception

  @param   InBuffer      Pointer to the input buffer received from gdb server

  **/

@@ -170,42 +170,42 @@ ReadNthRegister (
   UINTN RegNumber;

   CHAR8 OutBuffer[17];  // 1 reg=16 hex chars, and the end '\0' (escape seq)

   CHAR8 *OutBufPtr;   // pointer to the output buffer

-  

+

   RegNumber = AsciiStrHexToUintn (&InBuffer[1]);

-  

+

   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {

-    SendError (GDB_EINVALIDREGNUM); 

+    SendError (GDB_EINVALIDREGNUM);

     return;

   }

-  

+

   OutBufPtr = OutBuffer;

   OutBufPtr = BasicReadRegister(SystemContext, RegNumber, OutBufPtr);

-  

+

   *OutBufPtr = '\0';  // the end of the buffer

   SendPacket (OutBuffer);

 }

 

 

-/** ‘g’ 

- Reads the general registers into an output buffer  and sends it as a packet 

+/** ‘g’

+ Reads the general registers into an output buffer  and sends it as a packet

 

  @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

-ReadGeneralRegisters (  

+ReadGeneralRegisters (

   IN  EFI_SYSTEM_CONTEXT      SystemContext

   )

 {

   UINTN   i;

   CHAR8 OutBuffer[385]; // 24 regs, 16 hex chars each, and the end '\0' (escape seq)

   CHAR8 *OutBufPtr;   // pointer to the output buffer

-  

+

   OutBufPtr = OutBuffer;

-  for(i = 0 ; i < MaxRegisterCount() ; i++) {  // there are only 24 registers to read   

+  for(i = 0 ; i < MaxRegisterCount() ; i++) {  // there are only 24 registers to read

     OutBufPtr = BasicReadRegister(SystemContext, i, OutBufPtr);

   }

-  

+

   *OutBufPtr = '\0';  // the end of the buffer

   SendPacket (OutBuffer);

 }

@@ -229,26 +229,26 @@ BasicWriteRegister (
   UINTN RegSize;

   UINTN TempValue; // the value transferred from a hex char

   UINT64 NewValue; // the new value of the RegNumber-th Register

-  

+

   NewValue = 0;

   RegSize = 0;

   while (RegSize < 64) {

     TempValue = HexCharToInt(*InBufPtr++);

-    

+

     if (TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

     }

-    

+

     NewValue += (TempValue << (RegSize+4));

     TempValue = HexCharToInt(*InBufPtr++);

-    

+

     if (TempValue < 0) {

-      SendError (GDB_EBADMEMDATA); 

+      SendError (GDB_EBADMEMDATA);

       return NULL;

   }

-    

-    NewValue += (TempValue << RegSize); 

+

+    NewValue += (TempValue << RegSize);

     RegSize = RegSize + 8;

   }

   *(FindPointerToRegister(SystemContext, RegNumber)) = NewValue;

@@ -273,19 +273,19 @@ WriteNthRegister (
   CHAR8 RegNumBuffer[MAX_REG_NUM_BUF_SIZE];  // put the 'n..' part of the message into this array

   CHAR8 *RegNumBufPtr;

   CHAR8 *InBufPtr; // pointer to the input buffer

-  

+

   // find the register number to write

   InBufPtr = &InBuffer[1];

   RegNumBufPtr = RegNumBuffer;

   while (*InBufPtr != '=') {

     *RegNumBufPtr++ = *InBufPtr++;

-  } 

+  }

   *RegNumBufPtr = '\0';

-  RegNumber = AsciiStrHexToUintn (RegNumBuffer); 

+  RegNumber = AsciiStrHexToUintn (RegNumBuffer);

 

   // check if this is a valid Register Number

   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {

-	SendError (GDB_EINVALIDREGNUM); 

+	SendError (GDB_EINVALIDREGNUM);

     return;

   }

   InBufPtr++;  // skips the '=' character

@@ -309,30 +309,30 @@ WriteGeneralRegisters (
 {

   UINTN  i;

   CHAR8 *InBufPtr; /// pointer to the input buffer

-  

-  // check to see if the buffer is the right size which is 

-  // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 385 

+

+  // check to see if the buffer is the right size which is

+  // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 385

   if (AsciiStrLen(InBuffer) != 385) { // 24 regs, 16 hex chars each, and the end '\0' (escape seq)

-    //Bad message. Message is not the right length 

-    SendError (GDB_EBADBUFSIZE); 

+    //Bad message. Message is not the right length

+    SendError (GDB_EBADBUFSIZE);

     return;

   }

-  

+

   InBufPtr = &InBuffer[1];

-  

+

   // Read the new values for the registers from the input buffer to an array, NewValueArray.

   // The values in the array are in the gdb ordering

   for(i=0; i < MaxRegisterCount(); i++) {  // there are only 16 registers to write

     InBufPtr = BasicWriteRegister(SystemContext, i, InBufPtr);

   }

-  

+

   SendSuccess();

 }

 

 

- /** 

+ /**

  Insert Single Step in the SystemContext

- 

+

  @param SystemContext Register content at time of the exception

  **/

 VOID

@@ -343,11 +343,11 @@ AddSingleStep (
   SystemContext.SystemContextX64->Rflags |= TF_BIT; //Setting the TF bit.

 }

 

-  

- 

-/** 

+

+

+/**

  Remove Single Step in the SystemContext

- 

+

  @param SystemContext Register content at time of the exception

  **/

 VOID

@@ -360,11 +360,11 @@ RemoveSingleStep (
 

 

 

-/** ‘c [addr ]’ 

- Continue. addr is Address to resume. If addr is omitted, resume at current 

+/** ‘c [addr ]’

+ Continue. addr is Address to resume. If addr is omitted, resume at current

  Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -375,15 +375,15 @@ ContinueAtAddress (
 {

   if (PacketData[1] != '\0') {

     SystemContext.SystemContextX64->Rip = AsciiStrHexToUintn(&PacketData[1]);

-  } 

+  }

 }

 

 

 /** ‘s [addr ]’

- Single step. addr is the Address at which to resume. If addr is omitted, resume 

+ Single step. addr is the Address at which to resume. If addr is omitted, resume

  at same Address.

- 

- @param   SystemContext     Register content at time of the exception  

+

+ @param   SystemContext     Register content at time of the exception

  **/

 VOID

 EFIAPI

@@ -395,19 +395,19 @@ SingleStep (
   if (PacketData[1] != '\0') {

     SystemContext.SystemContextX64->Rip = AsciiStrHexToUintn (&PacketData[1]);

   }

-  

+

   AddSingleStep (SystemContext);

 }

 

 

 /**

-  Returns breakpoint data address from DR0-DR3 based on the input breakpoint 

+  Returns breakpoint data address from DR0-DR3 based on the input breakpoint

   number

 

   @param  SystemContext      Register content at time of the exception

   @param  BreakpointNumber   Breakpoint number

 

-  @retval Address            Data address from DR0-DR3 based on the 

+  @retval Address            Data address from DR0-DR3 based on the

                              breakpoint number.

 

 **/

@@ -435,7 +435,7 @@ GetBreakpointDataAddress (
 }

 

 /**

-  Returns currently detected breakpoint value based on the register 

+  Returns currently detected breakpoint value based on the register

   DR6 B0-B3 field.

   If no breakpoint is detected then it returns 0.

 

@@ -471,13 +471,13 @@ GetBreakpointDetected (
 }

 

 /**

-  Returns Breakpoint type (InstructionExecution, DataWrite, DataRead 

+  Returns Breakpoint type (InstructionExecution, DataWrite, DataRead

   or DataReadWrite) based on the Breakpoint number

 

   @param  SystemContext      Register content at time of the exception

   @param  BreakpointNumber   Breakpoint number

 

-  @retval BREAK_TYPE         Breakpoint type value read from register DR7 RWn 

+  @retval BREAK_TYPE         Breakpoint type value read from register DR7 RWn

                              field. For unknown value, it returns NotSupported.

 

 **/

@@ -506,9 +506,9 @@ GetBreakpointType (
 }

 

 

-/** 

+/**

   Parses Length and returns the length which DR7 LENn field accepts.

-  For example: If we receive 1-Byte length then we should return 0. 

+  For example: If we receive 1-Byte length then we should return 0.

                Zero gets written to DR7 LENn field.

 

   @param  Length  Breakpoint length in Bytes (1 byte, 2 byte, 4 byte)

@@ -521,7 +521,7 @@ ConvertLengthData (
   IN     UINTN   Length

   )

 {

-  if (Length == 1) {         //1-Byte length 

+  if (Length == 1) {         //1-Byte length

     return 0;

   } else if (Length == 2) {  //2-Byte length

     return 1;

@@ -576,7 +576,7 @@ FindNextFreeDebugRegister (
   @param  SystemContext   Register content at time of the exception

   @param  Register        Register value (0 - 3)

   @param  Address         Breakpoint address value

-  @param  Type            Breakpoint type (Instruction, Data write, 

+  @param  Type            Breakpoint type (Instruction, Data write,

                           Data read or write etc.)

 

   @retval EFI_STATUS      Appropriate status value.

@@ -596,7 +596,7 @@ EnableDebugRegister (
   //Convert length data

   Length = ConvertLengthData (Length);

 

-  //For Instruction execution, length should be 0 

+  //For Instruction execution, length should be 0

   //(Ref. Intel reference manual 18.2.4)

   if ((Type == 0) && (Length != 0)) {

     return EFI_INVALID_PARAMETER;

@@ -604,7 +604,7 @@ EnableDebugRegister (
 

   //Hardware doesn't support ReadWatch (z3 packet) type. GDB can handle

   //software breakpoint. We should send empty packet in both these cases.

-  if ((Type == (BREAK_TYPE)DataRead) || 

+  if ((Type == (BREAK_TYPE)DataRead) ||

       (Type == (BREAK_TYPE)SoftwareBreakpoint))  {

     return EFI_UNSUPPORTED;

   }

@@ -643,14 +643,14 @@ EnableDebugRegister (
 }

 

 

-/**  

-  Returns register number 0 - 3 for the maching debug register. 

-  This function compares incoming Address, Type, Length and 

+/**

+  Returns register number 0 - 3 for the maching debug register.

+  This function compares incoming Address, Type, Length and

   if there is a match then it returns the appropriate register number.

   In case of mismatch, function returns EFI_NOT_FOUND message.

 

   @param  SystemContext  Register content at time of the exception

-  @param  Address        Breakpoint address value  

+  @param  Address        Breakpoint address value

   @param  Length         Breakpoint length value

   @param  Type           Breakpoint type (Instruction, Data write, Data read

                          or write etc.)

@@ -672,7 +672,7 @@ FindMatchingDebugRegister (
 

   //Hardware doesn't support ReadWatch (z3 packet) type. GDB can handle

   //software breakpoint. We should send empty packet in both these cases.

-  if ((Type == (BREAK_TYPE)DataRead) || 

+  if ((Type == (BREAK_TYPE)DataRead) ||

       (Type == (BREAK_TYPE)SoftwareBreakpoint)) {

     return EFI_UNSUPPORTED;

   }

@@ -682,24 +682,24 @@ FindMatchingDebugRegister (
 

   Dr7.UintN = SystemContext.SystemContextIa32->Dr7;

 

-  if ((Dr7.Bits.G0 == 1) && 

+  if ((Dr7.Bits.G0 == 1) &&

       (Dr7.Bits.LEN0 == Length) &&

-      (Dr7.Bits.RW0 == Type) && 

+      (Dr7.Bits.RW0 == Type) &&

       (Address == SystemContext.SystemContextIa32->Dr0)) {

     *Register = 0;

-  } else if ((Dr7.Bits.G1 == 1) && 

+  } else if ((Dr7.Bits.G1 == 1) &&

              (Dr7.Bits.LEN1 == Length) &&

-             (Dr7.Bits.RW1 == Type) && 

+             (Dr7.Bits.RW1 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr1)) {

     *Register = 1;

-  } else if ((Dr7.Bits.G2 == 1) && 

+  } else if ((Dr7.Bits.G2 == 1) &&

              (Dr7.Bits.LEN2 == Length) &&

-             (Dr7.Bits.RW2 == Type) && 

+             (Dr7.Bits.RW2 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr2)) {

     *Register = 2;

-  } else if ((Dr7.Bits.G3 == 1) && 

+  } else if ((Dr7.Bits.G3 == 1) &&

              (Dr7.Bits.LEN3 == Length) &&

-             (Dr7.Bits.RW3 == Type) && 

+             (Dr7.Bits.RW3 == Type) &&

              (Address == SystemContext.SystemContextIa32->Dr3)) {

     *Register = 3;

   } else {

@@ -884,15 +884,15 @@ RemoveBreakPoint (
   }

 

   switch (Type) {

-  

+

     case    0:   //Software breakpoint

       BreakType = SoftwareBreakpoint;

       break;

-      

+

     case    1:   //Hardware breakpoint

       BreakType = InstructionExecution;

       break;

-      

+

     case    2:   //Write watchpoint

       BreakType = DataWrite;

       break;

@@ -954,8 +954,8 @@ ValidateAddress (
 

 BOOLEAN

 ValidateException (

-  IN  EFI_EXCEPTION_TYPE    ExceptionType, 

-  IN OUT EFI_SYSTEM_CONTEXT SystemContext 

+  IN  EFI_EXCEPTION_TYPE    ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT SystemContext

   )

 {

   return TRUE;