X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fnative%2Fposix%2Fgeneric%2FSystem%2FMod%2FKernel.cp;h=2039e1766ff3b0595b81a696846cc72f4dc58c3a;hp=083c9977a5c89f92fbc11ed1444189e2ee5828f4;hb=e01013bb2dfa7aaab246a94bdde530fd91ea4a43;hpb=76d1e8d98f1d80d24fa52a15e6b2c6fb0a5f44d0

diff --git a/src/native/posix/generic/System/Mod/Kernel.cp b/src/native/posix/generic/System/Mod/Kernel.cp
index 083c997..2039e17 100644
--- a/src/native/posix/generic/System/Mod/Kernel.cp
+++ b/src/native/posix/generic/System/Mod/Kernel.cp
@@ -1,9 +1,9 @@
 MODULE Kernel;
 
-  IMPORT S := SYSTEM, stdlib := C99stdlib, stdio := C99stdio,
-    time := C99time, wctype := C99wctype, sysmman := C99sys_mman,
-    dlfcn := C99dlfcn, types := C99types, fcntl := C99fcntl,
-    unistd := C99unistd, signal := C99signal, setjmp := C99setjmp;
+  IMPORT S := SYSTEM, stdlib := PosixCstdlib, stdio := PosixCstdio,
+    time := PosixCtime, wctype := PosixCwctype, sysmman := PosixCsys_mman,
+    dlfcn := PosixCdlfcn, types := PosixCtypes, fcntl := PosixCfcntl,
+    unistd := PosixCunistd, signal := PosixCsignal, setjmp := PosixCsetjmp;
 
   (* init fpu? *)
   (* add signal blocking to avoid race conditions in Try/Trap/TrapHandler *)
@@ -237,7 +237,9 @@ MODULE Kernel;
 
     wouldFinalize: BOOLEAN;
 
-    watcher*: PROCEDURE (event: INTEGER); (* for debugging *)   
+    watcher*: PROCEDURE (event: INTEGER); (* for debugging *)
+
+    intTrap*: BOOLEAN;
 
   PROCEDURE Erase (adr, words: INTEGER);
   BEGIN
@@ -459,12 +461,18 @@ MODULE Kernel;
 
   PROCEDURE AllocHeapMem (size: INTEGER; VAR c: Cluster);
     CONST N = 65536;  (* cluster size for dll *)
-    VAR adr, allocated: INTEGER;
+    VAR adr, allocated, newsize: INTEGER;
   BEGIN
     INC(size, 16);
     ASSERT(size > 0, 100); adr := 0;
-    IF size < N THEN adr := stdlib.malloc(N) END;
-    IF adr = 0 THEN adr := stdlib.malloc(size); allocated := size ELSE allocated := N END;
+    IF size < N THEN
+      adr := AllocMem(N, newsize);
+      allocated := newsize
+    END;
+    IF adr = 0 THEN
+      adr := AllocMem(size, newsize);
+      allocated := newsize
+    END;
     IF adr = 0 THEN c := NIL
     ELSE
       c := S.VAL(Cluster, (adr + 15) DIV 16 * 16); c.max := adr;
@@ -478,7 +486,7 @@ MODULE Kernel;
   PROCEDURE FreeHeapMem (c: Cluster);
   BEGIN
     DEC(used, c.size); DEC(total, c.size);
-    stdlib.free(S.VAL(ADDRESS, c.max))
+    FreeMem(S.VAL(ADDRESS, c.max), c.size)
   END FreeHeapMem;
 
   PROCEDURE HeapFull (size: INTEGER): BOOLEAN;
@@ -1560,7 +1568,7 @@ MODULE Kernel;
     IF isTry THEN
       setjmp._longjmp(tryEnv, 1)
     END;
-    IF err = 128 THEN (* do nothing *)
+    IF (err = 128) OR (err = 200) & ~intTrap THEN (* do nothing *)
     ELSIF (trapViewer # NIL) & (restart # NIL) & ~trapped & ~guarded THEN
       trapped := TRUE; trapViewer()
     ELSE DefaultTrapViewer
@@ -1619,7 +1627,7 @@ MODULE Kernel;
     IF isTry THEN
       setjmp._longjmp(tryEnv, 1)
     END;
-    IF err = 128 THEN (* do nothing *)
+    IF (err = 128) OR (err = 200) & ~intTrap THEN (* do nothing *)
     ELSIF (trapViewer # NIL) & (restart # NIL) & ~trapped & ~guarded THEN
       trapped := TRUE; trapViewer()
     ELSE DefaultTrapViewer
@@ -1658,6 +1666,7 @@ MODULE Kernel;
   PROCEDURE Init;
     VAR i: INTEGER;
   BEGIN
+    intTrap := TRUE;
     pagesize := unistd.sysconf(unistd._SC_PAGESIZE);
 
     (* init heap *)