Merge pull request #1 from jerch/upgrade_22

node 22 & 24 support

Author: jerch

README.md

@@ -1,12 +1,16 @@
 Run inline C code on the fly.
 
-Tested on:
+Version 0.0.9 tested on:
 
 - Linux with nodejs 6.11 64 bit, (gcc 4.8 on x86, gcc 6.3 on ARM)
 - Windows 10 with nodejs 6.11 32 and 64 bit
 - OSX 10.10 with nodejs 6.10, llvm 3.5 (Cave! TCC is not fully
 ported to OSX, support is experimental!)
 
+Version 0.1.0 tested on:
+
+- Linux with nodejs 22 & 24 (x86 only)
+
 ### Features
 
 - inline C functions in JS

demos/sdl.js

@@ -6,6 +6,7 @@
 'use strict';
 const C_CODE = `
 #include <stdio.h>
+#define SDL_DISABLE_IMMINTRIN_H
 #include <SDL2/SDL.h>
 
 typedef void (*Callback)(int, int, int);
@@ -19,7 +20,7 @@ void run_sdl(int width, int height) {
     SDL_Window* window = NULL;
     SDL_Surface* screenSurface = NULL;
     if(SDL_Init(SDL_INIT_VIDEO) < 0 ) {
-        printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
+        printf("SDL could not initialize! SDL_Error: %s\\n", SDL_GetError());
         return;
     }
     window = SDL_CreateWindow("SDL Example",
@@ -28,7 +29,7 @@ void run_sdl(int width, int height) {
                               width, height,
                               SDL_WINDOW_SHOWN);
     if(!window) {
-        printf("Window could not be created! SDL_Error: %s\n", SDL_GetError());
+        printf("Window could not be created! SDL_Error: %s\\n", SDL_GetError());
         return;
     }
     screenSurface = SDL_GetWindowSurface(window);

doc/api.md

@@ -7,7 +7,7 @@ With this module it is possible to declare inline C code in nodejs
 and run it on the fly. This is possible due to the fascinating
 Tiny C Compiler originally made by Fabrice Bellard.
 
-**Requires**: <code>module:node-gyp</code>, <code>module:ffi</code>, <code>module:ref</code>  
+**Requires**: <code>module:node-gyp</code>, <code>module:@napi-ffi/ffi-napi</code>, <code>module:@napi-ffi/ref-napi</code>  
 **Note**: The module is still alpha, interfaces are still likely to change a lot.  
 **Example**  
 ```js
@@ -111,7 +111,7 @@ let state1 = Tcc();
 ...
 state1.compile('...') && state1.relocate();  // finished with state1
 
-let state2 = Tcc();  // state1 got corrupted but we are with it anyways
+let state2 = Tcc();  // state1 got corrupted but we are done with it anyways
 ...
 state2.compile('...') && state2.relocate();  // finished with state2
 
@@ -499,7 +499,7 @@ It adds the following types:
 | ulonglong | unsigned long long |
 
 Furthermore it includes `<stddef.h>`, `<stdint.h>` and `<stdbool.h>`.
-If the module `ref-wchar` is installed, `WCString` is typedef'd as
+If the module `ref-wchar-napi` is installed, `WCString` is typedef'd as
 `wchar_t` pointer.
 
 **Kind**: instance method of [<code>CodeGenerator</code>](#module_node-tinycc.CodeGenerator)  
@@ -563,7 +563,7 @@ corresponding type.
 Helper function for easy wide string creation.
 
 **Kind**: static method of [<code>node-tinycc</code>](#module_node-tinycc)  
-**Note**: The function is only exported, if the module `ref-wchar` is installed.  
+**Note**: The function is only exported, if the module `ref-wchar-napi` is installed.  
 
 | Param | Type |
 | --- | --- |
@@ -577,7 +577,7 @@ This is useful when writing C source code strings directly in Javascript.
 The function escapes the UTF-8 input to the appropriate wchar_t type.
 
 **Kind**: static method of [<code>node-tinycc</code>](#module_node-tinycc)  
-**Note**: The function is only exported, if the module `ref-wchar` is installed.  
+**Note**: The function is only exported, if the module `ref-wchar-napi` is installed.  
 
 | Param | Type |
 | --- | --- |
@@ -615,7 +615,7 @@ until we got the real C symbol pointer.
 
 <a name="module_node-tinycc.c_callable"></a>
 
-### tcc.c_callable(restype, name, args, f) ⇒ <code>Declaration</code>
+### tcc.c\_callable(restype, name, args, f) ⇒ <code>Declaration</code>
 Convenvient declaration function to import a function symbol from JS to C code.
 
 The function creates a function pointer declaration in C. After
@@ -641,7 +641,7 @@ gen.addDeclaration(decl);
 
 <a name="module_node-tinycc.c_function"></a>
 
-### tcc.c_function(restype, name, args, code) ⇒ <code>func</code>
+### tcc.c\_function(restype, name, args, code) ⇒ <code>func</code>
 Convenient declaration function to create a C function that is usable from Javascript.
 
 The Javascript code:
@@ -682,10 +682,10 @@ console.log(add(23, 42));  // use it
 
 <a name="module_node-tinycc.c_struct"></a>
 
-### tcc.c_struct(name, structType) ⇒ <code>StructType</code>
+### tcc.c\_struct(name, structType) ⇒ <code>StructType</code>
 Convenient declaration function to declare a struct type usable in C and Javascript.
 
-This function extracts the field names and types of a StructType (module `ref-struct`)
+This function extracts the field names and types of a StructType (module `ref-struct-napi`)
 to create a struct declaration (forward section) and definition for C (code section).
 A field type is resolved recursively to catch complicated type mixtures that
 can easily be build with  StructTypes, ArrayTypes and pointer types
@@ -695,7 +695,7 @@ struct type by `struct name` in C. The struct type can be used at any point wher
 a `ref.types` type is needed, e.g. as function parameter or return type.
 Usage example:
 ```js
-const StructType = require('ref-struct');
+const StructType = require('ref-struct-napi');
 let gen = tcc.CodeGenerator();
 let S = tcc.c_struct('S', StructType({a: 'int', b: 'char*'}));
 addDeclaration(S);

index.js

@@ -63,14 +63,14 @@
 
 'use strict';
 
-const ffi = require('ffi');
-const ref = require('ref');
+const ffi = require('@napi-ffi/ffi-napi');
+const ref = require('@napi-ffi/ref-napi');
 const path = require('path');
 
 // optional wchar_t support
 let wchar_t = null;
 try {
-  wchar_t = require('ref-wchar');
+  wchar_t = require('ref-wchar-napi');
   const Iconv = require('iconv').Iconv;
   let encoding = ((process.platform === 'win32') ? 'UTF-16' : 'UTF-32') + ref.endianness;
   const wchar_set = new Iconv('UTF-8', encoding).convert;
@@ -113,7 +113,7 @@ try {
    * ```
    * @param {string} s
    * @return {string}
-   * @note The function is only exported, if the module `ref-wchar` is installed.
+   * @note The function is only exported, if the module `ref-wchar-napi` is installed.
    */
   module.exports.escapeWchar = function(s) {
     /* istanbul ignore next */
@@ -392,6 +392,7 @@ function DefaultTcc() {
   } else {
     state = new Tcc();
     state.setLibPath(path.join(__dirname, 'posix', 'lib', 'tcc'));
+    state.addLibraryPath(path.join(__dirname, 'posix', 'lib', 'tcc'));
     state.addIncludePath(path.join(__dirname, 'posix', 'lib', 'tcc', 'include'));
     state.addIncludePath(path.join(__dirname, 'posix', 'include'));
   }
@@ -564,7 +565,7 @@ function CodeGenerator() {
  * | ulonglong | unsigned long long |
  *
  * Furthermore it includes `<stddef.h>`, `<stdint.h>` and `<stdbool.h>`.
- * If the module `ref-wchar` is installed, `WCString` is typedef'd as
+ * If the module `ref-wchar-napi` is installed, `WCString` is typedef'd as
  * `wchar_t` pointer.
  * @method module:node-tinycc.CodeGenerator#loadBasicTypes
  */
@@ -862,7 +863,7 @@ function c_function(restype, name, args, code) {
 /**
  * Convenient declaration function to declare a struct type usable in C and Javascript.
  *
- * This function extracts the field names and types of a StructType (module `ref-struct`)
+ * This function extracts the field names and types of a StructType (module `ref-struct-napi`)
  * to create a struct declaration (forward section) and definition for C (code section).
  * A field type is resolved recursively to catch complicated type mixtures that
  * can easily be build with  StructTypes, ArrayTypes and pointer types
@@ -872,7 +873,7 @@ function c_function(restype, name, args, code) {
  * a `ref.types` type is needed, e.g. as function parameter or return type.
  * Usage example:
  * ```js
- * const StructType = require('ref-struct');
+ * const StructType = require('ref-struct-napi');
  * let gen = tcc.CodeGenerator();
  * let S = tcc.c_struct('S', StructType({a: 'int', b: 'char*'}));
  * addDeclaration(S);

install_tcc.sh

@@ -2,7 +2,9 @@
 rm -rf ./tinycc
 rm -rf ./lib_build
 #git clone git://repo.or.cz/tinycc.git
-git clone https://github.com/andreiw/tinycc.git
+#git clone https://github.com/andreiw/tinycc.git
+git clone git@github.com:TinyCC/tinycc.git
+# tested with commit 4fccaf61241a5eb72b0777b3a44bd7abbea48604
 mkdir lib_build
 cd lib_build
 ../tinycc/configure --prefix=../posix --extra-cflags="-fPIC"