Implement ucode for Goldeneye 007

src/F3DGOLDEN.cpp

@@ -0,0 +1,71 @@
+#include <assert.h>
+#include "GLideN64.h"
+#include "Debug.h"
+#include "F3D.h"
+#include "F3DGOLDEN.h"
+#include "N64.h"
+#include "RSP.h"
+#include "RDP.h"
+#include "gSP.h"
+#include "gDP.h"
+#include "GBI.h"
+
+#define F3DGOLDEN_TRIX		0xB1
+#define F3DGOLDEN_MOVEWORD	0xBD
+
+u32 G_GOLDEN_TRIX;
+u32 G_GOLDEN_MOVEWORD;
+
+void F3DGOLDEN_TriX(u32 w0, u32 w1)
+{
+	while(w1 != 0) {
+		s32 v0 = w1 & 0xf;
+		w1 >>= 4;
+
+		s32 v1 = w1 & 0xf;
+		w1 >>= 4;
+
+		s32 v2 = w0 & 0xf;
+		w0 >>= 4;
+
+		gSPTriangle(v0, v1, v2);
+	}
+	gSPFlushTriangles();
+}
+
+void F3DGOLDEN_Init()
+{
+	gSPSetupFunctions();
+	// Set GeometryMode flags
+	GBI_InitFlags( F3D );
+
+	GBI.PCStackSize = 10;
+
+	//			GBI Command				Command Value			Command Function
+	GBI_SetGBI( G_SPNOOP,				F3D_SPNOOP,				F3D_SPNoOp );
+	GBI_SetGBI( G_MTX,					F3D_MTX,				F3D_Mtx );
+	GBI_SetGBI( G_RESERVED0,			F3D_RESERVED0,			F3D_Reserved0 );
+	GBI_SetGBI( G_MOVEMEM,				F3D_MOVEMEM,			F3D_MoveMem );
+	GBI_SetGBI( G_VTX,					F3D_VTX,				F3D_Vtx );
+	GBI_SetGBI( G_RESERVED1,			F3D_RESERVED1,			F3D_Reserved1 );
+	GBI_SetGBI( G_DL,					F3D_DL,					F3D_DList );
+	GBI_SetGBI( G_RESERVED2,			F3D_RESERVED2,			F3D_Reserved2 );
+	GBI_SetGBI( G_RESERVED3,			F3D_RESERVED3,			F3D_Reserved3 );
+	GBI_SetGBI( G_SPRITE2D_BASE,		F3D_SPRITE2D_BASE,		F3D_Sprite2D_Base );
+
+	GBI_SetGBI( G_TRI1,					F3D_TRI1,				F3D_Tri1 );
+	GBI_SetGBI( G_CULLDL,				F3D_CULLDL,				F3D_CullDL );
+	GBI_SetGBI( G_GOLDEN_MOVEWORD,		F3DGOLDEN_MOVEWORD,		F3D_MoveWord );
+	GBI_SetGBI( G_MOVEWORD,				F3D_MOVEWORD,			F3D_MoveWord );
+	GBI_SetGBI( G_TEXTURE,				F3D_TEXTURE,			F3D_Texture );
+	GBI_SetGBI( G_SETOTHERMODE_H,		F3D_SETOTHERMODE_H,		F3D_SetOtherMode_H );
+	GBI_SetGBI( G_SETOTHERMODE_L,		F3D_SETOTHERMODE_L,		F3D_SetOtherMode_L );
+	GBI_SetGBI( G_ENDDL,				F3D_ENDDL,				F3D_EndDL );
+	GBI_SetGBI( G_SETGEOMETRYMODE,		F3D_SETGEOMETRYMODE,	F3D_SetGeometryMode );
+	GBI_SetGBI( G_CLEARGEOMETRYMODE,	F3D_CLEARGEOMETRYMODE,	F3D_ClearGeometryMode );
+	GBI_SetGBI( G_QUAD,					F3D_QUAD,				F3D_Quad );
+	GBI_SetGBI( G_RDPHALF_1,			F3D_RDPHALF_1,			F3D_RDPHalf_1 );
+	GBI_SetGBI( G_RDPHALF_2,			F3D_RDPHALF_2,			F3D_RDPHalf_2 );
+	GBI_SetGBI( G_RDPHALF_CONT,			F3D_RDPHALF_CONT,		F3D_RDPHalf_Cont );
+	GBI_SetGBI( G_GOLDEN_TRIX,			F3DGOLDEN_TRIX,			F3DGOLDEN_TriX );
+}

src/F3DGOLDEN.h

@@ -0,0 +1,7 @@
+#ifndef F3DGOLDEN_H
+#define F3DGOLDEN_H
+
+void F3DGOLDEN_Init();
+
+#endif
+

src/GBI.cpp

@@ -23,6 +23,7 @@
 #include "F3DWRUS.h"
 #include "F3DPD.h"
 #include "F3DSETA.h"
+#include "F3DGOLDEN.h"
 #include "F3DEX2CBFD.h"
 #include "ZSort.h"
 #include "CRC.h"
@@ -44,7 +45,7 @@ SpecialMicrocodeInfo specialMicrocodes[] =
 	{ F3DSWSE,		false,	0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" },
 	{ F3DEX,		true,	0x637b4b58, "RSP SW Version: 2.0D, 04-01-96" },
 	{ F3D,			true,	0x54c558ba, "RSP SW Version: 2.0D, 04-01-96" }, // Pilot Wings
-	{ F3D,		true,	0x302bca09, "RSP SW Version: 2.0G, 09-30-96" }, // GoldenEye
+	{ F3DGOLDEN,	true,	0x302bca09, "RSP SW Version: 2.0G, 09-30-96" }, // GoldenEye
 
 	{ S2DEX,		false,	0x9df31081, "RSP Gfx ucode S2DEX  1.06 Yoshitaka Yasumoto Nintendo." },
 
@@ -185,6 +186,7 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
 			case ZSortp:	ZSort_Init();		break;
 			case F3DEX2CBFD:F3DEX2CBFD_Init();	break;
 			case F3DSETA:	F3DSETA_Init();		break;
+			case F3DGOLDEN:	F3DGOLDEN_Init();	break;
 		}
 
 #ifndef GLESX

src/GBI.h

@@ -23,7 +23,8 @@
 #define Turbo3D		14
 #define ZSortp		15
 #define F3DSETA		16
-#define NONE		17
+#define F3DGOLDEN	17
+#define NONE		18
 
 // Fixed point conversion factors
 #define FIXED2FLOATRECIP1	0.5f

src/gSP.h

@@ -223,4 +223,5 @@ extern void (*gSPLightVertex)(SPVertex & _vtx);
 extern void (*gSPPointLightVertex)(SPVertex & _vtx, float * _vPos);
 extern void (*gSPBillboardVertex)(u32 v, u32 i);
 void gSPSetupFunctions();
+inline void gSPFlushTriangles();
 #endif