MdePkg: Replace Opcode with the corresponding instructions.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3790

Replace Opcode with the corresponding instructions.
The code changes have been verified with CompareBuild.py tool, which
can be used to compare the results of two different EDK II builds to
determine if they generate the same binaries.
link: https://github.com/mdkinney/edk2/tree/sandbox/CompareBuild)
Signed-off-by: Jason Lou <yun.lou@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.nasm b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.nasm
index 544e3c38924647e89e1a2f38eaaf4686275e30c5..ef1145807752612ec6486ada898c477d90736993 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -44,16 +44,12 @@ ASM_PFX(InternalX86EnablePaging64):
     mov     cr0, eax                    ; enable paging\r
     retf                                ; topmost 2 dwords hold the address\r
 .0:\r
-    DB      0x67, 0x48                    ; 32-bit address size, 64-bit operand size\r
-    mov     ebx, [esp]                  ; mov rbx, [esp]\r
-    DB      0x67, 0x48\r
-    mov     ecx, [esp + 8]              ; mov rcx, [esp + 8]\r
-    DB      0x67, 0x48\r
-    mov     edx, [esp + 0x10]            ; mov rdx, [esp + 10h]\r
-    DB      0x67, 0x48\r
-    mov     esp, [esp + 0x18]            ; mov rsp, [esp + 18h]\r
-    DB      0x48\r
-    add     esp, -0x20                   ; add rsp, -20h\r
-    call    ebx                         ; call rbx\r
+BITS 64\r
+    mov     rbx, [esp]\r
+    mov     rcx, [esp + 8]\r
+    mov     rdx, [esp + 0x10]\r
+    mov     rsp, [esp + 0x18]\r
+    add     rsp, -0x20\r
+    call    rbx\r
     hlt                                 ; no one should get here\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.nasm b/MdePkg/Library/BaseLib/Ia32/LongJump.nasm
index f94d10f806d46e904d4ad81d9d5c3584731153b1..6c13dfe307d7d6e36ef8aca7b5c673f44c0ad34b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/LongJump.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -39,12 +39,12 @@ ASM_PFX(InternalLongJump):
 \r
     mov     edx, [esp + 4]         ; edx = JumpBuffer\r
     mov     edx, [edx + 24]        ; edx = target SSP\r
-    READSSP_EAX\r
+    rdsspd  eax\r
     sub     edx, eax               ; edx = delta\r
     mov     eax, edx               ; eax = delta\r
 \r
     shr     eax, 2                 ; eax = delta/sizeof(UINT32)\r
-    INCSSP_EAX\r
+    incsspd eax\r
 \r
 CetDone:\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.nasm b/MdePkg/Library/BaseLib/Ia32/Monitor.nasm
index 28dc0ba70a2dcd4b31b1b3d2e2709829b6829c24..70dbe66e27f17f9f3cbefcb6239d5455dff1b25b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,6 +31,6 @@ ASM_PFX(AsmMonitor):
     mov     eax, [esp + 4]\r
     mov     ecx, [esp + 8]\r
     mov     edx, [esp + 12]\r
-    DB      0xf, 1, 0xc8                ; monitor\r
+    monitor\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.nasm b/MdePkg/Library/BaseLib/Ia32/Mwait.nasm
index 3956940cab11fb0afe598cc06633cb0e4dafbe28..2d36a97df6e4f966e04a4b0dfe9366a76790e8ae 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -29,6 +29,6 @@ global ASM_PFX(AsmMwait)
 ASM_PFX(AsmMwait):\r
     mov     eax, [esp + 4]\r
     mov     ecx, [esp + 8]\r
-    DB      0xf, 1, 0xc9                ; mwait\r
+    mwait\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/RdRand.nasm b/MdePkg/Library/BaseLib/Ia32/RdRand.nasm
index e12b8e9611977991f5cc4de708211aae86dde1b7..d818b6ef556824a03f4e3fb50a8c7c08e4747176 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RdRand.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/RdRand.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -25,9 +25,8 @@ SECTION .text
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand16)\r
 ASM_PFX(InternalX86RdRand16):\r
-    ; rdrand   ax                  ; generate a 16 bit RN into ax\r
+    rdrand eax                     ; generate a 16 bit RN into ax\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0xf, 0xc7, 0xf0         ; rdrand r16: "0f c7 /6  ModRM:r/m(w)"\r
     jc     rn16_ok                 ; jmp if CF=1\r
     xor    eax, eax                ; reg=0 if CF=0\r
     ret                            ; return with failure status\r
@@ -45,9 +44,8 @@ rn16_ok:
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand32)\r
 ASM_PFX(InternalX86RdRand32):\r
-    ; rdrand   eax                 ; generate a 32 bit RN into eax\r
+    rdrand eax                     ; generate a 32 bit RN into eax\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0xf, 0xc7, 0xf0         ; rdrand r32: "0f c7 /6  ModRM:r/m(w)"\r
     jc     rn32_ok                 ; jmp if CF=1\r
     xor    eax, eax                ; reg=0 if CF=0\r
     ret                            ; return with failure status\r
@@ -65,14 +63,13 @@ rn32_ok:
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand64)\r
 ASM_PFX(InternalX86RdRand64):\r
-    ; rdrand   eax                 ; generate a 32 bit RN into eax\r
+    rdrand eax                     ; generate a 32 bit RN into eax\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0xf, 0xc7, 0xf0         ; rdrand r32: "0f c7 /6  ModRM:r/m(w)"\r
     jnc    rn64_ret                ; jmp if CF=0\r
     mov    edx, dword [esp + 4]\r
     mov    [edx], eax\r
 \r
-    db     0xf, 0xc7, 0xf0         ; generate another 32 bit RN\r
+    rdrand eax                     ; generate another 32 bit RN\r
     jnc    rn64_ret                ; jmp if CF=0\r
     mov    [edx + 4], eax\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.nasm b/MdePkg/Library/BaseLib/Ia32/ReadDr4.nasm
index 81c681de3497c8d88dd4c1e55512532b38c59ad9..1c312b670dca91d212eade0a629db774452fde26 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,8 +31,8 @@ ASM_PFX(AsmReadDr4):
     ; this register will cause a #UD exception.\r
     ;\r
     ; MS assembler doesn't support this instruction since no one would use it\r
-    ; under normal circustances. Here opcode is used.\r
+    ; under normal circustances.\r
     ;\r
-    DB      0xf, 0x21, 0xe0\r
+    mov     eax, dr4\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.nasm b/MdePkg/Library/BaseLib/Ia32/ReadDr5.nasm
index e2deacb832c4f3eef425c65b1dfc364741a2dbec..07a1b44a002e74cc1b57d553f9fef89ad425ea74 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,8 +31,8 @@ ASM_PFX(AsmReadDr5):
     ; this register will cause a #UD exception.\r
     ;\r
     ; MS assembler doesn't support this instruction since no one would use it\r
-    ; under normal circustances. Here opcode is used.\r
+    ; under normal circustances.\r
     ;\r
-    DB      0xf, 0x21, 0xe8\r
+    mov     eax, dr5\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.nasm b/MdePkg/Library/BaseLib/Ia32/SetJump.nasm
index 364613b5f9a58afe1d3cfa510d40661630ff550f..257737324120c59acb57e467fdb279f7eba8f6c5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -46,8 +46,8 @@ ASM_PFX(SetJump):
     jnc     CetDone\r
 \r
     mov     eax, 1\r
-    INCSSP_EAX                     ; to read original SSP\r
-    READSSP_EAX\r
+    incsspd eax                    ; to read original SSP\r
+    rdsspd  eax\r
     mov     [edx + 0x24], eax      ; save SSP\r
 \r
 CetDone:\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.nasm b/MdePkg/Library/BaseLib/Ia32/WriteDr4.nasm
index 0d23fca111fcc992efb7830ff0839fce6c38d25b..b8479b39f7ea75f5c786b9fc50bd221dbda0ef62 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -32,8 +32,8 @@ ASM_PFX(AsmWriteDr4):
     ; this register will cause a #UD exception.\r
     ;\r
     ; MS assembler doesn't support this instruction since no one would use it\r
-    ; under normal circustances. Here opcode is used.\r
+    ; under normal circustances.\r
     ;\r
-    DB      0xf, 0x23, 0xe0\r
+    mov     dr4, eax\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.nasm b/MdePkg/Library/BaseLib/Ia32/WriteDr5.nasm
index bc5f424b8d9bba8ea5ff1c60af7231f26ad55624..354556102553c0cc906976e30b413203b26fafdf 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -32,8 +32,8 @@ ASM_PFX(AsmWriteDr5):
     ; this register will cause a #UD exception.\r
     ;\r
     ; MS assembler doesn't support this instruction since no one would use it\r
-    ; under normal circustances. Here opcode is used.\r
+    ; under normal circustances.\r
     ;\r
-    DB      0xf, 0x23, 0xe8\r
+    mov     dr5, eax\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.nasm b/MdePkg/Library/BaseLib/X64/DisablePaging64.nasm
index c76ed1a76c85c74aafc8b6e0a1e1ff2357c19ea0..200c408d9abd72b52de5952b45fd57fb23efac2f 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.nasm
+++ b/MdePkg/Library/BaseLib/X64/DisablePaging64.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -51,8 +51,7 @@ ASM_PFX(InternalX86DisablePaging64):
     sub     eax, 4                      ; eax <- One slot below transition code on the stack\r
     push    rcx                         ; push Cs to stack\r
     push    r10                         ; push address of tansition code on stack\r
-    DB      0x48                         ; prefix to composite "retq" with next "retf"\r
-    retf                                ; Use far return to load CS register from stack\r
+    retfq\r
 \r
 ; Start of transition code\r
 .0:\r

diff --git a/MdePkg/Library/BaseLib/X64/LongJump.nasm b/MdePkg/Library/BaseLib/X64/LongJump.nasm
index 59f70921692c55974a4c3cabb224fd62f80807e4..2002f65cba573269bffbaf6e64845b0b6e3b89e3 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/LongJump.nasm
+++ b/MdePkg/Library/BaseLib/X64/LongJump.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -41,12 +41,12 @@ ASM_PFX(InternalLongJump):
     push    rdx                          ; save rdx\r
 \r
     mov     rdx, [rcx + 0xF8]            ; rdx = target SSP\r
-    READSSP_RAX\r
+    rdsspq  rax\r
     sub     rdx, rax                     ; rdx = delta\r
     mov     rax, rdx                     ; rax = delta\r
 \r
     shr     rax, 3                       ; rax = delta/sizeof(UINT64)\r
-    INCSSP_RAX\r
+    incsspq rax\r
 \r
     pop     rdx                          ; restore rdx\r
 CetDone:\r

diff --git a/MdePkg/Library/BaseLib/X64/Monitor.nasm b/MdePkg/Library/BaseLib/X64/Monitor.nasm
index e1ccb83a856e39e65334e9973595a1e76f16557b..210037d402b1388c31652f67dcf719b3cb4362f4 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Monitor.nasm
+++ b/MdePkg/Library/BaseLib/X64/Monitor.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -32,6 +32,6 @@ ASM_PFX(AsmMonitor):
     mov     eax, ecx\r
     mov     ecx, edx\r
     mov     edx, r8d\r
-    DB      0xf, 1, 0xc8                ; monitor\r
+    monitor\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/Mwait.nasm b/MdePkg/Library/BaseLib/X64/Mwait.nasm
index 83fc8954917dc6228e75468d32c363ab0ff349b6..c8ad59588bd17fe49e10cff2abae6713cbec9150 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Mwait.nasm
+++ b/MdePkg/Library/BaseLib/X64/Mwait.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -30,6 +30,6 @@ global ASM_PFX(AsmMwait)
 ASM_PFX(AsmMwait):\r
     mov     eax, ecx\r
     mov     ecx, edx\r
-    DB      0xf, 1, 0xc9                ; mwait\r
+    mwait\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/RdRand.nasm b/MdePkg/Library/BaseLib/X64/RdRand.nasm
index 7e7fe99670fa3eb81006c7d6903a0c14bdf53d03..73479be8d31fb758851aa3276d5f7460b2a92ecc 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/RdRand.nasm
+++ b/MdePkg/Library/BaseLib/X64/RdRand.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -26,9 +26,8 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand16)\r
 ASM_PFX(InternalX86RdRand16):\r
-    ; rdrand   ax                  ; generate a 16 bit RN into eax,\r
+    rdrand eax                     ; generate a 16 bit RN into eax,\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0xf, 0xc7, 0xf0         ; rdrand r16: "0f c7 /6  ModRM:r/m(w)"\r
     jc     rn16_ok                 ; jmp if CF=1\r
     xor    rax, rax                ; reg=0 if CF=0\r
     ret                            ; return with failure status\r
@@ -45,9 +44,8 @@ rn16_ok:
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand32)\r
 ASM_PFX(InternalX86RdRand32):\r
-    ; rdrand   eax                 ; generate a 32 bit RN into eax,\r
+    rdrand eax                     ; generate a 32 bit RN into eax,\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0xf, 0xc7, 0xf0         ; rdrand r32: "0f c7 /6  ModRM:r/m(w)"\r
     jc     rn32_ok                 ; jmp if CF=1\r
     xor    rax, rax                ; reg=0 if CF=0\r
     ret                            ; return with failure status\r
@@ -64,9 +62,8 @@ rn32_ok:
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalX86RdRand64)\r
 ASM_PFX(InternalX86RdRand64):\r
-    ; rdrand   rax                 ; generate a 64 bit RN into rax,\r
+    rdrand rax                     ; generate a 64 bit RN into rax,\r
                                    ; CF=1 if RN generated ok, otherwise CF=0\r
-    db     0x48, 0xf, 0xc7, 0xf0   ; rdrand r64: "REX.W + 0f c7 /6 ModRM:r/m(w)"\r
     jc     rn64_ok                 ; jmp if CF=1\r
     xor    rax, rax                ; reg=0 if CF=0\r
     ret                            ; return with failure status\r

diff --git a/MdePkg/Library/BaseLib/X64/ReadDr4.nasm b/MdePkg/Library/BaseLib/X64/ReadDr4.nasm
index 82c0a9a588a92d8e43e0b3f23161301122d397c9..90b2172ceeff957050d88b818d801a80640ac58c 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadDr4.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadDr4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,6 +31,6 @@ ASM_PFX(AsmReadDr4):
     ; There's no obvious reason to access this register, since it's aliased to\r
     ; DR7 when DE=0 or an exception generated when DE=1\r
     ;\r
-    DB      0xf, 0x21, 0xe0\r
+    mov     rax, dr4\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadDr5.nasm b/MdePkg/Library/BaseLib/X64/ReadDr5.nasm
index c309c66dfec30726d4ea3e80c97a9acb622e9c77..c1143f44981a10dfe060652844631f25ab5420e0 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadDr5.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadDr5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,6 +31,6 @@ ASM_PFX(AsmReadDr5):
     ; There's no obvious reason to access this register, since it's aliased to\r
     ; DR7 when DE=0 or an exception generated when DE=1\r
     ;\r
-    DB      0xf, 0x21, 0xe8\r
+    mov     rax, dr5\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm0.nasm b/MdePkg/Library/BaseLib/X64/ReadMm0.nasm
index 615721b6aa3a258d4e0efc513c009774ac53222f..e64b2c788285910193095168b0c70bd532ed485c 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm0.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm0.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm0)\r
 ASM_PFX(AsmReadMm0):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xc0\r
+    movq    rax, mm0\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm1.nasm b/MdePkg/Library/BaseLib/X64/ReadMm1.nasm
index 7b27393490bdaa2dbc116cfa463761fc1c6dd462..bec3c71207ecba95780b49b592c1037734d7dd18 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm1.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm1.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm1)\r
 ASM_PFX(AsmReadMm1):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xc8\r
+    movq    rax, mm1\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm2.nasm b/MdePkg/Library/BaseLib/X64/ReadMm2.nasm
index c654b91a7aa6801375d150af0a10774b49215102..4c880697cb1199187aa4fadaacb7950717c54b16 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm2.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm2.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm2)\r
 ASM_PFX(AsmReadMm2):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xd0\r
+    movq    rax, mm2\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm3.nasm b/MdePkg/Library/BaseLib/X64/ReadMm3.nasm
index 88d51c0781d119ac239a6cc464ec8da76ccef1da..cf81e5a7ab04e0c1c1868870ad50bcf083b681c7 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm3.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm3.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm3)\r
 ASM_PFX(AsmReadMm3):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xd8\r
+    movq    rax, mm3\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm4.nasm b/MdePkg/Library/BaseLib/X64/ReadMm4.nasm
index 4252d20bb1c21aeb673d95ac44e5c8eda6a5fc10..17ba364e3221c3f5e1aeca375ae5b57bbf9a80ee 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm4.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm4)\r
 ASM_PFX(AsmReadMm4):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xe0\r
+    movq    rax, mm4\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm5.nasm b/MdePkg/Library/BaseLib/X64/ReadMm5.nasm
index d8f530dec8c18fdd5fb676fa6c689d2b8f392c09..f1354dd68c9c1277b63eab00c87797a5c98676f2 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm5.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm5)\r
 ASM_PFX(AsmReadMm5):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xe8\r
+    movq    rax, mm5\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm6.nasm b/MdePkg/Library/BaseLib/X64/ReadMm6.nasm
index 6f6883c2b6d24a3ead5c651b2b9831b7f5a0b11d..9d5a287218fdb1436f08c14362e0ec84c3a5c4b7 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm6.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm6.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm6)\r
 ASM_PFX(AsmReadMm6):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xf0\r
+    movq    rax, mm6\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/ReadMm7.nasm b/MdePkg/Library/BaseLib/X64/ReadMm7.nasm
index 573f15dfc8fb4a75f2ca4c224a757138b32270b8..ae15f24d8b1306c0dfd9749c9b3408040b07cd3d 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/ReadMm7.nasm
+++ b/MdePkg/Library/BaseLib/X64/ReadMm7.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmReadMm7)\r
 ASM_PFX(AsmReadMm7):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x7e, 0xf8\r
+    movq    rax, mm7\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/SetJump.nasm b/MdePkg/Library/BaseLib/X64/SetJump.nasm
index 5a68396eec3001734399df3a8131377a5ca9df58..5943a5ebe59fc8a6ceec10da6ee5c8140e80818f 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/SetJump.nasm
+++ b/MdePkg/Library/BaseLib/X64/SetJump.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -48,8 +48,8 @@ ASM_PFX(SetJump):
     jnc     CetDone\r
 \r
     mov     rax, 1\r
-    INCSSP_RAX                           ; to read original SSP\r
-    READSSP_RAX\r
+    incsspq rax                          ; to read original SSP\r
+    rdsspq  rax\r
     mov     [rcx + 0xF8], rax            ; save SSP\r
 \r
 CetDone:\r

diff --git a/MdePkg/Library/BaseLib/X64/WriteDr4.nasm b/MdePkg/Library/BaseLib/X64/WriteDr4.nasm
index c4b12c9e924e0606f31ddd66ef482191971710de..5e4d96015eb0b0cfd739ca80d67018d26e7410f0 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteDr4.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteDr4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,7 +31,7 @@ ASM_PFX(AsmWriteDr4):
     ; There's no obvious reason to access this register, since it's aliased to\r
     ; DR6 when DE=0 or an exception generated when DE=1\r
     ;\r
-    DB      0xf, 0x23, 0xe1\r
+    mov     dr4, rcx\r
     mov     rax, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteDr5.nasm b/MdePkg/Library/BaseLib/X64/WriteDr5.nasm
index 986a4a95d9569d6cf320618431d6fd0966dab16f..d5d4e2f324a2811e0b294c861faa4fe4451195f8 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteDr5.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteDr5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,7 +31,7 @@ ASM_PFX(AsmWriteDr5):
     ; There's no obvious reason to access this register, since it's aliased to\r
     ; DR7 when DE=0 or an exception generated when DE=1\r
     ;\r
-    DB      0xf, 0x23, 0xe9\r
+    mov     dr5, rcx\r
     mov     rax, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm0.nasm b/MdePkg/Library/BaseLib/X64/WriteMm0.nasm
index 3f03529edf6bc0e8cd34ddce635efc1ef8eca9c1..e6b5a0fc332cca7ceae1b3390704e86538db02b0 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm0.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm0.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm0)\r
 ASM_PFX(AsmWriteMm0):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xc1\r
+    movq    mm0, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm1.nasm b/MdePkg/Library/BaseLib/X64/WriteMm1.nasm
index f552d40716b55f1bfa777894db38be8663e2f040..414c6af6dacfe52bc66b73aeba1e0798425d53ed 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm1.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm1.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm1)\r
 ASM_PFX(AsmWriteMm1):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xc9\r
+    movq    mm1, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm2.nasm b/MdePkg/Library/BaseLib/X64/WriteMm2.nasm
index 1bd176ced9c4e31e500712e2ba48a5e2b7f18fe0..525740342a87ca5fe1187ae96e11bbb25623869b 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm2.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm2.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm2)\r
 ASM_PFX(AsmWriteMm2):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xd1\r
+    movq    mm2, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm3.nasm b/MdePkg/Library/BaseLib/X64/WriteMm3.nasm
index 403f1407361156fef52c39611d3d641a7d6b47d8..abf11bfb17291807f6eb2bd667666e4a47fca91f 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm3.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm3.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm3)\r
 ASM_PFX(AsmWriteMm3):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xd9\r
+    movq    mm3, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm4.nasm b/MdePkg/Library/BaseLib/X64/WriteMm4.nasm
index d99709d49512f90d39eb62ef0e8e3ec9f909e231..7cbd25e70a90185268c9873c7e484adad1107751 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm4.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm4.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm4)\r
 ASM_PFX(AsmWriteMm4):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xe1\r
+    movq    mm4, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm5.nasm b/MdePkg/Library/BaseLib/X64/WriteMm5.nasm
index 0467ac422023c99da66fdb35ca578767b971a356..9edfd0db83a771c9c8184885570ad6c3aa031d42 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm5.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm5.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm5)\r
 ASM_PFX(AsmWriteMm5):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xe9\r
+    movq    mm5, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm6.nasm b/MdePkg/Library/BaseLib/X64/WriteMm6.nasm
index 6d2e5eb8fbb819d1bfb5d3e45e7560aa91d293eb..4555563a55c105382d629ee774565aa37987e68d 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm6.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm6.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm6)\r
 ASM_PFX(AsmWriteMm6):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xf1\r
+    movq    mm6, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/WriteMm7.nasm b/MdePkg/Library/BaseLib/X64/WriteMm7.nasm
index de72adf685c8e8ca200b221b98cff8b665d82cd4..4ef0eb5271560f909cea4b0387b8ea9cd827ae8c 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/WriteMm7.nasm
+++ b/MdePkg/Library/BaseLib/X64/WriteMm7.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -27,9 +27,6 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(AsmWriteMm7)\r
 ASM_PFX(AsmWriteMm7):\r
-    ;\r
-    ; 64-bit MASM doesn't support MMX instructions, so use opcode here\r
-    ;\r
-    DB      0x48, 0xf, 0x6e, 0xf9\r
+    movq    mm7, rcx\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.nasm
index 5769c00bf9207d101b772f7057c388256a6b27eb..3b336c6bdf4b651a4eec4d4e2298ac00abcf743f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -44,15 +44,15 @@ ASM_PFX(InternalMemCopyMem):
     and     r8, 7\r
     shr     rcx, 3                      ; rcx <- # of Qwords to copy\r
     jz      @CopyBytes\r
-    DB      0x49, 0xf, 0x7e, 0xc2         ; movd r10, mm0 (Save mm0 in r10)\r
+    movq    r10, mm0\r
 .1:\r
-    DB      0xf, 0x6f, 0x6               ; movd mm0, [rsi]\r
-    DB      0xf, 0xe7, 0x7              ; movntq [rdi], mm0\r
+    movq    mm0, [rsi]\r
+    movntq  [rdi], mm0\r
     add     rsi, 8\r
     add     rdi, 8\r
     loop    .1\r
     mfence\r
-    DB      0x49, 0xf, 0x6e, 0xc2         ; movd mm0, r10 (Restore mm0)\r
+    movq    mm0, r10\r
     jmp     @CopyBytes\r
 @CopyBackward:\r
     mov     rsi, r9                     ; rsi <- End of Source\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.nasm
index 450113ba847f9772e0f66d2de35be8f20a6eeb51..af584e3d3463e5b18f3b2df5cf2265bc944178c9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -32,16 +32,16 @@ ASM_PFX(InternalMemSetMem):
     push    rdi\r
     mov     rax, r8\r
     mov     ah, al\r
-    DB      0x48, 0xf, 0x6e, 0xc0         ; movd mm0, rax\r
+    movq    mm0, rax\r
     mov     r8, rcx\r
     mov     rdi, r8                     ; rdi <- Buffer\r
     mov     rcx, rdx\r
     and     edx, 7\r
     shr     rcx, 3\r
     jz      @SetBytes\r
-    DB      0xf, 0x70, 0xC0, 0x0         ; pshufw mm0, mm0, 0h\r
+    pshufw  mm0, mm0, 0\r
 .0:\r
-    DB      0xf, 0xe7, 0x7              ; movntq [rdi], mm0\r
+    movntq  [rdi], mm0\r
     add     rdi, 8\r
     loop    .0\r
     mfence\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.nasm
index 4e1f4be2b4f96ce5710673b6a84ae009d9b5625a..7a63a1c50ba8f952a6ce9f25799363938846c01e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -31,16 +31,16 @@ global ASM_PFX(InternalMemSetMem16)
 ASM_PFX(InternalMemSetMem16):\r
     push    rdi\r
     mov     rax, r8\r
-    DB      0x48, 0xf, 0x6e, 0xc0         ; movd mm0, rax\r
+    movq    mm0, rax\r
     mov     r8, rcx\r
     mov     rdi, r8\r
     mov     rcx, rdx\r
     and     edx, 3\r
     shr     rcx, 2\r
     jz      @SetWords\r
-    DB      0xf, 0x70, 0xC0, 0x0         ; pshufw mm0, mm0, 0h\r
+    pshufw  mm0, mm0, 0\r
 .0:\r
-    DB      0xf, 0xe7, 0x7              ; movntq [rdi], mm0\r
+    movntq  [rdi], mm0\r
     add     rdi, 8\r
     loop    .0\r
     mfence\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.nasm
index b3a7385897191ad66bddef199846b8bf3a0806b9..ab5f9548269ef26e14553f6a0974c2ee4e6c483b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -28,20 +28,20 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalMemSetMem32)\r
 ASM_PFX(InternalMemSetMem32):\r
-    DB      0x49, 0xf, 0x6e, 0xc0         ; movd mm0, r8 (Value)\r
+    movq    mm0, r8\r
     mov     rax, rcx                    ; rax <- Buffer\r
     xchg    rcx, rdx                    ; rcx <- Count  rdx <- Buffer\r
     shr     rcx, 1                      ; rcx <- # of qwords to set\r
     jz      @SetDwords\r
-    DB      0xf, 0x70, 0xC0, 0x44         ; pshufw mm0, mm0, 44h\r
+    pshufw  mm0, mm0, 44h\r
 .0:\r
-    DB      0xf, 0xe7, 0x2              ; movntq [rdx], mm0\r
+    movntq  [rdx], mm0\r
     lea     rdx, [rdx + 8]              ; use "lea" to avoid flag changes\r
     loop    .0\r
     mfence\r
 @SetDwords:\r
     jnc     .1\r
-    DB      0xf, 0x7e, 0x2               ; movd [rdx], mm0\r
+    movd    [rdx], mm0\r
 .1:\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.nasm
index f517e1d23a5ac5bfb4c4ddbb9fc9c1e7f8b068eb..fcc44294a8641760c3b2ded00f1ad2859f61d2e7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -28,11 +28,11 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(InternalMemSetMem64)\r
 ASM_PFX(InternalMemSetMem64):\r
-    DB      0x49, 0xf, 0x6e, 0xc0         ; movd mm0, r8 (Value)\r
+    movq    mm0, r8\r
     mov     rax, rcx                    ; rax <- Buffer\r
     xchg    rcx, rdx                    ; rcx <- Count\r
 .0:\r
-    DB      0xf, 0xe7, 0x2              ; movntq  [rdx], mm0\r
+    movntq  [rdx], mm0\r
     add     rdx, 8\r
     loop    .0\r
     mfence\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.nasm b/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.nasm
index 2a85f15b55d473f65bba2a25e2600fbfcccbdcfc..8b02eeb732d1d86e76b43d36dd0b78b20f548cb3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.nasm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.nasm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -34,12 +34,12 @@ ASM_PFX(InternalMemZeroMem):
     and     edx, 7\r
     shr     rcx, 3\r
     jz      @ZeroBytes\r
-    DB      0xf, 0xef, 0xc0             ; pxor mm0, mm0\r
+    pxor    mm0, mm0\r
 .0:\r
-    DB      0xf, 0xe7, 7                ; movntq [rdi], mm0\r
+    movntq  [rdi], mm0\r
     add     rdi, 8\r
     loop    .0\r
-    DB      0xf, 0xae, 0xf0             ; mfence\r
+    mfence\r
 @ZeroBytes:\r
     xor     eax, eax\r
     mov     ecx, edx\r