- Fix glN64 build

FIX94 · Nov 16, 2017 · f90e33c · f90e33c
1 parent 75e1bfb
commit f90e33c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/glN64_GX/VI.cpp b/glN64_GX/VI.cpp
@@ -473,11 +473,11 @@ void VI_GX_renderCpuFramebuffer()
 		__lwp_heap_init(GXtexCache, memalign(32,GX_TEXTURE_CACHE_SIZE),GX_TEXTURE_CACHE_SIZE, 32);
 #endif //!HW_RVL
 	}
-	u16* FBtex = (u16*) __lwp_heap_allocate(GXtexCache,FBtexW*FBtexH*2);
+	u16* FBtex = (u16*) __lwp_heap_allocate(GXtexCache,FBtexW*FBtexH*2+32);
 	while(!FBtex)
 	{
 		TextureCache_FreeNextTexture();
-		FBtex = (u16*) __lwp_heap_allocate(GXtexCache,FBtexW*FBtexH*2);
+		FBtex = (u16*) __lwp_heap_allocate(GXtexCache,FBtexW*FBtexH*2+32);
 	}
 	GXTexObj	FBtexObj;
 
@@ -503,7 +503,7 @@ void VI_GX_renderCpuFramebuffer()
 
 		do {
 			__asm__ volatile(
-				"lwzu    2, 8(%0) \n"
+				"lwzu    0, 8(%0) \n"
 				"lwz     3, 4(%0) \n"
 				"lwzu    4, 8(%1) \n"
 				"lwz     5, 4(%1) \n"
@@ -512,7 +512,7 @@ void VI_GX_renderCpuFramebuffer()
 				"lwzu    8, 8(%3) \n"
 				"lwz     9, 4(%3) \n"
 
-				"rotrwi  2, 2, 1 \n"
+				"rotrwi  0, 0, 1 \n"
 				"rotrwi  3, 3, 1 \n"
 				"rotrwi  4, 4, 1 \n"
 				"rotrwi  5, 5, 1 \n"
@@ -521,7 +521,7 @@ void VI_GX_renderCpuFramebuffer()
 				"rotrwi  8, 8, 1 \n"
 				"rotrwi  9, 9, 1 \n"
 
-				"or  2, 2, %4 \n"
+				"or  0, 0, %4 \n"
 				"or  3, 3, %4 \n"
 				"or  4, 4, %4 \n"
 				"or  5, 5, %4 \n"
@@ -530,7 +530,7 @@ void VI_GX_renderCpuFramebuffer()
 				"or  8, 8, %4 \n"
 				"or  9, 9, %4 \n"
 
-				"stw     2, 0(%5) \n"
+				"stw     0, 0(%5) \n"
 				"stw     3, 0(%5) \n"
 				"stw     4, 0(%5) \n"
 				"stw     5, 0(%5) \n"
@@ -540,7 +540,7 @@ void VI_GX_renderCpuFramebuffer()
 				"stw     9, 0(%5) \n"
 				: "+b" (src1), "+b" (src2), "+b" (src3), "+b" (src4)
 				: "r" (0x80008000), "b" (wgPipe)
-				: "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9",
+				: "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9",
 				  "memory");
 		} while (--tiles);
 

diff --git a/main/xxhash.c b/main/xxhash.c
@@ -398,7 +398,7 @@ FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void
 
     if (state->memsize) {   /* some data left from previous update */
         XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
-        {   const U32* p32 = state->mem32;
+        {   const U32* p32 = (U32*)state->mem32;
             state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
             state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
             state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;