Fix some errors and adjust the README.md

bythos14 · Jun 12, 2022 · 16520bc · 16520bc
1 parent 9ff4b69
commit 16520bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,8 +11,8 @@ endif()
 project(SceShaccCgExt)
 include("${VITASDK}/share/vita.cmake" REQUIRED)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math -mtune=cortex-a9 -mfpu=neon -fno-optimize-sibling-calls -ftree-vectorize -Wall -Iinclude")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math -mtune=cortex-a9 -mfpu=neon -fno-optimize-sibling-calls -ftree-vectorize -Wall -fno-exceptions -fno-rtti -std=gnu++11 -fpermissive -Iinclude")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math -mtune=cortex-a9 -mfpu=neon -fno-optimize-sibling-calls -ftree-vectorize -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math -mtune=cortex-a9 -mfpu=neon -fno-optimize-sibling-calls -ftree-vectorize -Wall -fno-exceptions -fno-rtti -std=gnu++11 -fpermissive")
 
 add_library(${PROJECT_NAME}
   include/shacccg_ext.h

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
 # SceShaccCgExt
 
- Extension library for SceShaccCg. Returns support for PSP2 specific Cg language extensions, and intrinsics, as well as reimplementing stripped out compiler pragmas.
+An Extension library for SceShaccCg. Returns support for Vita-specific Cg language extensions, intrinsics, and stripped-out compiler pragmas.
diff --git a/src/shacccg_ext.c b/src/shacccg_ext.c
@@ -12,7 +12,7 @@
 #ifdef NDEBUG
 #define LOG(level, msg, args...)
 #else
-#define LOG(level, msg, args...) sceClibPrintf("[SceShaccCgExt  ] - %s:%d:"#level":"msg"\n", __func__, __LINE__);
+#define LOG(level, msg, args...) sceClibPrintf("[SceShaccCgExt  ] - %s:%d:"#level":"msg"\n", __func__, __LINE__, ##args);
 #endif
 
 #define ENCODE_MOV_IMM(inst0, inst1, imm)                              \
@@ -74,12 +74,14 @@ int sceShaccCgExtEnableExtensions()
 		goto fail;
 	}
 
-	if (taiModuleInfo.module_nid != 0)
+	if (taiModuleInfo.module_nid != 0xEE15880D)
 	{
 		LOG(ERROR, "SceShaccCg module NID is not as expected");
 		goto fail;
 	}
 
+	moduleId = taiModuleInfo.modid;
+
 	// Patch stdlib load. Allows for loading custom internal source code.
 	uint16_t internalSourcePatch[] =
 		{
@@ -145,10 +147,10 @@ int sceShaccCgExtEnableExtensions()
 	injectIds[3] = taiInjectData(moduleId, 0, 0x201B9C, &nostdlibPatch[2], sizeof(uint16_t) * 3);
 	if (injectIds[3] < 0)
 		goto fail;
-	injectIds[4] = taiInjectData(moduleId, 0, 0x201B9C, &moduleUnloadPatch[0], sizeof(moduleUnloadPatch));
+	injectIds[4] = taiInjectData(moduleId, 0, 0x204242, &moduleUnloadPatch[0], sizeof(moduleUnloadPatch));
 	if (injectIds[4] < 0)
 		goto fail;
-	injectIds[5] = taiInjectData(moduleId, 0, 0x201B9C, &moduleUnloadPatch[0], sizeof(moduleUnloadPatch));
+	injectIds[5] = taiInjectData(moduleId, 0, 0x20425A, &moduleUnloadPatch[0], sizeof(moduleUnloadPatch));
 	if (injectIds[5] < 0)
 		goto fail;
 
@@ -258,8 +260,8 @@ static void *(*FUN_81009884)();
 static void *(*_HeapAlloc)(void *, size_t);
 static void (*_HeapFree)(void *);
 
-static void (*_AtomicIncrement)(uint32_t *);
-static uint32_t (*_AtomicDecrement)(uint32_t *);
+void (*_AtomicIncrement)(uint32_t *);
+uint32_t (*_AtomicDecrement)(uint32_t *);
 
 static void GetPragmaFunctionPointers(void *segment0)
 {