Feature/objects and functions

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "lib/zlib"]
-	path = lib/zlib
-	url = https://github.com/madler/zlib.git
-[submodule "lib/lzma"]
-	path = lib/lzma
-	url = https://github.com/SWFRecomp/lzma.git
 [submodule "lib/c-hashmap"]
 	path = lib/c-hashmap
 	url = https://github.com/Mashpoe/c-hashmap.git
@@ -13,3 +7,12 @@
 [submodule "lib/o1heap"]
 	path = lib/o1heap
 	url = https://github.com/pavel-kirienko/o1heap.git
+[submodule "lib/rbtree"]
+	path = lib/rbtree
+	url = https://github.com/SWFRecomp/rb-tree.git
+[submodule "lib/libtess2"]
+	path = lib/libtess2
+	url = https://github.com/SWFRecomp/libtess2.git
+[submodule "lib/minimp3"]
+	path = lib/minimp3
+	url = https://github.com/lieff/minimp3.git

CMakeLists.txt

@@ -14,16 +14,24 @@ option(NO_GRAPHICS "Build without graphics support (console-only)" OFF)
 # Core sources (always included)
 set(CORE_SOURCES
     ${PROJECT_SOURCE_DIR}/src/actionmodern/action.c
+    ${PROJECT_SOURCE_DIR}/src/actionmodern/objects.c
+    ${PROJECT_SOURCE_DIR}/src/actionmodern/free_thread.c
     ${PROJECT_SOURCE_DIR}/src/actionmodern/variables.c
     ${PROJECT_SOURCE_DIR}/src/memory/heap.c
+    ${PROJECT_SOURCE_DIR}/src/apis/rbtree/rbtree.c
+    ${PROJECT_SOURCE_DIR}/src/apis/swap-vector/swap_vector.c
     ${PROJECT_SOURCE_DIR}/src/utils.c
 
-    ${PROJECT_SOURCE_DIR}/lib/o1heap/o1heap/o1heap.c
-
-    # Compile hashmap file directly to avoid undefined symbols on Linux
+    # Compile libs directly to avoid undefined symbols on Linux
     ${PROJECT_SOURCE_DIR}/lib/c-hashmap/map.c
+    ${PROJECT_SOURCE_DIR}/lib/rbtree/rb_tree.c
+    ${PROJECT_SOURCE_DIR}/lib/o1heap/o1heap/o1heap.c
 )
 
+file(GLOB_RECURSE RUNTIME_API_SOURCES ${PROJECT_SOURCE_DIR}/src/actionmodern/runtime_api/*.c)
+
+
+
 if(NO_GRAPHICS)
     # Console-only mode
     message(STATUS "Building in NO_GRAPHICS mode (console-only)")
@@ -33,8 +41,6 @@ if(NO_GRAPHICS)
         ${PROJECT_SOURCE_DIR}/src/libswf/swf_core.c
         ${PROJECT_SOURCE_DIR}/src/libswf/tag_stubs.c
     )
-
-    set(SOURCES ${CORE_SOURCES} ${SWF_SOURCES})
 else()
     # Full graphics mode
     message(STATUS "Building in full graphics mode")
@@ -43,36 +49,36 @@ else()
         ${PROJECT_SOURCE_DIR}/src/libswf/swf.c
         ${PROJECT_SOURCE_DIR}/src/libswf/tag.c
         ${PROJECT_SOURCE_DIR}/src/flashbang/flashbang.c
+        ${PROJECT_SOURCE_DIR}/src/flashbang/triangulation.c
     )
-
-    set(SOURCES ${CORE_SOURCES} ${SWF_SOURCES})
 endif()
 
+set(SOURCES ${CORE_SOURCES} ${SWF_SOURCES} ${RUNTIME_API_SOURCES})
+
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 if (WIN32)
-target_compile_options(${PROJECT_NAME} PRIVATE)
+    target_compile_options(${PROJECT_NAME} PRIVATE)
 else()
-target_compile_options(${PROJECT_NAME} PRIVATE -Wno-format-truncation)
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wno-format-truncation)
 endif()
 
 set(RENAME_ZCONF OFF)
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/lib/zlib)
-add_subdirectory(${PROJECT_SOURCE_DIR}/lib/lzma)
+add_subdirectory(${PROJECT_SOURCE_DIR}/lib/libtess2)
 
 if(NOT NO_GRAPHICS)
     add_subdirectory(${PROJECT_SOURCE_DIR}/lib/SDL3)
 
     target_link_libraries(${PROJECT_NAME} PUBLIC
-        zlibstatic
-        lzma
+        libtess2
         SDL3::SDL3
+        $<$<PLATFORM_ID:Linux>:m>
     )
 else()
     target_link_libraries(${PROJECT_NAME} PUBLIC
-        zlibstatic
-        lzma
+        libtess2
+        $<$<PLATFORM_ID:Linux>:m>
     )
 endif()
 
@@ -85,15 +91,18 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_SOURCE_DIR}/include/apis
     ${PROJECT_SOURCE_DIR}/include/actionmodern
+    ${PROJECT_SOURCE_DIR}/include/actionmodern/runtime_api
     ${PROJECT_SOURCE_DIR}/include/libswf
     ${PROJECT_SOURCE_DIR}/include/flashbang
     ${PROJECT_SOURCE_DIR}/include/memory
+    ${PROJECT_SOURCE_DIR}/lib/libtess2/Include
+    ${PROJECT_SOURCE_DIR}/lib/minimp3
     ${PROJECT_SOURCE_DIR}/lib/c-hashmap
-    ${PROJECT_SOURCE_DIR}/lib/SDL3/include
+    ${PROJECT_SOURCE_DIR}/lib/rbtree
     ${PROJECT_SOURCE_DIR}/lib/o1heap/o1heap
-    zlib
-    lzma/liblzma/api
+    ${PROJECT_SOURCE_DIR}/lib/SDL3/include
 )
 
 if(NOT NO_GRAPHICS)

include/actionmodern/action.h

@@ -1,30 +1,45 @@
 #pragma once
 
 #include <swf.h>
+#include <objects.h>
 #include <variables.h>
 #include <stackvalue.h>
 
+#define STACK_VAR_SIZE (4 + 4 + 8 + 8)
+
 #define PUSH(t, v) \
 	OLDSP = SP; \
-	SP -= 4 + 4 + 8 + 8; \
+	SP -= STACK_VAR_SIZE; \
 	SP &= ~7; \
 	STACK[SP] = t; \
 	VAL(u32, &STACK[SP + 4]) = OLDSP; \
-	VAL(u64, &STACK[SP + 16]) = v; \
+	VAL(u64, &STACK[SP + 16]) = v;
 
 // Push string with ID (for constant strings from compiler)
-#define PUSH_STR_ID(v, n, id) \
+#define PUSH_STR_ID(v, id, n) \
 	OLDSP = SP; \
-	SP -= 4 + 4 + 8 + 8; \
+	SP -= STACK_VAR_SIZE; \
 	SP &= ~7; \
 	STACK[SP] = ACTION_STACK_VALUE_STRING; \
+	STACK[SP + 1] = false; \
 	VAL(u32, &STACK[SP + 4]) = OLDSP; \
 	VAL(u32, &STACK[SP + 8]) = n; \
 	VAL(u32, &STACK[SP + 12]) = id; \
-	VAL(char*, &STACK[SP + 16]) = v; \
+	VAL(char*, &STACK[SP + 16]) = v;
+
+// Push dynamic string onto the stack
+#define PUSH_STR_STACK(n) \
+	OLDSP = SP; \
+	SP -= (u32) (4 + 4 + 8 + (n + 1)); \
+	SP &= ~7; \
+	STACK[SP] = ACTION_STACK_VALUE_STRING; \
+	STACK[SP + 1] = true; \
+	VAL(u32, &STACK[SP + 4]) = OLDSP; \
+	VAL(u32, &STACK[SP + 8]) = n; \
+	VAL(u32, &STACK[SP + 12]) = 0;
 
 // Push string without ID (for dynamic strings, ID = 0)
-#define PUSH_STR(v, n) PUSH_STR_ID(v, n, 0)
+#define PUSH_STR(v, n) PUSH_STR_ID(v, 0, n)
 
 #define PUSH_STR_LIST(n, size) \
 	OLDSP = VAL(u32, &STACK[SP_SECOND_TOP + 4]); \
@@ -33,54 +48,190 @@
 	STACK[SP] = ACTION_STACK_VALUE_STR_LIST; \
 	VAL(u32, &STACK[SP + 4]) = OLDSP; \
 	VAL(u32, &STACK[SP + 8]) = n; \
+	VAL(u32, &STACK[SP + 12]) = 0;
 
-#define PUSH_VAR(p) pushVar(app_context, p);
+#define PUSH_NULL() PUSH(ACTION_STACK_VALUE_NULL, 0)
+#define PUSH_UNDEFINED() PUSH(ACTION_STACK_VALUE_UNDEFINED, 0)
+
+#define PUSH_F32(f) PUSH(ACTION_STACK_VALUE_F32, VAL(u32, &(f)));
+#define PUSH_F64(f) PUSH(ACTION_STACK_VALUE_F64, VAL(u64, &(f)));
+#define PUSH_INT(i) PUSH(ACTION_STACK_VALUE_INT, (i));
+#define PUSH_BOOL(b) PUSH(ACTION_STACK_VALUE_BOOLEAN, (b));
+
+#define PUSH_OBJ(o) \
+	PUSH(ACTION_STACK_VALUE_OBJECT, (u64) o) \
+	OBJ_LOCK_WRITE(o, \
+	{ \
+		retainObject(o); \
+	});
+
+#define PUSH_VAR(p) pushVar(app_context, p)
 
 #define POP() \
-	SP = VAL(u32, &STACK[SP + 4]); \
+	if (STACK_TOP_TYPE == ACTION_STACK_VALUE_OBJECT) \
+	{ \
+		ASObject* o = (ASObject*) STACK_TOP_VALUE; \
+		OBJ_LOCK_WRITE(o, \
+		{ \
+			releaseObject(app_context, o); \
+		}); \
+	} \
+	SP = VAL(u32, &STACK[SP + 4]);
 
 #define POP_2() \
 	POP(); \
-	POP(); \
+	POP();
+
+#define DISCARD_ARGS(n) discardArgs(app_context, n)
 
 #define STACK_TOP_TYPE STACK[SP]
+#define STACK_TOP_OWNS_MEM STACK[SP + 1]
 #define STACK_TOP_N VAL(u32, &STACK[SP + 8])
 #define STACK_TOP_ID VAL(u32, &STACK[SP + 12])
 #define STACK_TOP_VALUE VAL(u64, &STACK[SP + 16])
 
 #define SP_SECOND_TOP VAL(u32, &STACK[SP + 4])
 #define STACK_SECOND_TOP_TYPE STACK[SP_SECOND_TOP]
+#define STACK_SECOND_TOP_OWNS_MEM STACK[SP_SECOND_TOP + 1]
 #define STACK_SECOND_TOP_N VAL(u32, &STACK[SP_SECOND_TOP + 8])
 #define STACK_SECOND_TOP_ID VAL(u32, &STACK[SP_SECOND_TOP + 12])
 #define STACK_SECOND_TOP_VALUE VAL(u64, &STACK[SP_SECOND_TOP + 16])
 
+#define FUNC_FLAG_PRELOAD_PARENT        0b0000000010000000
+#define FUNC_FLAG_PRELOAD_ROOT          0b0000000001000000
+#define FUNC_FLAG_SUPPRESS_SUPER        0b0000000000100000
+#define FUNC_FLAG_PRELOAD_SUPER         0b0000000000010000
+#define FUNC_FLAG_SUPPRESS_ARGUMENTS    0b0000000000001000
+#define FUNC_FLAG_PRELOAD_ARGUMENTS     0b0000000000000100
+#define FUNC_FLAG_SUPPRESS_THIS         0b0000000000000010
+#define FUNC_FLAG_PRELOAD_THIS          0b0000000000000001
+#define FUNC_FLAG_PRELOAD_GLOBAL        0b0000000100000000
+
+#define IS_NULL(v) (v.type == ACTION_STACK_VALUE_NULL)
+#define IS_UNDEFINED(v) (v.type == ACTION_STACK_VALUE_UNDEFINED)
+#define IS_NULL_UNDEFINED(v) (IS_NULL(v) || IS_UNDEFINED(v))
+
+#define IS_STR_T(t) (t == ACTION_STACK_VALUE_STRING || t == ACTION_STACK_VALUE_STR_LIST)
+#define IS_NUM_T(t) (t == ACTION_STACK_VALUE_F32 || t == ACTION_STACK_VALUE_F64 || t == ACTION_STACK_VALUE_INT)
+
+#define RETURN_VOID() PUSH_UNDEFINED()
+
 #define VAL(type, x) *((type*) x)
 
 #define INITIAL_STACK_SIZE 8388608  // 8 MB
 #define INITIAL_SP INITIAL_STACK_SIZE
 
 extern ActionVar* temp_val;
 
-void initTime();
+extern ASObject* _global;
+
+typedef struct
+{
+	u8 reg;
+	u32 string_id;
+} Function2Param;
+
+void initActions(SWFAppContext* app_context);
+void freeActions(SWFAppContext* app_context);
+
+void discardArgs(SWFAppContext* app_context, u32 num_args);
 
 void pushVar(SWFAppContext* app_context, ActionVar* p);
+void pushReg(SWFAppContext* app_context, u8 reg);
+
+void releaseObjectVar(SWFAppContext* app_context, ActionVar* var);
+
+void peekVar(SWFAppContext* app_context, ActionVar* var);
+void popVar(SWFAppContext* app_context, ActionVar* var);
+
+void convertNumericToNumber(SWFAppContext* app_context, ActionVar* v);
+void convertNumericToInteger(SWFAppContext* app_context, ActionVar* v);
+
+void toNumber(SWFAppContext* app_context, ActionVar* v);
+void toPrimitive(SWFAppContext* app_context, ASObject* this);
+void toString(SWFAppContext* app_context, ActionVar* v);
+
+ActionStackValueType convertString(SWFAppContext* app_context);
+ActionStackValueType convertDouble(SWFAppContext* app_context);
+ActionStackValueType convertIntECMA(SWFAppContext* app_context);
+
+ASProperty* getPropertyInThisScope(SWFAppContext* app_context, u32 string_id, const char* name, u32 name_len);
+void setPropertyInThisScope(SWFAppContext* app_context, u32 string_id, const char* name, u32 name_len, ActionVar* value);
+
+void callFunction(SWFAppContext* app_context, ASObject* this, ActionVar* func_v, u32 num_args);
+void getAndCallMethod(SWFAppContext* app_context, ASObject* this, u32 method_name, u32 num_args);
+bool getAndCallMethodIfExists(SWFAppContext* app_context, ASObject* this, u32 method_name, u32 num_args);
+
+bool evaluateCondition(SWFAppContext* app_context);
 
+// Arithmetic Operations
 void actionAdd(SWFAppContext* app_context);
+void actionAdd2(SWFAppContext* app_context);
 void actionSubtract(SWFAppContext* app_context);
 void actionMultiply(SWFAppContext* app_context);
 void actionDivide(SWFAppContext* app_context);
+void actionModulo(SWFAppContext* app_context);
+void actionIncrement(SWFAppContext* app_context);
+void actionDecrement(SWFAppContext* app_context);
+
+// Bitwise Operations
+void actionBitAnd(SWFAppContext* app_context);
+void actionBitOr(SWFAppContext* app_context);
+void actionBitLShift(SWFAppContext* app_context);
+void actionBitRShift(SWFAppContext* app_context);
+void actionBitURShift(SWFAppContext* app_context);
+void actionBitXor(SWFAppContext* app_context);
+
+// Comparison Operations
 void actionEquals(SWFAppContext* app_context);
+void actionEquals2(SWFAppContext* app_context);
 void actionLess(SWFAppContext* app_context);
+void actionLess2(SWFAppContext* app_context);
+void actionGreater(SWFAppContext* app_context);
 void actionAnd(SWFAppContext* app_context);
 void actionOr(SWFAppContext* app_context);
 void actionNot(SWFAppContext* app_context);
 
+// String Operations
 void actionStringEquals(SWFAppContext* app_context, char* a_str, char* b_str);
 void actionStringLength(SWFAppContext* app_context, char* v_str);
 void actionStringAdd(SWFAppContext* app_context, char* a_str, char* b_str);
 
+// Variable Operations
 void actionGetVariable(SWFAppContext* app_context);
 void actionSetVariable(SWFAppContext* app_context);
+void actionToInteger(SWFAppContext* app_context);
+void actionToNumber(SWFAppContext* app_context);
+void actionToString(SWFAppContext* app_context);
+void actionTypeOf(SWFAppContext* app_context);
 
+// Utility Operations
 void actionTrace(SWFAppContext* app_context);
-void actionGetTime(SWFAppContext* app_context);
+void actionGetTime(SWFAppContext* app_context);
+
+// Object Operations
+void actionGetMember(SWFAppContext* app_context);
+void actionSetMember(SWFAppContext* app_context);
+void actionEnumerate(SWFAppContext* app_context, char* str_buffer);
+void actionDelete(SWFAppContext* app_context);
+void actionDelete2(SWFAppContext* app_context, char* str_buffer);
+void actionNewObject(SWFAppContext* app_context);
+void actionNewMethod(SWFAppContext* app_context);
+void actionExtends(SWFAppContext* app_context);
+void actionInitObject(SWFAppContext* app_context);
+
+// Array Operations
+void actionInitArray(SWFAppContext* app_context);
+
+// Function Operations
+void actionDefineLocal(SWFAppContext* app_context);
+void actionDefineLocal2(SWFAppContext* app_context);
+void actionCallFunction(SWFAppContext* app_context);
+void actionCallMethod(SWFAppContext* app_context);
+
+// Stack/Register Operations
+void actionStoreRegister(SWFAppContext* app_context, u8 register_num);
+
+// Function Definitions
+void actionDefineFunction(SWFAppContext* app_context, u32 string_id, action_func func, u32* args, bool anonymous);
+void actionDefineFunction2(SWFAppContext* app_context, u32 string_id, action_func func, Function2Param* args, u8 reg_count, u16 flags, bool anonymous);

include/actionmodern/free_thread.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <rbtree.h>
+#include <utils.h>
+
+extern recomp_rwlock_t object_queue_lock;
+extern rbtree object_free_queue;
+
+extern recomp_thread_t free_thread_handle;
+
+DECLARE_RUNTIME_THREAD_FUNC(freeThread);