Lua/syscalls
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Projects Releases 1 Wiki Activity

немножко раскидал функции по отдельным файлам && add helloWorld example

Browse Source
This commit is contained in:
Егор
2025-04-05 20:29:18 +05:00
parent 5dc9f2ca31
commit 96eb2c55d3
13 changed files with 410 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@@ -2,7 +2,8 @@
"editor.tabSize": 4,
"editor.insertSpaces": false,
"files.associations": {
"stdlib.h": "c"
"stdlib.h": "c",
"ksys.h": "c"
},
"cSpell.words": [
"ksys",

8
Makefile
View File

@@ -5,7 +5,7 @@ LD=kos32-ld
STRIP=kos32-strip
OBJCOPY=kos32-objcopy
STD=-std=gnu99
CFLAGS=$(SYSCFLAGS) -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(STD) $(MYCFLAGS)
CFLAGS=$(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS)
LDFLAGS=$(SYSLDFLAGS) $(MYLDFLAGS)
LIBS=$(SYSLIBS) $(MYLIBS) $(TOOLCHAIN_PATH)/mingw32/lib/lua$(LUA_V).dll.a
@@ -38,6 +38,10 @@ clean:
rm -f $(ALL_O) syscalls.dll
src/syscalls.o: src/syscalls.c src/systemColors.h src/ARP_entry.h src/scancodes.h
src/syscalls.o: src/syscalls.c src/syscalls.h src/systemColors.h src/ARP_entry.h src/scancodes.h
src/ARP_entry.o: src/ARP_entry.c src/ARP_entry.h src/debug.h
src/systemColors.o: src/systemColors.c src/systemColors.h src/debug.h
src/socket.o: src/socket.c src/socket.h
src/socket.h: src/syscalls.h

0
doc/manual.md Normal file
View File

6
src/ARP_entry.c
View File

@@ -8,7 +8,7 @@
static int syscalls_gcARPEntry(lua_State* L)
{
free(lua_touserdata(L, 1));
free(luaL_checkudata(L, 1, syscalls_ARPEntry_metatable_name));
return 0;
}
@@ -90,8 +90,8 @@ static int syscalls_eqAPREntry(lua_State* L)
lua_pushboolean(
L,
syscalls_cmpAPREntry(
(struct ARP_entry*)lua_touserdata(L, 1),
(struct ARP_entry*)lua_touserdata(L, 2)
luaL_checkudata(L, 1, syscalls_ARPEntry_metatable_name),
luaL_checkudata(L, 2, syscalls_ARPEntry_metatable_name)
)
);

204
src/socket.c Normal file
View File

@@ -0,0 +1,204 @@
#include <sys/ksys.h>
#include "socket.h"
int syscalls_OpenSocket(lua_State* L)
{
int32_t socketNum;
uint32_t errorCode;
uint32_t family = luaL_checkinteger(L, 1);
uint32_t type = luaL_checkinteger(L, 2);
uint32_t protocol = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
:"=a"(socketNum), "=b"(errorCode)
: "a"(77), "b"(0), "c"(family), "d"(type), "S"(protocol)
);
if (socketNum == -1)
{
lua_pushnil(L); // Push socketNum
lua_pushnumber(L, socketNum); // Push error Code
}
else
{
lua_pushnumber(L, socketNum); // Push socketNum
lua_pushnil(L); // Push error code
}
return 2;
}
int syscalls_CloseSocket(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(1), "c"(socketNum));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Bind(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(2), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Listen(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t backlog = luaL_checkinteger(L, 2);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(3), "c"(socketNum), "d"(backlog));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Connect(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(4), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Accept(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(5), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Send(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t buffer = luaL_checkinteger(L, 2);
uint32_t bufferLen = luaL_checkinteger(L, 3);
uint32_t flags = luaL_checkinteger(L, 4);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(6), "c"(socketNum), "d"(buffer), "S"(bufferLen), "D"(flags));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_Receive(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t buffer = luaL_checkinteger(L, 2);
uint32_t bufferLen = luaL_checkinteger(L, 3);
uint32_t flags = luaL_checkinteger(L, 4);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(7), "c"(socketNum), "d"(buffer), "S"(bufferLen), "D"(flags));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_GetSocketOptions(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t optstruct = luaL_checkinteger(L, 2);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(8), "c"(socketNum), "d"(optstruct));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
int syscalls_GetPairSocket(lua_State* L)
{
int firstSocketNum;
int secondSocketNum;
asm_inline(
"int $0x40"
: "=a"(firstSocketNum), "=b"(secondSocketNum)
: "a"(77), "b"(9));
if (firstSocketNum == -1)
{
lua_pushnil(L);
lua_pushinteger(L, secondSocketNum);
}
else
{
lua_pushinteger(L, firstSocketNum);
lua_pushinteger(L, secondSocketNum);
}
return 2;
}

18
src/socket.h Normal file
View File

@@ -0,0 +1,18 @@
#ifndef __SOCKET_H__
#define __SOCKET_H__
#include "syscalls.h"
int syscalls_OpenSocket(lua_State* L);
int syscalls_CloseSocket(lua_State* L);
int syscalls_Bind(lua_State* L);
int syscalls_Listen(lua_State* L);
int syscalls_Connect(lua_State* L);
int syscalls_Accept(lua_State* L);
int syscalls_Send(lua_State* L);
int syscalls_Receive(lua_State* L);
int syscalls_GetSocketOptions(lua_State* L);
int syscalls_GetPairSocket(lua_State* L);
#endif // __SOCKET_H__

314
src/syscalls.c
View File

@@ -2,20 +2,17 @@
syscalls
*/
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <string.h>
#include <stdlib.h>
#include <sys/ksys.h>
#include "syscalls.h"
#include "scancodes.h"
#include "ARP_entry.h"
#include "systemColors.h"
#include "socket.h"
/*
@@ -42,53 +39,7 @@ static ksys_pos_t syscalls_screenSizeCache = { 0 };
*/
inline void syscalls_ReturnIntegerOrNil(LUA_INTEGER value, lua_State* L)
{
if (value == -1)
{
lua_pushnil(L);
}
else
{
lua_pushinteger(L, value);
}
}
inline void syscalls_ReturnIntegerValueOrNil(LUA_INTEGER cond, LUA_INTEGER value, lua_State* L)
{
if (cond == -1)
{
lua_pushnil(L);
}
else
{
lua_pushinteger(L, value);
}
}
inline void syscalls_ReturnTrueOrNil(LUA_INTEGER value, lua_State* L)
{
if (value == -1)
{
lua_pushnil(L);
}
else
{
lua_pushboolean(L, true);
}
}
inline void syscalls_ReturnStringOrNil(LUA_INTEGER cond, const char* value, lua_State* L)
{
if (cond == -1)
{
lua_pushnil(L);
}
else
{
lua_pushstring(L, value);
}
}
@@ -287,6 +238,23 @@ static int syscalls_drawPixel(lua_State* L)
return 0;
}
static int syscalls_WindowMsg(lua_State* L)
{
int event = luaL_checkinteger(L, 1);
int code = luaL_checkinteger(L, 2);
int ret;
asm_inline(
"int $0x40"
:"=a"(ret)
: "a"(72), "b"(1), "c"(event), "d"(code)
);
syscalls_ReturnTrueOrNil(ret, L);
return 1;
}
static int syscalls_threadInfo(lua_State* L)
{
ksys_thread_t t;
@@ -684,7 +652,7 @@ static int syscalls_getSystemColors(lua_State* L)
static int syscalls_SetSystemColors(lua_State* L)
{
ksys_colors_table_t* t = (ksys_colors_table_t*)lua_touserdata(L, 1);
ksys_colors_table_t* t = (ksys_colors_table_t*)luaL_checkudata(L, 1, syscalls_SystemColors_metatable_name);
asm_inline(
"int $0x40" ::"a"(48), "b"(2), "c"(t), "d"(40));
@@ -1637,17 +1605,25 @@ static int syscalls_ReadARPEntries(lua_State* L)
return 1;
}
/**
* Return ARP entry
*/
static int syscalls_ReadARPEntry(lua_State* L)
{
uint32_t eax;
uint8_t device = luaL_checkinteger(L, 1);
uint32_t entryNum = luaL_checkinteger(L, 2);
struct ARP_entry* buffer = syscalls_pushARPEntry(L);
struct ARP_entry buffer;
asm_inline(
"int $0x40"
: "=a"(eax)
: "a"(76), "b"((ARP << 24) | (device << 8) | 3), "c"(entryNum), "D"(buffer));
: "a"(76), "b"((ARP << 24) | (device << 8) | 3), "c"(entryNum), "D"(&buffer));
if (eax == -1)
lua_pushnil(L);
else
memcpy(syscalls_pushARPEntry(L), &buffer, sizeof(struct ARP_entry));
return 1;
}
@@ -1657,7 +1633,7 @@ static int syscalls_AddARPEntry(lua_State* L)
uint32_t eax;
uint8_t device = luaL_checkinteger(L, 1);
uint32_t entryNum = luaL_checkinteger(L, 2);
struct ARP_entry* buffer = (struct ARP_entry*)lua_touserdata(L, 3);
struct ARP_entry* buffer = (struct ARP_entry*)luaL_checkudata(L, 3, syscalls_ARPEntry_metatable_name);
asm_inline(
"int $0x40"
@@ -1715,211 +1691,39 @@ static int syscalls_ReadARPConflicts(lua_State* L)
return 1;
}
/* Сокеты */
static int syscalls_OpenSocket(lua_State* L)
static int syscalls_DebugPuts(lua_State* L)
{
int32_t socketNum;
uint32_t errorCode;
_ksys_debug_puts(luaL_checkstring(L, 1));
uint32_t family = luaL_checkinteger(L, 1);
uint32_t type = luaL_checkinteger(L, 2);
uint32_t protocol = luaL_checkinteger(L, 3);
return 0;
}
static int syscalls_DebugPutc(lua_State* L)
{
_ksys_debug_putc(*luaL_checkstring(L, 1));
return 0;
}
struct DebugMessageArea
{
int Size;
int Used;
char data[];
};
static int syscalls_SetMessageArea(lua_State* L)
{
struct DebugMessageArea* p = luaL_checkinteger(L, 1);
asm_inline(
"int $0x40"
:"=a"(socketNum), "=b"(errorCode)
: "a"(77), "b"(0), "c"(family), "d"(type), "S"(protocol)
:: "a"(69), "b"(0)
);
if (socketNum == -1)
{
lua_pushnil(L); // Push socketNum
lua_pushnumber(L, socketNum); // Push error Code
}
else
{
lua_pushnumber(L, socketNum); // Push socketNum
lua_pushnil(L); // Push error code
}
return 2;
return 0;
}
static int syscalls_CloseSocket(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(1), "c"(socketNum));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Bind(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(2), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Listen(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t backlog = luaL_checkinteger(L, 2);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(3), "c"(socketNum), "d"(backlog));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Connect(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(4), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Accept(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t sockaddr = luaL_checkinteger(L, 2);
uint32_t sockaddrLen = luaL_checkinteger(L, 3);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(5), "c"(socketNum), "d"(sockaddr), "S"(sockaddrLen));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Send(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t buffer = luaL_checkinteger(L, 2);
uint32_t bufferLen = luaL_checkinteger(L, 3);
uint32_t flags = luaL_checkinteger(L, 4);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(6), "c"(socketNum), "d"(buffer), "S"(bufferLen), "D"(flags));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_Receive(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t buffer = luaL_checkinteger(L, 2);
uint32_t bufferLen = luaL_checkinteger(L, 3);
uint32_t flags = luaL_checkinteger(L, 4);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(7), "c"(socketNum), "d"(buffer), "S"(bufferLen), "D"(flags));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_GetSocketOptions(lua_State* L)
{
uint32_t eax;
uint32_t errorCode;
uint32_t socketNum = luaL_checkinteger(L, 1);
uint32_t optstruct = luaL_checkinteger(L, 2);
asm_inline(
"int $0x40"
: "=a"(eax), "=b"(errorCode)
: "a"(77), "b"(8), "c"(socketNum), "d"(optstruct));
syscalls_ReturnIntegerValueOrNil(eax, errorCode, L);
return 1;
}
static int syscalls_GetPairSocket(lua_State* L)
{
int32_t firstSocketNum;
uint32_t secondSocketNum;
asm_inline(
"int $0x40"
: "=a"(firstSocketNum), "=b"(secondSocketNum)
: "a"(77), "b"(9));
if (firstSocketNum == -1)
{
lua_pushnil(L);
lua_pushinteger(L, secondSocketNum);
}
else
{
lua_pushinteger(L, firstSocketNum);
lua_pushinteger(L, secondSocketNum);
}
return 2;
}
/*
** functions for 'syscalls' library
*/
@@ -1969,7 +1773,7 @@ static const luaL_Reg syscallsLib[] = {
{"ReadPoint", syscalls_ReadPoint},
/* keyboard funcs */
{"SetKeyInputMode", syscalls_setKeyInputMode},
{"GetKeyInputMouse", syscalls_getKeyInputMode},
{"GetKeyInputMode", syscalls_getKeyInputMode},
{"getKey", syscalls_getKey},
{"getControlKeyState", syscalls_getControlKeyState},
{"SetHotkey", syscalls_SetHotkey},
@@ -2052,7 +1856,11 @@ static const luaL_Reg syscallsLib[] = {
{"Receive", syscalls_Receive},
{"GetSocketOptions", syscalls_GetSocketOptions},
{"GetPairSocket", syscalls_GetPairSocket},
{NULL, NULL} };
/* Debug */
{"DebugPuts", syscalls_DebugPuts},
{ "DebugPutc", syscalls_DebugPutc },
{NULL, NULL}
};
static inline void syscalls_push_events(lua_State* L)
{

56
src/syscalls.h Normal file
View File

@@ -0,0 +1,56 @@
#ifndef __SYSCALLS_H__
#define __SYSCALLS_H__
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
inline void syscalls_ReturnIntegerOrNil(LUA_INTEGER value, lua_State* L)
{
if (value == -1)
{
lua_pushnil(L);
}
else
{
lua_pushinteger(L, value);
}
}
inline void syscalls_ReturnIntegerValueOrNil(LUA_INTEGER cond, LUA_INTEGER value, lua_State* L)
{
if (cond == -1)
{
lua_pushnil(L);
}
else
{
lua_pushinteger(L, value);
}
}
inline void syscalls_ReturnTrueOrNil(LUA_INTEGER value, lua_State* L)
{
if (value == -1)
{
lua_pushnil(L);
}
else
{
lua_pushboolean(L, true);
}
}
inline void syscalls_ReturnStringOrNil(LUA_INTEGER cond, const char* value, lua_State* L)
{
if (cond == -1)
{
lua_pushnil(L);
}
else
{
lua_pushstring(L, value);
}
}
#endif // __SYSCALLS_H__

2
src/systemColors.c
View File

@@ -100,7 +100,7 @@ static int syscalls_newindexSystemColors(lua_State* L)
{
t->grab_bar_button = val;
}
else if (strcmp("grab_button_text", index) == 0)
else if (strcmp("grabButtonText", index) == 0)
{
t->grab_button_text = val;
}

4
src/systemColors.h
View File

@@ -1,9 +1,7 @@
#ifndef _SYSCALLS_SYSTEM_COLORS_H_
#define _SYSCALLS_SYSTEM_COLORS_H_
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include "syscalls.h"
#include <sys/ksys.h>
#define syscalls_SystemColors_metatable_name "syscalls SystemColors metatable"

27
tests/SystemColors.lua
View File

@@ -4,6 +4,29 @@ local SystemColors = syscalls.GetSystemColors()
print(SystemColors)
for i, v in pairs(SystemColors) do
print(i, v)
function DEC_HEX(IN)
local B, K, OUT, I, D = 16, "0123456789ABCDEF", "", 0
while IN > 0 do
I = I + 1
IN, D = math.floor(IN / B), math.mod(IN, B) + 1
OUT = string.sub(K, D, D) .. OUT
end
return OUT
end
local keys = {
"frameArea",
"workArea",
"grabBar",
"grabBarButton",
"grabButtonText",
"grabText",
"workButton",
"workButtonText",
"workGraph",
"workText"
}
for _, v in pairs(keys) do
print(v .. ':', "#" .. DEC_HEX(SystemColors[v]))
end

24
tests/helloWorld.lua Normal file
View File

@@ -0,0 +1,24 @@
local syscalls = require("syscalls")
local function Redraw()
syscalls.StartRedraw()
syscalls.CreateWidnow(100)
syscalls.EndRedraw()
end
local exit = false
while not exit do
local event = syscalls.WaitEvent()
if event == syscalls.Redraw then
Redraw()
elseif event == syscalls.Button then
if syscalls.GetButton() == syscalls.buttons.close then
exit = true
end
end
end
print("End")

11
tests/libraryStruct.lua
View File

@@ -1,3 +1,10 @@
for i, v in pairs(require("syscalls")) do
print(i, v)
local function tree(t)
for i, v in pairs(t) do
if type(v) == "table" then
tree(v)
end
end
end
tree(require("syscalls"))