Changeset 148 for sbliveos2/trunk/lib32

Timestamp:

Apr 26, 2000, 8:01:02 PM (25 years ago)

Author:

sandervl

Message:

beta 0.25 update

Location:

sbliveos2/trunk/lib32

Files:

• makefile.os2 (modified) (1 diff)
• memory.cpp (modified) (7 diffs)
• ossidc.cpp (modified) (1 diff)

sbliveos2/trunk/lib32/makefile.os2

@@ -12 +12 @@
 
 !if "$(DEBUG)" == "1"
-#CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
-CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
+CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
 !else
-#CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
-CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
+CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
 !endif
 
-CC       = WCC386 $(CFLAGS) $(IWC)
-CCSMALL  = WCC386 $(CFLAGS_SMALL) $(IWC)
-CPP      = WPP386 $(CFLAGS) $(IWC)
-CPPSMALL = WPP386 $(CFLAGS_SMALL) $(IWC)
+ASFLAGS = -Mb -Li -Sv:ALP
 
-ASFLAGS = -Mb -Li -Sv:ALP
+!if "$(KEE)" == "1"
+CFLAGS  = $(CFLAGS) -mf -DKEE
+ASFLAGS = $(ASFLAGS) -D:KEE
+!else
+CFLAGS  = $(CFLAGS) -mc -zu
+!endif
+
+CC      = WCC386 $(CFLAGS) $(IWC)
+CPP     = WPP386 $(CFLAGS) $(IWC)
 ASM     = alp $(ASFLAGS) $(INCA)
 

sbliveos2/trunk/lib32/memory.cpp

@@ -50 +50 @@
 
         if(KernLinToPageList(address, PAGE_SIZE, &pagelist, &nrpages)) {
+                DebugInt3();
                 return 0;
         }
@@ -58 +59 @@
 
         if(DevLinToPageList(addr, PAGE_SIZE, (PAGELIST near *)__StackToFlat((ULONG)&pagelist))) {
+                DebugInt3();
                 return 0;
         }
@@ -85 +87 @@
         if(DevVMAlloc(VMDHA_FIXED|VMDHA_CONTIG, order*PAGE_SIZE, (LINEAR)-1, __StackToFlat((ULONG)&addr))) {
 #endif
-                return 0;
-        }
+                DebugInt3();
+                return 0;
+        }
+////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
         return (void *)addr;
 }
@@ -98 +102 @@
         DevVMFree((LINEAR)addr);
 #endif
+////    dprintf(("free_pages %x", addr));
         return 0;
 }
@@ -204 +209 @@
         if(DevVMAlloc(VMDHA_FIXED, size+4, (LINEAR)-1, __StackToFlat((ULONG)&addr))) {
 #endif
+                DebugInt3();
                 return 0;
         }
         *(ULONG *)addr = 0; //flat address
+////    dprintf(("kmalloc %d returned %x", size, addr));
         return addr+4;
   }
@@ -214 +221 @@
         return 0;
   }
+////  dprintf(("kmalloc %d returned %x", size, addr));
   return addr+4; //first 4 bytes contain original 16:16 address
 }
@@ -228 +236 @@
   }
   addr -= 4;  //first 4 bytes contain original 16:16 address or 0 if allocated by VMAlloc
+////  dprintf(("kfree %x", addr));
   if(*(ULONG near *)addr) {  
         CallOSS16(IDC16_FREE, *(ULONG near *)addr, 0);  

sbliveos2/trunk/lib32/ossidc.cpp

@@ -45 +45 @@
   idcpacket.param1 = param1;
   idcpacket.param2 = param2;
+#ifdef KEE
   pPacket          = (ULONG)__FlatToStack(&idcpacket);
+#else
+  pPacket          = (ULONG)__Compress48Pointer((char FAR48 *)&idcpacket);
+#endif
 
 #ifdef KEE