[PATCH v6 0/6] MR706: Draft: ntoskrnl: implement cmp instruction with opcodes 0x38,0x39

[Etaash Mathamsetty (＠etaash.mathamsetty)]

fixes bug #48988
I am not very familiar with assembly, so feedback is appreciated

--
  v6: remove extra space

https://gitlab.winehq.org/wine/wine/-/merge_requests/706

[PATCH v6 1/6] implement cmp instruction

[Etaash Mathamsetty]

From: Etaash Mathamsetty

with opcode 0x38 and 0x39
---
 dlls/ntoskrnl.exe/instr.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index 8f1aa4d45a3..c9c61513a33 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -890,7 +890,39 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
         }
         break;  /* Unable to emulate it */
     }
+    case 0x38:
+    case 0x39: /* cmp r/m r/m*/
+    {
+        BYTE *data = INSTR_GetOperandAddr(context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len);
+        BYTE *data2 = INSTR_GetOperandAddr(context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len);
+        SIZE_T offset = data - user_shared_data;
+        SIZE_T offset2 = data2 - user_shared_data;
+        SIZE_T data_size = get_op_size(long_op, rex);
+        if(offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
+        {
+            if(offset2 <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
+            {
+                data2 = wine_user_shared_data + offset2;
+                TRACE("USD offset2 %#x at %#p", (unsigned int)offset, (void*)context->Rip);
+            }
+            TRACE("USD offset %#x at %#p\n",(unsigned int) offset, (void*)context->Rip);
+
+            /* clear ZF and CF */
+            context->EFlags &= ~(1UL << 6);
+            context->EFlags &= ~(1UL);

+            if(*(wine_user_shared_data + offset) == *data2)
+            {
+                context->EFlags |= (1UL << 6); /* ZF */
+            }
+            else if(*(wine_user_shared_data + offset) < *data2){
+                context->EFlags |= 1UL; /* CF */
+            }
+            context->Rip += prefixlen + len + 1;
+            return ExceptionContinueExecution;
+        }
+        break;
+    }
     case 0xa0: /* mov Ob, AL */
     case 0xa1: /* mov Ovqp, rAX */
     {

[PATCH v6 2/6] maybe fixes error?

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/instr.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index c9c61513a33..dfb79830b7a 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -893,8 +893,10 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
     case 0x38:
     case 0x39: /* cmp r/m r/m*/
     {
-        BYTE *data = INSTR_GetOperandAddr(context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len);
-        BYTE *data2 = INSTR_GetOperandAddr(context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len);
+        BYTE* data = NULL;
+        BYTE* data2 = NULL;
+        data = INSTR_GetOperandAddr(context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len);
+        data2 = INSTR_GetOperandAddr(context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len);
         SIZE_T offset = data - user_shared_data;
         SIZE_T offset2 = data2 - user_shared_data;
         SIZE_T data_size = get_op_size(long_op, rex);

[PATCH v6 3/6] fix print formatting

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/instr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index dfb79830b7a..b4c646bb3b2 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -905,9 +905,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
             if(offset2 <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
             {
                 data2 = wine_user_shared_data + offset2;
-                TRACE("USD offset2 %#x at %#p", (unsigned int)offset, (void*)context->Rip);
+                TRACE("USD offset2 %#x at %p", (unsigned int)offset, (void*)context->Rip);
             }
-            TRACE("USD offset %#x at %#p\n",(unsigned int) offset, (void*)context->Rip);
+            TRACE("USD offset %#x at %p\n",(unsigned int) offset, (void*)context->Rip);

/* clear ZF and CF */
             context->EFlags &= ~(1UL << 6);

[PATCH v6 4/6] fix potential logic error

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/instr.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index b4c646bb3b2..55a3ea8d0d3 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -893,31 +893,34 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
     case 0x38:
     case 0x39: /* cmp r/m r/m*/
     {
-        BYTE* data = NULL;
-        BYTE* data2 = NULL;
-        data = INSTR_GetOperandAddr(context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len);
-        data2 = INSTR_GetOperandAddr(context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len);
+        BYTE* data = INSTR_GetOperandAddr(context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len);
+        BYTE* data2 = INSTR_GetOperandAddr(context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len);
         SIZE_T offset = data - user_shared_data;
         SIZE_T offset2 = data2 - user_shared_data;
         SIZE_T data_size = get_op_size(long_op, rex);
+        BOOL is_user_shared_data = FALSE;
         if(offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
         {
-            if(offset2 <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
-            {
-                data2 = wine_user_shared_data + offset2;
-                TRACE("USD offset2 %#x at %p", (unsigned int)offset, (void*)context->Rip);
-            }
-            TRACE("USD offset %#x at %p\n",(unsigned int) offset, (void*)context->Rip);
-
-            /* clear ZF and CF */
+            TRACE("USD offset %#x at %p\n",(unsigned int) offset, (void*) context->Rip);
+            data = wine_user_shared_data + offset;
+            is_user_shared_data = TRUE;
+        }
+        if(offset2 <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
+        {
+            TRACE("USD offset %#x at %p", (unsigned int) offset2, (void*) context->Rip);
+            data2 = wine_user_shared_data + offset2;
+            is_user_shared_data = TRUE;
+        }
+        if(is_user_shared_data){
+             /* clear ZF and CF */
             context->EFlags &= ~(1UL << 6);
             context->EFlags &= ~(1UL);

-            if(*(wine_user_shared_data + offset) == *data2)
+            if(*data == *data2)
             {
                 context->EFlags |= (1UL << 6); /* ZF */
             }
-            else if(*(wine_user_shared_data + offset) < *data2){
+            else if(*data < *data2){
                 context->EFlags |= 1UL; /* CF */
             }
             context->Rip += prefixlen + len + 1;

[PATCH v6 5/6] fix errors

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/instr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index 55a3ea8d0d3..36a1f9c93aa 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -902,13 +902,13 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
         if(offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
         {
             TRACE("USD offset %#x at %p\n",(unsigned int) offset, (void*) context->Rip);
-            data = wine_user_shared_data + offset;
+            data = (BYTE*)(wine_user_shared_data + offset);
             is_user_shared_data = TRUE;
         }
         if(offset2 <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
         {
             TRACE("USD offset %#x at %p", (unsigned int) offset2, (void*) context->Rip);
-            data2 = wine_user_shared_data + offset2;
+            data2 = (BYTE*)(wine_user_shared_data + offset2);
             is_user_shared_data = TRUE;
         }
         if(is_user_shared_data){

[PATCH v6 6/6] remove extra space

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/instr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index 36a1f9c93aa..b7682fe9afc 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -912,7 +912,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
             is_user_shared_data = TRUE;
         }
         if(is_user_shared_data){
-             /* clear ZF and CF */
+            /* clear ZF and CF */
             context->EFlags &= ~(1UL << 6);
             context->EFlags &= ~(1UL);

[PATCH v6 6/6] remove extra space

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=121875

Your paranoid android.

=== debian11 (32 bit Chinese:China report) ===

ntoskrnl.exe:
driver_pnp.c:737: Test failed: expected IRP_MN_REMOVE_DEVICE

[Etaash Mathamsetty (＠etaash.mathamsetty)]

why is the test build failing, I fixed all the errors and the diff is up to date?!?