(openoffice) 04/09: Fix the bad machine code opcodes. The assembly language was reassembled and hexdumped, revealing wrong opcodes, which this patch fixes.

[damjan]

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit ad7f763788a8e671f279d3817857f393458d9b80
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Mon Jan 27 04:24:42 2025 +0200

    Fix the bad machine code opcodes.
    The assembly language was reassembled and hexdumped,
    revealing wrong opcodes, which this patch fixes.
    
    Patch by: me
---
 main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx 
b/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
index 5f08b215c8..59f250784c 100644
--- a/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
+++ b/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
@@ -369,6 +369,11 @@ unsigned char * codeSnippet(
     // 
     //
 
+    // When it doubt about correctness,
+    // uncomment this and disassemble at runtime:
+    // INT 0x3
+    //*p++ = 0xcc;
+
     if (isArgFloat[0])
     {
         // movsd QWORD[rsp+8], XMM0
@@ -377,7 +382,7 @@ unsigned char * codeSnippet(
     else
     {
         // mov QWORD[rsp+8], rcx
-        *p++ = 0x48; *p++ = 0x49; *p++ = 0x4c; *p++ = 0x24; *p++ = 0x08;
+        *p++ = 0x48; *p++ = 0x89; *p++ = 0x4c; *p++ = 0x24; *p++ = 0x08;
     }
 
     if (isArgFloat[1])
@@ -388,7 +393,7 @@ unsigned char * codeSnippet(
     else
     {
         // mov QWORD[rsp+16], rdx
-        *p++ = 0x48; *p++ = 0x49; *p++ = 0x54; *p++ = 0x24; *p++ = 0x10;
+        *p++ = 0x48; *p++ = 0x89; *p++ = 0x54; *p++ = 0x24; *p++ = 0x10;
     }
 
     if (isArgFloat[2])
@@ -441,7 +446,7 @@ unsigned char * codeSnippet(
     *p++ = (((sal_uIntPtr)(&privateSnippetExecutor)) >> 56) & 0xff;
 
     // jmp r11
-    *p++ = 0x49;
+    *p++ = 0x41;
     *p++ = 0xff;
     *p++ = 0xe3;