Merge branch 'zephyr' of https://git.moddable.tech:3000/git/moddable into zephyr

Author: mkellner

modules/piu/MC/piuView.c

@@ -1164,7 +1164,7 @@ void PiuViewUpdateStep(PiuView* self, PocoCoordinate x, PocoCoordinate y, PocoDi
 			result = PocoDrawingEnd(poco, poco->pixels, poco->pixelsLength, PiuViewDisplayReceiver, self);
 #else
 			xsCallFunction4((*self)->_begin, xsReference((*self)->screen), xsInteger(poco->x), xsInteger(poco->y), xsInteger(poco->w), xsInteger(poco->h));
-			result = PocoDrawingEnd(poco, poco->pixels, poco->pixelsLength, PiuViewDisplayReceiver, self);
+			result = PocoDrawingEnd(poco, poco->pixels, poco->pixelsLength, PiuViewReceiver, self);
 #endif
 		}
 		if (result) goto fail;

tools/test262/_262.c

@@ -91,6 +91,19 @@
 	#define fxUnlockMutex(MUTEX) LeaveCriticalSection(MUTEX)
 	#define fxSleepCondition(CONDITION,MUTEX) SleepConditionVariableCS(CONDITION,MUTEX,INFINITE)
 	#define fxWakeCondition(CONDITION) WakeConditionVariable(CONDITION)
+#elif _ZEPHYR
+
+	typedef uint32_t txCondition;
+	typedef void *txMutex;
+	typedef void *txThread;
+	#define fxCreateCondition(CONDITION)
+	#define fxSleepCondition(CONDITION,MUTEX)
+	#define fxWakeCondition(CONDITION)
+
+	#define fxCreateMutex(MUTEX)
+	#define fxDeleteMutex(MUTEX)
+	#define fxLockMutex(MUTEX)
+	#define fxUnlockMutex(MUTEX)
 #else
 	#include <dirent.h>
 	#include <pthread.h>
@@ -381,7 +394,7 @@ void _262_agent_broadcast(txMachine* the)
 		gxAgentCluster.dataValue = xsToInteger(xsArg(1));
 #if mxWindows
 	WakeAllConditionVariable(&(gxAgentCluster.dataCondition));
-#elif PICO_BUILD
+#elif PICO_BUILD || _ZEPHYR
 #else
 	pthread_cond_broadcast(&(gxAgentCluster.dataCondition));
 #endif
@@ -468,7 +481,7 @@ void _262_agent_sleep(txMachine* the)
 	xsIntegerValue delay = xsToInteger(xsArg(0));
 #ifdef mxUseFreeRTOSTasks
 	vTaskDelay(pdMS_TO_TICKS(delay));
-#elif PICO_BUILD
+#elif PICO_BUILD || _ZEPHYR
 	modDelayMilliseconds(delay);
 #elif mxWindows
 	Sleep(delay);
@@ -501,7 +514,7 @@ void _262_agent_start(txMachine* the)
 	xTaskCreate(_262_agent_start_aux, "agent", kStack, agent, 8, &(agent->thread));
 #elif mxWindows
 	agent->thread = (HANDLE)_beginthreadex(NULL, 0, _262_agent_start_aux, agent, 0, NULL);
-#elif PICO_BUILD
+#elif PICO_BUILD || _ZEPHYR
 	_262_agent_start_aux(agent);
 #else	
     pthread_create(&(agent->thread), NULL, &_262_agent_start_aux, agent);
@@ -588,7 +601,7 @@ void _262_agent_stop(txMachine* the)
 				#if mxWindows
 					WaitForSingleObject(agent->thread, INFINITE);
 					CloseHandle(agent->thread);
-				#elif PICO_BUILD
+				#elif PICO_BUILD || _ZEPHYR
 				#else
 					pthread_join(agent->thread, NULL);
 				#endif

tools/test262/manifest.json

@@ -75,6 +75,7 @@
 		"esp32/moddable_six_cdc": {
 			"build": {
 				"ESP32_SUBCLASS": "esp32s3",
+				"EXPECTED_ESP_IDF": "v5.5.1",
 				"USE_USB": "2",
 				"SDKCONFIGPATH": "$(MODDABLE)/build/devices/esp32/targets/moddable_six_cdc/sdkconfig"
 			},
@@ -153,6 +154,22 @@
 					"$(MODULES)/base/timer/win/*"
 				]
 			}
+		},
+		"zephyr": {
+			"build": {
+				"MAKE_FRAGMENT": "$(MODDABLE)/build/devices/zephyr/config/CMakeLists.txt",
+				"ZEPHYR_BOARD": "$(SUBPLATFORM)"
+			},
+			"defines": {
+				"XS_TEST": 1
+			},
+			"modules": {
+				"*": [
+					"$(MODULES)/base/timer/*",
+					"$(MODULES)/base/timer/mc/*",
+					"$(MODULES)/files/resource/Resource"
+				]
+			}
 		}
 	}
 }

xs/platforms/zephyr/xsHost.c

@@ -762,21 +762,17 @@ uint32_t espRead32be(const void *addr)
 	return (result << 24) | ((result & 0xff00) << 8)  | ((result >> 8) & 0xff00) | (result >> 24);
 }
 
-void undefinedFail(const char *what) {
+static void undefinedFail(const char *what) {
 	char msg[64];
 	c_strcpy(msg, "unimplemented: ");
 	c_strcat(msg, what);
-	 modLog_transmit(msg);
+	modLog_transmit(msg);
 }
 
 void vSemaphoreDelete() {undefinedFail("vSemaphoreDelete"); }
 void xSemaphoreGive() {undefinedFail("xSemaphoreGive"); }
 void xSemaphoreTake() {undefinedFail("xSemaphoreTake"); }
 
-void qsort(void *base, size_t nel, size_t width, int (*compar)(const void *, const void *)) { undefinedFail("qsort"); }
-void * bsearch(const void *key, const void *base, size_t nel, size_t width, int (*compar) (const void *, const void *)) {  undefinedFail("bsearch"); return NULL; }
-
-
 static int32_t gTimeZoneOffset = -8 * 60 * 60;      // Menlo Park
 static int16_t gDaylightSavings = 60 * 60;          // summer time
 

xs/platforms/zephyr/xsHost.h

@@ -220,6 +220,11 @@ typedef void (*modMessageDeliver)(void *the, void *refcon, uint8_t *message, uin
 #define MOD_TASKS (true)
 #define modTaskGetCurrent()		((uintptr_t)k_current_get());
 
+#if MODDEF_XS_TEST
+	extern uint8_t gSoftReset;
+	#define modSoftReset() gSoftReset = 1
+#endif
+
 /* 
 	c libraries
 */
@@ -232,11 +237,6 @@ typedef void (*modMessageDeliver)(void *the, void *refcon, uint8_t *message, uin
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef PATH_MAX
-#define PATH_MAX 128
-#endif
-
-
 #define c_tolower tolower
 #define c_toupper toupper
 
@@ -296,9 +296,13 @@ extern int gettimeofday(void *tv, void *unusedTZ);
 #define C_EINVAL EINVAL
 
 #ifndef PATH_MAX
-	#define PATH_MAX 128
+	#if MODDEF_XS_TEST
+		#define PATH_MAX (128)
+	#else
+		#define PATH_MAX (256)
+	#endif
 #endif
-#define C_PATH_MAX 128	// PATH_MAX
+#define C_PATH_MAX (PATH_MAX)
 
 /* MATH */
 #if 0	// fdlibm
@@ -420,9 +424,6 @@ extern int gettimeofday(void *tv, void *unusedTZ);
 #define c_tanh tanh
 #define c_trunc trunc
 
-void qsort(void *base, size_t nel, size_t width, int (*compar)(const void *, const void *));
-void *bsearch(const void *key, const void *base, size_t nel, size_t width, int (*compar)(const void *, const void*));
-
 #define _M_LN2        0.693147180559945309417
 #define M_E     2.7182818284590452354
 #define M_LOG2E     1.4426950408889634074

xs/platforms/zephyr/xsPlatform.c

@@ -211,6 +211,13 @@ void fx_putpi(txMachine *the, char separator, txBoolean trailingcrlf)
 
 void fxAbort(txMachine* the, int status)
 {
+#if MODDEF_XS_TEST
+	if (XS_DEBUGGER_EXIT == status) {
+		modSoftReset();
+		return;
+	}
+#endif
+
 	char *msg = (char*)fxAbortString(status);
 	char *reason = "";
 	if (XS_UNHANDLED_EXCEPTION_EXIT == status) {

xs/platforms/zephyr/xsPlatform.h

@@ -51,6 +51,7 @@
 #endif
 // #define mxUseFreeRTOSTasks	1
 // #define mxUseGCCAtomics		1		// undefine
+#define mxMisalignedSettersCrash 1
 
 #ifndef __XS6PLATFORMMINIMAL__