Changeset 655 for GPL/branches/uniaud32-next/lib32/memory.c

Timestamp:

Jan 24, 2021, 9:19:48 AM (5 years ago)

Author:

Paul Smedley

Message:

Code cleanups from AlexT

File:

• GPL/branches/uniaud32-next/lib32/memory.c (modified) (11 diffs)

GPL/branches/uniaud32-next/lib32/memory.c

@@ -191 +191 @@
     PAGELIST pagelist;
 
-        if(DevLinToPageList(addr, PAGE_SIZE, (PAGELIST NEAR *)__Stack32ToFlat((ULONG)&pagelist))) {
+        if(DevLinToPageList(addr, PAGE_SIZE, (PAGELIST NEAR *)&pagelist)) {
                 DebugInt3();
                 return 0;
@@ -209 +209 @@
     rc = KernVMAlloc(PAGE_SIZE, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&address, &sel);
 #else
-    rc = DevVMAlloc(VMDHA_PHYS, PAGE_SIZE, (LINEAR)&address, __Stack32ToFlat((ULONG)&addr));
+    rc = DevVMAlloc(VMDHA_PHYS, PAGE_SIZE, (LINEAR)&address, (ULONG)&addr);
 #endif
     if (rc != 0) {
@@ -236 +236 @@
     rc = KernVMAlloc(size, flags, (PVOID*)&addr, (PVOID*)-1, &sel);
 #else
-    rc = DevVMAlloc(flags, size, (LINEAR)-1, __Stack32ToFlat((ULONG)&addr));
+    rc = DevVMAlloc(flags, size, (LINEAR)-1, (ULONG)&addr);
 #endif
     if (rc == 0) {
@@ -410 +410 @@
 
     //check if it really is the base of the allocation (see above)
-    addr = GetBaseAddressAndFree(addr, (ULONG NEAR *)__Stack32ToFlat(&size));
+    addr = GetBaseAddressAndFree(addr, (ULONG NEAR *)&size);
 
     if(VMFree((LINEAR)addr)) {
@@ -454 +454 @@
     ULONG  size = 0;
 
-    GetBaseAddressAndFree((ULONG)ptr, (ULONG NEAR *)__Stack32ToFlat(&size));
+    GetBaseAddressAndFree((ULONG)ptr, (ULONG NEAR *)&size);
 
     if(VMFree((LINEAR)ptr)) {
@@ -505 +505 @@
     rc = KernVMAlloc(Length, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&PhysicalAddress, &sel);
 #else
-    //rc = DevVMAlloc(VMDHA_PHYS, size, (LINEAR)&physaddr, __Stack32ToFlat((ULONG)&addr));
-    rc = DevVMAlloc(VMDHA_PHYS, Length, (LINEAR)&PhysicalAddress, __Stack32ToFlat((ULONG)&addr));
+    //rc = DevVMAlloc(VMDHA_PHYS, size, (LINEAR)&physaddr, (ULONG)&addr);
+    rc = DevVMAlloc(VMDHA_PHYS, Length, (LINEAR)&PhysicalAddress, (ULONG)&addr);
 #endif
     if (rc != 0) {
@@ -544 +544 @@
     if(n == 0) return;
 
-        kmemcpy(to, from, n);
+        memcpy(to, from, n);
 }
 //******************************************************************************
@@ -556 +556 @@
     if(n == 0) return 0;
 
-        kmemcpy(to, from, n);
+        memcpy(to, from, n);
         return 0;
 }
@@ -581 +581 @@
     if(n == 0) return 0;
 
-        kmemcpy(to, from, n);
+        memcpy(to, from, n);
         return 0;
 }
@@ -594 +594 @@
                 return 0;
         }
-        kmemcpy(dest, src, size);
+        memcpy(dest, src, size);
         return 0;
 }
@@ -701 +701 @@
             size = _msize((void _near *)block);
 
-        else if (!GetBaseAddressNoFree((ULONG)block, (ULONG NEAR *)__Stack32ToFlat(&size)))
+        else if (!GetBaseAddressNoFree((ULONG)block, (ULONG NEAR *)&size))
             size = 0;                   // Something wrong