Merge remote-tracking branch 'jayrm/emscripten' into fbc-1.10

Conflicts: changelog.txt
Resolution: keep all changelog entries

Author: jayrm

changelog.txt

@@ -4,16 +4,23 @@ Version 1.10.1
 - rtlib: printf format specifier, use 'll' instead of 'I64' if building for ucrt or mingw-w64's stdio implementation (for newer gcc versions and c std)
 - gcc backend: use 'char' types for zstring instead of 'uint8' to avoid warnings in newer gcc 11+
 - release: update to build libffi 3.4.4 - this is needed to work with newer mingw-w64 based toolchains for gcc 11.x and up
+- emscripten/fbc: in debug version of fbc (__FB_DEBUG__<>0) allow wchar conversion on win32 host to allow building and testing of the test-suite 
 
 [added]
 - release: add recipes for building fbc distros using gcc-11.2 and gcc-12.2 Mingw-w64 project toolchains
 - release: add recipe for building fbc distros using winlibs-gcc-11.2/3/4 toolchain
+- fbc: '-fbgfx' command line option to link against correct libfbgfx variant, for platforms (emscripten) where it's not automatic due to missing objinfo support
 
 [fixed]
 - sf.net #982: Array descriptors emitted incorrectly in gcc backend
 - gas64: emit debug information for statics
 - gas64: handle #inf's and NaN's in float comparisons 
 - unable to set opengl scaling to 1 after initial screen mode - previously: logic error in the driver code prevented the scaling from being set to 1
+- emscripten: fbc created faulty static libraries (it called ar instead of emar)
+- fbc: emscripten: wstring was broken because sizeof(wstring) was 2 rather than 4
+- emscripten: non-graphical programs will now run under node.js. Use -x output.js to produce a .js rather than an .html
+- rtlib: emscripten: CURDIR and EXEPATH always returned ""
+- emscripten/fbc: -sASYNCIFY wasn't passed to emcc at link-time as needed by recent Emscripten
 
 
 Version 1.10.0

inc/SDL/SDL.bi

@@ -847,6 +847,7 @@ type SDL_Palette
 end type
 
 type SDL_PixelFormat
+#ifndef __FB_JS__
 	palette as SDL_Palette ptr
 	BitsPerPixel as Uint8
 	BytesPerPixel as Uint8
@@ -864,6 +865,27 @@ type SDL_PixelFormat
 	Amask as Uint32
 	colorkey as Uint32
 	alpha as Uint8
+#else
+	format as Uint32
+	palette as SDL_Palette ptr
+	BitsPerPixel as Uint8
+	BytesPerPixel as Uint8
+	padding(1) as Uint8
+	Rmask as Uint32
+	Gmask as Uint32
+	Bmask as Uint32
+	Amask as Uint32
+	Rloss as Uint8
+	Gloss as Uint8
+	Bloss as Uint8
+	Aloss as Uint8
+	Rshift as Uint8
+	Gshift as Uint8
+	Bshift as Uint8
+	Ashift as Uint8
+	refcount as long
+	next as SDL_PixelFormat ptr
+#endif
 end type
 
 type private_hwdata as private_hwdata_
@@ -874,6 +896,7 @@ type SDL_Surface
 	format as SDL_PixelFormat ptr
 	w as long
 	h as long
+#ifndef __FB_JS__
 	pitch as Uint16
 	pixels as any ptr
 	offset as long
@@ -883,9 +906,19 @@ type SDL_Surface
 	locked as Uint32
 	map as SDL_BlitMap ptr
 	format_version as ulong
+#else
+	pitch as long
+	pixels as any ptr
+	userdata as any ptr
+	locked as long
+	lock_data as any ptr
+	clip_rect as SDL_Rect
+	map as SDL_BlitMap ptr
+#endif
 	refcount as long
 end type
 
+#ifndef __FB_JS__
 const SDL_SWSURFACE = &h00000000
 const SDL_HWSURFACE = &h00000001
 const SDL_ASYNCBLIT = &h00000004
@@ -903,6 +936,23 @@ const SDL_RLEACCELOK = &h00002000
 const SDL_RLEACCEL = &h00004000
 const SDL_SRCALPHA = &h00010000
 const SDL_PREALLOC = &h01000000
+#else
+const SDL_SWSURFACE = &h00000000
+const SDL_SRCALPHA = &h00010000
+const SDL_SRCCOLORKEY = &h00020000
+const SDL_ANYFORMAT = &h00100000
+const SDL_HWPALETTE = &h00200000
+const SDL_DOUBLEBUF = &h00400000
+const SDL_FULLSCREEN = &h00800000
+const SDL_RESIZABLE = &h01000000
+const SDL_NOFRAME = &h02000000
+const SDL_OPENGL = &h04000000
+const SDL_HWSURFACE = &h08000001
+const SDL_ASYNCBLIT = &h08000000
+const SDL_RLEACCELOK = &h08000000
+const SDL_HWACCEL = &h08000000
+#endif
+
 #define SDL_MUSTLOCK(surface) (surface->offset orelse ((surface->flags and ((SDL_HWSURFACE or SDL_ASYNCBLIT) or SDL_RLEACCEL)) <> 0))
 type SDL_blit as function(byval src as SDL_Surface ptr, byval srcrect as SDL_Rect ptr, byval dst as SDL_Surface ptr, byval dstrect as SDL_Rect ptr) as long
 
@@ -1174,6 +1224,9 @@ enum
 	SDL_EVENT_COMPAT1 = &h7000
 	SDL_EVENT_COMPAT2
 	SDL_EVENT_COMPAT3
+	SDL_ACTIVEEVENT	= SDL_EVENT_COMPAT1
+	SDL_VIDEORESIZE	= SDL_EVENT_COMPAT2
+	SDL_VIDEOEXPOSE	= SDL_EVENT_COMPAT3
 	SDL_USEREVENT    = &h8000
 	SDL_LASTEVENT    = &hFFFF
 #endif
@@ -1240,17 +1293,19 @@ type SDL_MouseMotionEvent
 	state as Uint8
 	x as Uint16
 	y as Uint16
+	xrel as Sint16
+	yrel as Sint16
 #else
 	as Uint32 type
 	timestamp as Uint32
 	windowID as Uint32
 	which as Uint32
 	state as Uint32
-	x as Sint16
-	y as Sint16
+	x as Sint32
+	y as Sint32
+	xrel as Sint32
+	yrel as Sint32
 #endif
-	xrel as Sint16
-	yrel as Sint16
 end type
 
 type SDL_MouseButtonEvent
@@ -1270,8 +1325,8 @@ type SDL_MouseButtonEvent
 	state as Uint8
 	padding1 as Uint8
 	padding2 as Uint8
-	x as Sint16
-	y as Sint16
+	x as Sint32
+	y as Sint32
 #endif
 end type
 
@@ -1432,7 +1487,11 @@ const SDL_QUERY = -1
 const SDL_IGNORE = 0
 const SDL_DISABLE = 0
 const SDL_ENABLE = 1
+#ifndef __FB_JS__
 declare function SDL_EventState(byval type as Uint8, byval state as long) as Uint8
+#else
+'SDL_EventState doesn't exist
+#endif
 #define _SDL_loadso_h
 
 declare function SDL_LoadObject(byval sofile as const zstring ptr) as any ptr

lib/fb_rtlib.js

@@ -53,10 +53,13 @@ var __fb_rtlib =
 		{
 			if( this.term === null )
 			{
-				console.log(text);
+				// Under node.js write to stdout. console.log adds an extra newline
+				if( typeof process !== 'undefined' )
+					process.stdout.write(text);
+				else
+					console.log(text);
 				return;
 			}
-			
 			this.term.write('%c(' + this.fg_color + ',' + this.bg_color + ')' + text.replace('%(', '%%('));
 		},
 

lib/termlib_min.js

@@ -1434,7 +1434,7 @@ _makeTerm: function(rebuild) {
 			tr=document.createElement('tr');
 			td=document.createElement('td');
 			td.id=divPrefix+r;
-			td.style.height=td.style.minHeight=td.style.maxHeight=this.conf.rowHeight;
+			td.style.height=td.style.minHeight=td.style.maxHeight=this.conf.rowHeight+'px';
 			td.style.whiteSpace='nowrap';
 			td.className=this.conf.fontClass;
 			td.innerHTML=rstr;
@@ -2760,4 +2760,4 @@ var TermGlobals = Terminal.prototype.globals;
 var termKey = Terminal.prototype.globals.termKey;
 var termDomKeyRef = Terminal.prototype.globals.termDomKeyRef;
 
-// eof
+// eof

src/compiler/ast-node-bop.bas

@@ -869,7 +869,7 @@ function astNewBOP _
 				if( litsym <> NULL ) then
 					'' ok to convert at compile-time?
 					if( (typeGetDtAndPtrOnly( ldtype ) = typeGetDtAndPtrOnly( rdtype )) or _
-					    env.wchar_doconv ) then
+					    (env.wcharconv <> FB_WCHARCONV_NEVER) ) then
 						return hWstrLiteralConcat( l, r )
 					end if
 				end if

src/compiler/fb.bas

@@ -217,7 +217,7 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _
 	), _
 	( _
 		@"js", _
-		FB_DATATYPE_USHORT, _   '' wchar
+		FB_DATATYPE_ULONG, _   '' wchar
 		FB_FUNCMODE_CDECL, _
 		FB_FUNCMODE_STDCALL_MS, _
 		0   or FB_TARGETOPT_UNIX _
@@ -474,7 +474,22 @@ sub fbInit _
 	irInit( )
 
 	'' After symbInit(), we can use typeGetSize()
-	env.wchar_doconv = (sizeof( wstring ) = typeGetSize( env.target.wchar ))
+	if( sizeof( wstring ) = typeGetSize( env.target.wchar ) ) then
+		env.wcharconv = FB_WCHARCONV_ALWAYS
+	else
+		env.wcharconv = FB_WCHARCONV_NEVER
+	end if
+
+#if ( __FB_DEBUG__ <> 0 ) andalso defined( __FB_WIN32__ )
+	select case( env.clopt.target )
+	case FB_COMPTARGET_JS
+		'' !!!TODO!!! - FB_WCHARCONV_WARNING needs to show warnings on conversions
+		'' !!!TODO!!! - FB_WCHARCONV_WARNING probably not correct to force a value
+		''              but setting it helps with development and testing
+		''              where sizeof(host-wstring) <> sizeof(target-wstring)
+		env.wcharconv = FB_WCHARCONV_WARNING
+	end select
+#endif
 
 	hashInit( @env.filenamehash, FB_INITINCFILES )
 	hashInit( @env.incfilehash, FB_INITINCFILES, FALSE )
@@ -564,7 +579,7 @@ sub fbGlobalInit()
 	env.clopt.gosubsetjmp   = FALSE
 	env.clopt.export        = FALSE
 	env.clopt.multithreaded = FALSE
-	env.clopt.gfx           = FALSE
+	env.clopt.fbgfx         = FALSE
 	env.clopt.pic           = FALSE
 	env.clopt.msbitfields   = FALSE
 	env.clopt.stacksize     = 0 '' default will be set by fbSetOption() called from hParseArgs()
@@ -679,8 +694,8 @@ sub fbSetOption( byval opt as integer, byval value as integer )
 		env.clopt.msbitfields = value
 	case FB_COMPOPT_MULTITHREADED
 		env.clopt.multithreaded = value
-	case FB_COMPOPT_GFX
-		env.clopt.gfx = value
+	case FB_COMPOPT_FBGFX
+		env.clopt.fbgfx = value
 	case FB_COMPOPT_PIC
 		env.clopt.pic = value
 	case FB_COMPOPT_STACKSIZE
@@ -790,8 +805,8 @@ function fbGetOption( byval opt as integer ) as integer
 		function = env.clopt.msbitfields
 	case FB_COMPOPT_MULTITHREADED
 		function = env.clopt.multithreaded
-	case FB_COMPOPT_GFX
-		function = env.clopt.gfx
+	case FB_COMPOPT_FBGFX
+		function = env.clopt.fbgfx
 	case FB_COMPOPT_PIC
 		function = env.clopt.pic
 	case FB_COMPOPT_STACKSIZE
@@ -1100,13 +1115,13 @@ sub fbAddLib(byval libname as zstring ptr)
 		'' multithreading may have been set after fbgfx.bi was
 		'' included, and we can't have both libs passed to the
 		'' linker. We can end up linking to the non-threaded
-		'' version of fbgfx when we would expect the mt versoin
+		'' version of fbgfx when we would expect the mt version,
 		'' and the linker won't complain even when both versions
 		'' are passed.
 
-		'' Set the -gfx option to link to the gfx library
+		'' Set the -fbgfx option to link to the gfx library
 		'' and the lib will be added in hAddDefaultLibs()
-		fbSetOption( FB_COMPOPT_GFX, TRUE )
+		fbSetOption( FB_COMPOPT_FBGFX, TRUE )
 
 		exit sub
 	end if
@@ -1195,8 +1210,8 @@ private sub hEmitObjinfo( )
 		hAppendFbctinf( objinfoEncode( OBJINFO_MT ) )
 	end if
 
-	'' -gfx
-	if( env.clopt.gfx ) then
+	'' -fbgfx
+	if( env.clopt.fbgfx ) then
 		hAppendFbctinf( objinfoEncode( OBJINFO_GFX ) )
 	end if
 

src/compiler/fb.bi

@@ -104,7 +104,7 @@ enum FB_COMPOPT
 	FB_COMPOPT_EXPORT               '' boolean: export all symbols declared as EXPORT?
 	FB_COMPOPT_MSBITFIELDS          '' boolean: use M$'s bitfields packing?
 	FB_COMPOPT_MULTITHREADED        '' boolean: -mt
-	FB_COMPOPT_GFX                  '' boolean: -gfx (whether gfxlib should be linked)
+	FB_COMPOPT_FBGFX                '' boolean: -fbgfx (whether libfbgfx should be linked)
 	FB_COMPOPT_PIC                  '' boolean: -pic (whether to use position-independent code)
 	FB_COMPOPT_STACKSIZE            '' integer
 	FB_COMPOPT_OBJINFO              '' boolean: write/read .fbctinf sections etc.?
@@ -313,7 +313,7 @@ type FBCMMLINEOPT
 	export          as integer              '' export all symbols declared as EXPORT (default = true)
 	msbitfields     as integer              '' use M$'s bitfields packing
 	multithreaded   as integer              '' link against thread-safe runtime library (default = false)
-	gfx             as integer              '' Link against gfx library (default = false)
+	fbgfx           as integer              '' Link against gfx library (default = false)
 	pic             as integer              '' Whether to use position-independent code (default = false)
 	stacksize       as integer
 	objinfo         as integer