XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

oberon07: fix for r7107, NEW/DISPOSE support multi-thread mode

Browse Source 
git-svn-id: svn://kolibrios.org@7110 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Anton Krotov 2017-11-16 07:01:07 +00:00
parent fbdde8ba84
commit e80f6ad31e
3 changed files with 308 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
programs/develop/oberon07/Compiler.kex
View File

Binary file not shown.

185
programs/develop/oberon07/Lib/KolibriOS/API.ob07
View File

@ -19,31 +19,49 @@ MODULE API;
IMPORT sys := SYSTEM; IMPORT sys := SYSTEM;
CONST CONST
MAX_SIZE = 16 * 400H; MAX_SIZE = 16 * 400H;
HEAP_SIZE = 1 * 100000H; HEAP_SIZE = 1 * 100000H;
_new = 1;
_dispose = 2;
TYPE
CRITICAL_SECTION = ARRAY 2 OF INTEGER;
VAR VAR
heap, endheap: INTEGER; heap, endheap: INTEGER;
pockets: ARRAY MAX_SIZE DIV 32 + 1 OF INTEGER; pockets: ARRAY MAX_SIZE DIV 32 + 1 OF INTEGER;
PROCEDURE [stdcall] zeromem*(size, adr: INTEGER); CriticalSection: CRITICAL_SECTION;
PROCEDURE [stdcall] zeromem* (size, adr: INTEGER);
BEGIN BEGIN
sys.CODE("578B7D0C8B4D0833C09CFCF3AB9D5F") sys.CODE("578B7D0C8B4D0833C09CFCF3AB9D5F")
END zeromem; END zeromem;
PROCEDURE mem_commit*(adr, size: INTEGER);
VAR tmp: INTEGER; PROCEDURE mem_commit* (adr, size: INTEGER);
VAR
tmp: INTEGER;
BEGIN BEGIN
FOR tmp := adr TO adr + size - 1 BY 4096 DO FOR tmp := adr TO adr + size - 1 BY 4096 DO
sys.PUT(tmp, 0) sys.PUT(tmp, 0)
END END
END mem_commit; END mem_commit;
PROCEDURE strncmp*(a, b, n: INTEGER): INTEGER;
VAR A, B: CHAR; Res: INTEGER; PROCEDURE strncmp* (a, b, n: INTEGER): INTEGER;
VAR
A, B: CHAR;
Res: INTEGER;
BEGIN BEGIN
Res := 0; Res := 0;
WHILE n > 0 DO WHILE n > 0 DO
@ -60,7 +78,8 @@ BEGIN
RETURN Res RETURN Res
END strncmp; END strncmp;
PROCEDURE [stdcall] sysfunc1*(arg1: INTEGER): INTEGER;
PROCEDURE [stdcall] sysfunc1* (arg1: INTEGER): INTEGER;
BEGIN BEGIN
sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *) sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *)
sys.CODE("CD40"); (* int 40h *) sys.CODE("CD40"); (* int 40h *)
@ -69,7 +88,8 @@ BEGIN
RETURN 0 RETURN 0
END sysfunc1; END sysfunc1;
PROCEDURE [stdcall] sysfunc2*(arg1, arg2: INTEGER): INTEGER;
PROCEDURE [stdcall] sysfunc2* (arg1, arg2: INTEGER): INTEGER;
BEGIN BEGIN
sys.CODE("53"); (* push ebx *) sys.CODE("53"); (* push ebx *)
sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *) sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *)
@ -81,7 +101,8 @@ BEGIN
RETURN 0 RETURN 0
END sysfunc2; END sysfunc2;
PROCEDURE [stdcall] sysfunc3*(arg1, arg2, arg3: INTEGER): INTEGER;
PROCEDURE [stdcall] sysfunc3* (arg1, arg2, arg3: INTEGER): INTEGER;
BEGIN BEGIN
sys.CODE("53"); (* push ebx *) sys.CODE("53"); (* push ebx *)
sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *) sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *)
@ -94,8 +115,94 @@ BEGIN
RETURN 0 RETURN 0
END sysfunc3; END sysfunc3;
PROCEDURE _NEW*(size: INTEGER): INTEGER;
VAR res, idx, temp: INTEGER; PROCEDURE [stdcall] sysfunc4* (arg1, arg2, arg3, arg4: INTEGER): INTEGER;
BEGIN
sys.CODE("53"); (* push ebx *)
sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *)
sys.CODE("8B5D0C"); (* mov ebx, [ebp + 0Ch] *)
sys.CODE("8B4D10"); (* mov ecx, [ebp + 10h] *)
sys.CODE("8B5514"); (* mov edx, [ebp + 14h] *)
sys.CODE("CD40"); (* int 40h *)
sys.CODE("5B"); (* pop ebx *)
sys.CODE("C9"); (* leave *)
sys.CODE("C21000"); (* ret 10h *)
RETURN 0
END sysfunc4;
PROCEDURE [stdcall] sysfunc5* (arg1, arg2, arg3, arg4, arg5: INTEGER): INTEGER;
BEGIN
sys.CODE("53"); (* push ebx *)
sys.CODE("56"); (* push esi *)
sys.CODE("8B4508"); (* mov eax, [ebp + 08h] *)
sys.CODE("8B5D0C"); (* mov ebx, [ebp + 0Ch] *)
sys.CODE("8B4D10"); (* mov ecx, [ebp + 10h] *)
sys.CODE("8B5514"); (* mov edx, [ebp + 14h] *)
sys.CODE("8B7518"); (* mov esi, [ebp + 18h] *)
sys.CODE("CD40"); (* int 40h *)
sys.CODE("5E"); (* pop esi *)
sys.CODE("5B"); (* pop ebx *)
sys.CODE("C9"); (* leave *)
sys.CODE("C21400"); (* ret 14h *)
RETURN 0
END sysfunc5;
PROCEDURE switch_task;
VAR
res: INTEGER;
BEGIN
res := sysfunc2(68, 1)
END switch_task;
PROCEDURE futex_create (ptr: INTEGER): INTEGER;
RETURN sysfunc3(77, 0, ptr)
END futex_create;
PROCEDURE futex_wait (futex, value, timeout: INTEGER);
VAR
res: INTEGER;
BEGIN
res := sysfunc5(77, 2, futex, value, timeout)
END futex_wait;
PROCEDURE futex_wake (futex, number: INTEGER);
VAR
res: INTEGER;
BEGIN
res := sysfunc4(77, 3, futex, number)
END futex_wake;
PROCEDURE EnterCriticalSection* (VAR CriticalSection: CRITICAL_SECTION);
BEGIN
switch_task;
futex_wait(CriticalSection[0], 1, 10000);
CriticalSection[1] := 1
END EnterCriticalSection;
PROCEDURE LeaveCriticalSection* (VAR CriticalSection: CRITICAL_SECTION);
BEGIN
CriticalSection[1] := 0;
futex_wake(CriticalSection[0], 1)
END LeaveCriticalSection;
PROCEDURE InitializeCriticalSection* (VAR CriticalSection: CRITICAL_SECTION);
BEGIN
CriticalSection[0] := futex_create(sys.ADR(CriticalSection[1]));
CriticalSection[1] := 0
END InitializeCriticalSection;
PROCEDURE __NEW (size: INTEGER): INTEGER;
VAR
res, idx, temp: INTEGER;
BEGIN BEGIN
IF size <= MAX_SIZE THEN IF size <= MAX_SIZE THEN
idx := ASR(size, 5); idx := ASR(size, 5);
@ -144,10 +251,12 @@ BEGIN
zeromem(ASR(size, 2) - 1, res) zeromem(ASR(size, 2) - 1, res)
END END
RETURN res RETURN res
END _NEW; END __NEW;
PROCEDURE _DISPOSE*(ptr: INTEGER): INTEGER;
VAR size, idx: INTEGER; PROCEDURE __DISPOSE (ptr: INTEGER): INTEGER;
VAR
size, idx: INTEGER;
BEGIN BEGIN
DEC(ptr, 4); DEC(ptr, 4);
sys.GET(ptr, size); sys.GET(ptr, size);
@ -159,26 +268,59 @@ BEGIN
size := sysfunc3(68, 13, ptr) size := sysfunc3(68, 13, ptr)
END END
RETURN 0 RETURN 0
END __DISPOSE;
PROCEDURE NEW_DISPOSE (func, arg: INTEGER): INTEGER;
VAR
res: INTEGER;
BEGIN
EnterCriticalSection(CriticalSection);
IF func = _new THEN
res := __NEW(arg)
ELSIF func = _dispose THEN
res := __DISPOSE(arg)
END;
LeaveCriticalSection(CriticalSection)
RETURN res
END NEW_DISPOSE;
PROCEDURE _NEW* (size: INTEGER): INTEGER;
RETURN NEW_DISPOSE(_new, size)
END _NEW;
PROCEDURE _DISPOSE* (ptr: INTEGER): INTEGER;
RETURN NEW_DISPOSE(_dispose, ptr)
END _DISPOSE; END _DISPOSE;
PROCEDURE ExitProcess*(p1: INTEGER);
PROCEDURE ExitProcess* (p1: INTEGER);
BEGIN BEGIN
p1 := sysfunc1(-1) p1 := sysfunc1(-1)
END ExitProcess; END ExitProcess;
PROCEDURE ExitThread*(p1: INTEGER);
PROCEDURE ExitThread* (p1: INTEGER);
BEGIN BEGIN
p1 := sysfunc1(-1) p1 := sysfunc1(-1)
END ExitThread; END ExitThread;
PROCEDURE OutChar(c: CHAR);
VAR res: INTEGER; PROCEDURE OutChar (c: CHAR);
VAR
res: INTEGER;
BEGIN BEGIN
res := sysfunc3(63, 1, ORD(c)) res := sysfunc3(63, 1, ORD(c))
END OutChar; END OutChar;
PROCEDURE DebugMsg*(lpText, lpCaption: INTEGER);
VAR c: CHAR; PROCEDURE DebugMsg* (lpText, lpCaption: INTEGER);
VAR
c: CHAR;
BEGIN BEGIN
IF lpCaption # 0 THEN IF lpCaption # 0 THEN
OutChar(0DX); OutChar(0DX);
@ -207,9 +349,12 @@ BEGIN
END END
END DebugMsg; END DebugMsg;
PROCEDURE init* (p1: INTEGER); PROCEDURE init* (p1: INTEGER);
BEGIN BEGIN
p1 := sysfunc2(68, 11) p1 := sysfunc2(68, 11);
InitializeCriticalSection(CriticalSection)
END init; END init;
END API. END API.

3
programs/develop/oberon07/Lib/Windows32/RTL.ob07
View File

@ -1,4 +1,4 @@
(* (*
Copyright 2016, 2017 Anton Krotov Copyright 2016, 2017 Anton Krotov
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -246,6 +246,7 @@ BEGIN
Int(code, int); Int(code, int);
StrAppend(int) StrAppend(int)
END; END;
API.DebugMsg(sys.ADR(msg), SelfName);
IF API.GetCurrentThreadId() = main_thread_id THEN IF API.GetCurrentThreadId() = main_thread_id THEN
API.ExitProcess(0) API.ExitProcess(0)
ELSE ELSE