plt: mask flags instead of shifting

Otherwise we get a mess because dosemu2 adds its own flags in an unshifted manner. Also this will help to use the currently reserved flags easier.
stsp · Feb 4, 2025 · e0b68a8 · e0b68a8
1 parent 4b91cea
commit e0b68a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/djdev64/djdev64.c b/src/djdev64/djdev64.c
@@ -133,7 +133,7 @@ static void *emu_dlmopen(int handle, const char *filename, int flags,
     return NULL;
 }
 
-#define FLG_STATIC 1
+#define FLG_STATIC 0x40
 
 static int _djdev64_open(const char *path, const struct dj64_api *api,
     int api_ver, unsigned flags)

diff --git a/src/libc/dj64/plt.S b/src/libc/dj64/plt.S
@@ -48,8 +48,6 @@ SHM_EXCL = 2
 SHM_NEW_NS = 4
 SHM_NS = 8
 SHM_FLG_MASK = (SHM_NOEXEC | SHM_EXCL | SHM_NEW_NS | SHM_NS)
-/* leave bits 4 and 5 reserved */
-OPEN_FLG_SHIFT = 6
 
 .data
 
@@ -176,7 +174,7 @@ plt_init:
     movw shm_block + SHM_HANDLE, %di
     movw shm_block + SHM_HANDLE + 2, %si
     movzbl %fs:STUBINFO_FLAGS, %ecx
-    shrl $OPEN_FLG_SHIFT, %ecx
+    andl $~SHM_FLG_MASK, %ecx
     lcalll *__plt_open
     jc 2f
     movl %eax, __plt_handle