ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[RSP] Fix compile issues

This commit is contained in:
zilmar 2016-02-14 17:03:35 +11:00
parent 761ecedb4a
commit 89162c784e
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/RSP/Cpu.c
View File

@ -41,7 +41,7 @@
UDWORD EleSpec[32], Indx[32];
OPCODE RSPOpC;
DWORD *PrgCount, NextInstruction, RSP_Running, RSP_MfStatusCount;
uint32_t *PrgCount, NextInstruction, RSP_Running, RSP_MfStatusCount;
p_func RSP_Opcode[64];
p_func RSP_RegImm[32];

2
Source/RSP/Cpu.h
View File

@ -36,7 +36,7 @@ extern p_func RSP_Cop2[32];
extern p_func RSP_Vector[64];
extern p_func RSP_Lc2[32];
extern p_func RSP_Sc2[32];
extern DWORD * PrgCount, RSP_Running;
extern uint32_t * PrgCount, RSP_Running;
extern OPCODE RSPOpC;
void SetCPU(DWORD core);

4
Source/RSP/Main.cpp
View File

@ -240,7 +240,7 @@ __declspec(dllexport) void GetRspDebugInfo ( RSPDEBUG_INFO * DebugInfo )
{
if (hRSPMenu == NULL)
{
hRSPMenu = LoadMenu(hinstDLL,MAKEINTRESOURCE(RspMenu));
hRSPMenu = LoadMenu((HINSTANCE)hinstDLL,MAKEINTRESOURCE(RspMenu));
FixMenuState();
}
DebugInfo->hRSPMenu = hRSPMenu;
@ -435,7 +435,7 @@ void ProcessMenuItem(int ID)
}
break;
case ID_COMPILER:
DialogBox(hinstDLL, "RSPCOMPILER", HWND_DESKTOP, (DLGPROC)CompilerDlgProc);
DialogBox((HINSTANCE)hinstDLL, "RSPCOMPILER", HWND_DESKTOP, (DLGPROC)CompilerDlgProc);
break;
case ID_BREAKONSTARTOFTASK:
{

1
Source/RSP/Rsp.h
View File

@ -23,6 +23,7 @@
* should be forwarded to them so if they want them.
*
*/
#pragma once
#if defined(__cplusplus)
extern "C" {

6
Source/RSP/breakpoint.c
View File

@ -99,7 +99,7 @@ int CheckForRSPBPoint ( DWORD Location )
return FALSE;
}
void CreateBPPanel ( HWND hDlg, RECT rcBox )
void CreateBPPanel ( void * hDlg, rectangle rcBox )
{
if (hRSPLocation != NULL) { return; }
@ -124,7 +124,7 @@ void HideBPPanel ( void )
ShowWindow(hRSPLocation,FALSE);
}
void PaintBPPanel ( PAINTSTRUCT ps )
void PaintBPPanel ( window_paint ps )
{
TextOut( ps.hdc, 29,60,"Break when the Program Counter equals",37);
TextOut( ps.hdc, 59,85,"0x",2);
@ -135,7 +135,7 @@ void ShowBPPanel ( void )
ShowWindow(hRSPLocation,TRUE);
}
void RefreshBpoints ( HWND hList )
void RefreshBpoints ( void * hList )
{
char Message[100];
LRESULT location;

9
Source/RSP/breakpoint.h
View File

@ -23,6 +23,7 @@
* should be forwarded to them so if they want them.
*
*/
#include "Rsp.h"
#define MaxBPoints 0x30
@ -34,12 +35,12 @@ BPOINT BPoint[MaxBPoints];
int NoOfBpoints;
void Add_BPoint ( void );
void CreateBPPanel ( HWND hDlg, RECT rcBox );
void CreateBPPanel ( void * hDlg, rectangle rcBox );
void HideBPPanel ( void );
void PaintBPPanel ( PAINTSTRUCT ps );
void PaintBPPanel ( window_paint ps );
void ShowBPPanel ( void );
void RefreshBpoints ( HWND hList );
void RemoveBpoint ( HWND hList, int index );
void RefreshBpoints ( void * hList );
void RemoveBpoint ( void * hList, int index );
void RemoveAllBpoint ( void );
int AddRSP_BPoint ( DWORD Location, int Confirm );