diff --git a/src/native/posix/generic/System/Mod/Kernel.cp b/src/native/posix/generic/System/Mod/Kernel.cp
index 083c9977a5c89f92fbc11ed1444189e2ee5828f4..2039e1766ff3b0595b81a696846cc72f4dc58c3a 100644 (file)
MODULE Kernel;
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 *)
(* init fpu? *)
(* add signal blocking to avoid race conditions in Try/Trap/TrapHandler *)
wouldFinalize: BOOLEAN;
wouldFinalize: BOOLEAN;
- watcher*: PROCEDURE (event: INTEGER); (* for debugging *)
+ watcher*: PROCEDURE (event: INTEGER); (* for debugging *)
+
+ intTrap*: BOOLEAN;
PROCEDURE Erase (adr, words: INTEGER);
BEGIN
PROCEDURE Erase (adr, words: INTEGER);
BEGIN
PROCEDURE AllocHeapMem (size: INTEGER; VAR c: Cluster);
CONST N = 65536; (* cluster size for dll *)
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;
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;
IF adr = 0 THEN c := NIL
ELSE
c := S.VAL(Cluster, (adr + 15) DIV 16 * 16); c.max := adr;
PROCEDURE FreeHeapMem (c: Cluster);
BEGIN
DEC(used, c.size); DEC(total, c.size);
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;
END FreeHeapMem;
PROCEDURE HeapFull (size: INTEGER): BOOLEAN;
IF isTry THEN
setjmp._longjmp(tryEnv, 1)
END;
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
ELSIF (trapViewer # NIL) & (restart # NIL) & ~trapped & ~guarded THEN
trapped := TRUE; trapViewer()
ELSE DefaultTrapViewer
IF isTry THEN
setjmp._longjmp(tryEnv, 1)
END;
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
ELSIF (trapViewer # NIL) & (restart # NIL) & ~trapped & ~guarded THEN
trapped := TRUE; trapViewer()
ELSE DefaultTrapViewer
PROCEDURE Init;
VAR i: INTEGER;
BEGIN
PROCEDURE Init;
VAR i: INTEGER;
BEGIN
+ intTrap := TRUE;
pagesize := unistd.sysconf(unistd._SC_PAGESIZE);
(* init heap *)
pagesize := unistd.sysconf(unistd._SC_PAGESIZE);
(* init heap *)