From a230845601c7b0b5514dfe372b5e9bfa22f2f606 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Thu, 16 Oct 2014 07:57:03 -0700 Subject: MdeModulePkg BootScriptExecutorDxe: Use NASM compatible syntax Without this change, after converting this code to NASM, this error will be reported: error: invalid combination of opcode and operands Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Cc: Feng Tian Cc: Star Zeng --- MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm | 2 +- MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm index 710546e114..a040517aad 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm @@ -40,7 +40,7 @@ AsmTransferControl PROC shrd ebx, ecx, 20 and ecx, 0fh mov bx, cx - mov @jmp_addr, ebx + mov [@jmp_addr], ebx retf @@: DB 0b8h, 30h, 0 ; mov ax, 30h as selector diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm index 0b7432daf7..b2d85ae94f 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm @@ -32,7 +32,7 @@ AsmTransferControl PROC shrd ebx, ecx, 20 and ecx, 0fh mov bx, cx - mov @jmp_addr, ebx + mov [@jmp_addr], ebx retf @@: DB 0b8h, 30h, 0 ; mov ax, 30h as selector -- cgit v1.2.3