Merge pull request #6 from Lethja/compact

Author: Lethja

.github/workflows/LuaWatcom.yml

@@ -16,6 +16,10 @@ jobs:
         submodules: recursive
         fetch-depth: 0
 
+    - name: Patch Lua Source Code for Open Watcom
+      run: |
+        patch -p0 -i lua.pat
+
     - name: Build Lua for DOS 16-bit
       run: |
         export INCLUDE=$WATCOM/h

README.md

@@ -74,11 +74,9 @@ To build Lua with Open Watcom you will need the following:
    * Download the Lua 5.4.x sources tarballs from https://lua.org/ftp/, extract them and copy all files in `src` to `Lua`
 2) Patch the source code for Watcom (optional):
 
-   | GNU Patch                           | DifPat                             |
-   |-------------------------------------|------------------------------------|
-   | `patch lua/luaconf.h luaconf.pat`   | `pat luaconf.pat lua\luaconf.h`    |
-   | `patch lua/lopcodes.h lopcodes.pat` | `pat lopcodes.pat lua\lopcodes.h ` |
-   | `patch lua/lutf8lib.c lutf8lib.pat` | `pat lutf8lib.pat lua\lutf8lib.c`  |
+   | GNU Patch              | DifPat          |
+   |------------------------|-----------------|
+   | `patch -p0 -i lua.pat` | `pat lua.pat .` |
    > If no patching program is available mimic the changes in each `.pat` file manually. 
    > Patch changes are minimal and only serve to silence Watcom compiler warnings
 

lopcodes.pat

@@ -0,0 +1,71 @@
+--- lua/lopcodes.h
++++ lua/lopcodes.h
+@@ -65,10 +65,16 @@ enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
+ */
+ 
+ /* Check whether type 'int' has at least 'b' bits ('b' < 32) */
++#if defined(_M_I86)
++/* Hardcoded due to bugs in some 16-bit compilers */
++#define L_INTHASBITS(b)     ((0xFFFF >> ((b) - 1)) >= 1)
++#else
+ #define L_INTHASBITS(b)		((UINT_MAX >> ((b) - 1)) >= 1)
++#endif
+ 
+-
+-#if L_INTHASBITS(SIZE_Bx)
++#if defined(_M_I86)
++#define MAXARG_Bx	0xFFFF
++#elif L_INTHASBITS(SIZE_Bx)
+ #define MAXARG_Bx	((1<<SIZE_Bx)-1)
+ #else
+ #define MAXARG_Bx	MAX_INT
+@@ -76,14 +82,17 @@ enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
+ 
+ #define OFFSET_sBx	(MAXARG_Bx>>1)         /* 'sBx' is signed */
+ 
+-
+-#if L_INTHASBITS(SIZE_Ax)
++#if defined(_M_I86)
++#define MAXARG_Ax	0xFFFF
++#elif L_INTHASBITS(SIZE_Ax)
+ #define MAXARG_Ax	((1<<SIZE_Ax)-1)
+ #else
+ #define MAXARG_Ax	MAX_INT
+ #endif
+ 
+-#if L_INTHASBITS(SIZE_sJ)
++#if defined(_M_I86)
++#define MAXARG_sJ	0xFFFF
++#elif L_INTHASBITS(SIZE_sJ)
+ #define MAXARG_sJ	((1 << SIZE_sJ) - 1)
+ #else
+ #define MAXARG_sJ	MAX_INT
+--- lua/luaconf.h
++++ lua/luaconf.h
+@@ -79,7 +79,12 @@
+ /*
+ @@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
+ */
++#if defined(_M_I86)
++/* Hardcoded due to bugs in some 16-bit compilers */
++#define LUAI_IS32INT 0
++#else
+ #define LUAI_IS32INT	((UINT_MAX >> 30) >= 3)
++#endif
+ 
+ /* }================================================================== */
+ 
+
+--- lua/lutf8lib.c
++++ lua/lutf8lib.c
+@@ -31,7 +31,9 @@
+ /*
+ ** Integer type for decoded UTF-8 values; MAXUTF needs 31 bits.
+ */
+-#if (UINT_MAX >> 30) >= 1
++#if defined(_M_I86)
++typedef unsigned long utfint;
++#elif (UINT_MAX >> 30) >= 1
+ typedef unsigned int utfint;
+ #else
+ typedef unsigned long utfint;