1 files changed, 25 insertions, 2 deletions
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/AsmFuncs.S b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/AsmFuncs.S
index e7c3ed746..b742b67db 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/AsmFuncs.S
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/AsmFuncs.S
@@ -28,6 +28,10 @@ ASM_GLOBAL ASM_PFX(ExceptionStubHeaderSize)
 ASM_GLOBAL ASM_PFX(TimerInterruptHandle)
 ASM_GLOBAL ASM_PFX(CommonEntry)
 
+.macro  AGENT_HANDLER_SIGNATURE
+  .byte 0x41, 0x47, 0x54, 0x48   # AGENT_HANDLER_SIGNATURE     SIGNATURE_32('A','G','T','H')
+.endm
+
 .data
 
 ASM_PFX(ExceptionStubHeaderSize):  .word     ASM_PFX(Exception1Handle) - ASM_PFX(Exception0Handle)
@@ -35,108 +39,127 @@ ASM_PFX(ExceptionStubHeaderSize):  .word     ASM_PFX(Exception1Handle) - ASM_PFX
 
 .text
 
-.byte 0x41, 0x47, 0x54, 0x48  # AGENT_HANDLER_SIGNATURE     SIGNATURE_32('A','G','T','H')
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception0Handle):
    cli
    pushq %rcx
    mov   $0, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception1Handle):
    cli
    pushq %rcx
    mov   $1, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception2Handle):
    cli
    pushq %rcx
    mov   $2, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception3Handle):
    cli
    pushq %rcx
    mov   $3, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception4Handle):
    cli
    pushq %rcx
    mov   $4, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception5Handle):
    cli
    pushq %rcx
    mov   $5, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception6Handle):
    cli
    pushq %rcx
    mov   $6, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception7Handle):
    cli
    pushq %rcx
    mov   $7, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception8Handle):
    cli
    pushq %rcx
    mov   $8, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception9Handle):
    cli
    pushq %rcx
    mov   $9, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception10Handle):
    cli
    pushq %rcx
    mov   $10, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception11Handle):
    cli
    pushq %rcx
    mov   $11, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception12Handle):
    cli
    pushq %rcx
    mov   $12, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception13Handle):
    cli
    pushq %rcx
    mov   $13, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception14Handle):
    cli
    pushq %rcx
    mov   $14, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception15Handle):
    cli
    pushq %rcx
    mov   $15, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception16Handle):
    cli
    pushq %rcx
    mov   $16, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception17Handle):
    cli
    pushq %rcx
    mov   $17, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception18Handle):
    cli
    pushq %rcx
    mov   $18, %rcx
    jmp   ASM_PFX(CommonEntry)
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(Exception19Handle):
    cli
    pushq %rcx
    mov   $19, %rcx
    jmp   ASM_PFX(CommonEntry)
-
+AGENT_HANDLER_SIGNATURE
 ASM_PFX(TimerInterruptHandle):
    cli
    pushq %rcx