Compile fixes for gcc11

Author: rickgaiser

Makefile

@@ -5,8 +5,8 @@ EE_INCS     += -I./include -I$(PS2SDK)/ports/include
 EE_CFLAGS   += -D_DEBUG
 EE_CXXFLAGS += -D_DEBUG
 # VU0 code is broken so disable for now
-EE_CFLAGS   += -DNO_VU0_VECTORS
-EE_CXXFLAGS += -DNO_VU0_VECTORS
+EE_CFLAGS   += -DNO_VU0_VECTORS -DNO_ASM
+EE_CXXFLAGS += -DNO_VU0_VECTORS -DNO_ASM
 
 EE_OBJS = \
 	src/core.o \

include/ps2s/core.h

@@ -119,9 +119,9 @@ Core::FToI4(float flp)
 {
     tU32 fip;
 
-    asm __volatile__("qmtc2		%1, vf01	\n"
-                     "vftoi4	vf01, vf01	\n"
-                     "qmfc2		%0, vf01	\n"
+    asm __volatile__("qmtc2		%1, $vf1	\n"
+                     "vftoi4	$vf1, $vf1	\n"
+                     "qmfc2		%0, $vf1	\n"
                      : "=r"(fip)
                      : "r"(flp));
 

src/texture.cpp

@@ -217,7 +217,7 @@ void CTexEnv::SetDimensions(tU32 w, tU32 h)
     // perspective tex mapping (but what about plain old (u,v)?? -- FIXME)
 
     int page_width   = 64;
-    unsigned int bpp = GS::GetBitsPerPixel((enum GS::tPSM)gsrTex0.psm);
+    unsigned int bpp = GS::GetBitsPerPixel((GS::tPSM)gsrTex0.psm);
     if (bpp == 8 || bpp == 4)
         page_width = 128;