update misc includes

Author: twiddlingbits

notes-to-self.txt

@@ -98,6 +98,7 @@ malloc_unit_test() can't be called twice because cache mem tests don't clean up.
 some of the length printf tests are failing with optimization on.  Why? 
 
 ** existing API implementation improvements **
+add the ability to allow await to operate on a twr-wasm C function? (implement promises)
 bug in divcon -- long text doesn't wrap correctly.
 move twrConDrawSeq into jscon driver
 add buffer size to io_mbgets(stream1, buffer);

source/twr-c/draw2d.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include "twr-jsimports.h"
 #include "twr-crt.h"
 #include "twr-draw2d.h"
+#include <math.h> // ceil
 
 
 static twr_ioconsole_t *__std2d;
@@ -645,7 +645,7 @@ unsigned long d2d_getimagedatasize(double width, double height) {
     const double bytes_per_pixel = colors_per_pixel * bytes_per_color;
     double pixels = width * height;
     double bytes = pixels * bytes_per_pixel;
-    return (unsigned long)twrCeil(bytes);
+    return (unsigned long)ceil(bytes);
 }
 
 void d2d_imagedatatoc(struct d2d_draw_seq* ds, long id, void* buffer, unsigned long buffer_len) {

source/twr-c/io.c

@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include <locale.h>
-#include <twr-jsimports.h>
+#include <twr-jsimports.h>  // twrUnicodeCodePointToCodePage, twrCodePageToUnicodeCodePoint
 #include "twr-io.h"
 #include "twr-crt.h"  //twr_vcbprintf
 

source/twr-c/twr-draw2d.h

@@ -426,6 +426,8 @@ struct d2d_2d_matrix {
     double a, b, c, d, e, f;
 };
 
+__attribute__((import_name("twrConDrawSeq"))) void twrConDrawSeq(int jsid, struct d2d_draw_seq *);
+__attribute__((import_name("twrConLoadImage"))) bool twrConLoadImage(int jsid, const char* url, long id);
 
 struct d2d_draw_seq* d2d_start_draw_sequence(int flush_at_ins_count);
 struct d2d_draw_seq* d2d_start_draw_sequence_with_con(int flush_at_ins_count, twr_ioconsole_t * con);

source/twr-c/twr-io.h

@@ -84,6 +84,20 @@ struct IoConsole {
 #define TRS80_GRAPHIC_MARKER_MASK 0xFF00
 #define TRS80_GRAPHIC_CHAR_MASK 0x003F    // would be 0xC0 if we included the graphics marker bit 0x80
 
+__attribute__((import_name("twrConCharOut"))) void twrConCharOut(int jsid, int c, int code_page);   
+__attribute__((import_name("twrConPutStr"))) void twrConPutStr(int jsid, const char * str, int code_page);   
+__attribute__((import_name("twrConCharIn"))) int twrConCharIn(int jsid);
+__attribute__((import_name("twrConGetProp"))) int twrConGetProp(int jsid, const char* prop_name);
+__attribute__((import_name("twrConCls"))) void twrConCls(int jsid);
+__attribute__((import_name("twrConSetC32"))) void twrConSetC32(int jsid, int location, int c32);
+__attribute__((import_name("twrConSetReset"))) void twrConSetReset(int jsid, int x, int y, bool isset);
+__attribute__((import_name("twrConPoint"))) int twrConPoint(int jsid, int x, int y);
+__attribute__((import_name("twrConSetCursor"))) void twrConSetCursor(int jsid, int position);
+__attribute__((import_name("twrConSetColors"))) void twrConSetColors(int jsid, unsigned long foreground, unsigned long background);
+__attribute__((import_name("twrConSetRange"))) void twrConSetRange(int jsid, int * chars, int start, int len);
+__attribute__((import_name("twrConSetFocus"))) void twrConSetFocus(int jsid);
+__attribute__((import_name("twrConGetIDFromName"))) int twrConGetIDFromName(const char* name);
+
 /* ionull.c */
 twr_ioconsole_t* io_nullcon(void);
 

source/twr-c/twr-jsimports.h

@@ -2,7 +2,6 @@
 #define __TWR_JSIMPORTS_H__
 
 #include <time.h>
-#include "twr-draw2d.h"
 #include <twr-io.h>
 
 /* WebAssembly.ModuleImports (Javascript/TypeScript functions callable by C code) */
@@ -13,22 +12,6 @@ extern "C" {
 #endif
 
 
-__attribute__((import_name("twrConCharOut"))) void twrConCharOut(int jsid, int c, int code_page);   
-__attribute__((import_name("twrConPutStr"))) void twrConPutStr(int jsid, const char * str, int code_page);   
-__attribute__((import_name("twrConCharIn"))) int twrConCharIn(int jsid);
-__attribute__((import_name("twrConGetProp"))) int twrConGetProp(int jsid, const char* prop_name);
-__attribute__((import_name("twrConCls"))) void twrConCls(int jsid);
-__attribute__((import_name("twrConSetC32"))) void twrConSetC32(int jsid, int location, int c32);
-__attribute__((import_name("twrConSetReset"))) void twrConSetReset(int jsid, int x, int y, bool isset);
-__attribute__((import_name("twrConPoint"))) int twrConPoint(int jsid, int x, int y);
-__attribute__((import_name("twrConSetCursor"))) void twrConSetCursor(int jsid, int position);
-__attribute__((import_name("twrConSetColors"))) void twrConSetColors(int jsid, unsigned long foreground, unsigned long background);
-__attribute__((import_name("twrConSetRange"))) void twrConSetRange(int jsid, int * chars, int start, int len);
-__attribute__((import_name("twrConDrawSeq"))) void twrConDrawSeq(int jsid, struct d2d_draw_seq *);
-__attribute__((import_name("twrConLoadImage"))) bool twrConLoadImage(int jsid, const char* url, long id);
-__attribute__((import_name("twrConSetFocus"))) void twrConSetFocus(int jsid);
-__attribute__((import_name("twrConGetIDFromName"))) int twrConGetIDFromName(const char* name);
-
 __attribute__((import_name("twrTimeTmLocal"))) void twrTimeTmLocal(struct tm*, const time_t);
 __attribute__((import_name("twrUserLconv"))) void twrUserLconv(struct lconv *, int code_page);
 __attribute__((import_name("twrUserLanguage"))) char* twrUserLanguage(void);
@@ -58,18 +41,10 @@ __attribute__((import_name("twrSqrt"))) double twrSqrt(double arg);
 __attribute__((import_name("twrTrunc"))) double twrTrunc(double arg);
 
 __attribute__((import_name("twrAtod"))) double twrAtod(const char* str, int len);
-__attribute__((import_name("twrToFixed"))) double twrToFixed(char* buffer, int buffer_size, double value, int dec_digits);
-__attribute__((import_name("twrToExponential"))) void twrToExponential(char* buffer, int buffer_size, double value, int dec_digits);
 
-__attribute__((import_name("twrDtoa"))) void twrDtoa(char* buffer, int buffer_size, double value, int max_precision);
-__attribute__((import_name("twrFcvtS"))) int twrFcvtS(
-   char* buffer,
-   unsigned long sizeInBytes,  //size_t 
-   double value,
-   int fracpart_numdigits,
-   int *dec,
-   int *sign
-);
+// does not use locale information; it always uses . (a dot) as the decimal separator.
+// twr_localize_numeric_string() is available to convert buffer if needed
+__attribute__((import_name("twrDtoa"))) void twr_dtoa(char* buffer, int buffer_size, double value, int max_precision);
 
 #ifdef __cplusplus
 }

source/twr-stdclib/cvtfloat.c

@@ -5,38 +5,6 @@
 #include "twr-crt.h"
 #include "twr-jsimports.h"
 
-// does not use locale information; it always uses . (a dot) as the decimal separator.
-// twr_localize_numeric_string() is available to convert buffer if needed
-void twr_dtoa(char* buffer, int buffer_size, double value, int max_precision) {
-    twrDtoa(buffer, buffer_size, value, max_precision);
-}
-
-// does not use locale information; it always uses . (a dot) as the decimal separator.
-void twr_tofixed(char* buffer, int buffer_size, double value, int dec_digits) {
-    twrToFixed(buffer, buffer_size, value, dec_digits);
-}
-
-// does not use locale information; it always uses . (a dot) as the decimal separator.
-void twr_toexponential(char* buffer, int buffer_size, double value, int dec_digits) {
-    twrToExponential(buffer, buffer_size, value, dec_digits);
-}
-
-//The fcvt_s() function in C does not use locale information; it always uses . (a dot) as the decimal separator.
-int _fcvt_s(
-   char* buffer,
-   unsigned long sizeInBytes, //size_t
-   double value,
-   int fracpart_numdigits,
-   int *dec,
-   int *sign
-) {
-    return twrFcvtS(buffer, sizeInBytes, value, fracpart_numdigits, dec, sign);
-}
-
-/****************************************************************/
-/****************************************************************/
-/****************************************************************/
-
 // [whitespace] [sign] [digits] [.digits] [ {e | E }[sign]digits]
 // also allow (fortran style) d/D instead of e/E
 // use locale-specific decimal separators. 

source/twr-ts/twrlibmath.ts

@@ -61,7 +61,6 @@ export default class twrLibMath extends twrLibrary {
    twrFMod(callingMod:IWasmModule|twrWasmBase, x:number, y:number) {return x%y}
    twrPow(callingMod:IWasmModule|twrWasmBase, x:number, y:number ) {return Math.pow(x,y);}
 
-   // TODO!! remove unnecessary level of indirection in below functions
    twrAtod(callingMod:IWasmModule|twrWasmBase, ...p:[number, number]) {return this.atod(callingMod.wasmMem, ...p)}
    twrDtoa(callingMod:IWasmModule|twrWasmBase, ...p:[number, number, number, number]) {this.dtoa(callingMod.wasmMem, ...p)}
    twrToFixed(callingMod:IWasmModule|twrWasmBase, ...p:[number, number, number, number]) {this.toFixed(callingMod.wasmMem, ...p)}

source/twr-ts/twrlibrary.ts

@@ -10,15 +10,13 @@ import {twrEventQueueReceive} from "./twreventqueue.js"
 
 // fix example/lib/out and .gitignore so correct build artifacts are checked in  
 // add test cases for twr_timer_single_shot, twr_timer_repeat, and twr_timer_cancel
-// add the ability to allow await to operate on a twr-wasm C function? (implement promises)
 // resolve fact that libraries with interfaces are passed in the "io" option.  Eg Allow "libs" or other synonym.
 // current implementation has no libs: (akin to io:).  
-// remove twrXX names from math lib and unwind the layer of indirection
 // remove twrcondummy hack.  Search for TODO, there are multiple places needing fixing.  Possible solutions:
 //     (a) merge imports, 
 //     (b) require each function in interface in list each import correctly (either add isUnused or add dummy functions with exception)
 // changed conterm example to use debug -- either change back, or change index description
-// deal with twrConGetIDFromNameImpl
+// deal with twrConGetIDFromNameImpl.  Note that twr_register_callback and twrConGetIDFromNameImpl are added in two different places.  Unify?
 // change callingMod:IWasmModule|IWasmModuleAsync to IWasmBase ?
 // add IWasmBase instead of using twrWasmBase
 // add IWasmModuleBase ?

twr-wasm.code-workspace

@@ -100,7 +100,8 @@
          "uchar.h": "c",
          "type_traits": "c",
          "twr-ex.h": "c",
-         "twr-library.h": "c"
+         "twr-library.h": "c",
+         "twr-audio.h": "c"
       },
 		//"C_Cpp.default.compilerPath": "C:/msys64/ucrt64/bin/gcc.exe",
 		//"C_Cpp.default.compilerPath": "C:/msys64/ucrt64/bin/clang",