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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2015-12-06 21:06:36 +11:00
parent a429a7fd08 be34822c90
commit 3e4dd1cc23
13 changed files with 180 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lang/Japanese.pj.Lang
View File

@ -5,7 +5,7 @@
#1 # "Japanese" // LANGUAGE ID
#2 # "Nekokabu" // Author
#3 # "2.2" // Version
#4 # "2015/11/6" // Date
#4 # "2015/12/5" // Date
//About DLL Dialog
#5 # "現在の言語"
@ -20,6 +20,20 @@
//About INI title
#20 # "設定ファイルについて"
/*********************************************************************************
* Numbers *
*********************************************************************************/
//#50# "0"
//#51# "1"
//#52# "2"
//#53# "3"
//#54# "4"
//#55# "5"
//#56# "6"
//#57# "7"
//#58# "8"
//#59# "9"
/*********************************************************************************
* Menu *
*********************************************************************************/
@ -88,6 +102,7 @@
#198# "スロット &8"
#199# "スロット &9"
#200# "スロット 1&0"
#201# "セーブスロット (%ws) が選択されました"
//Pop up Menu
#210# "ゲーム開始(&P)"
@ -231,6 +246,7 @@
#464# "ロムの実行中はスクリーンセーバーを無効にする"
#465# "フレームレートを表示"
#466# "表示形式によってフレームレートを変更する:"
#467# "Project64がすでに起動しているかチェックする"
//ROM Browser Tab
#480# "最近開いたロムファイルの表示する数(0～10):"
@ -341,6 +357,7 @@
#689# "ゲーム実行中"
#690# "ゲーム実行中 (ウィンドウ時)"
#691# "ゲーム実行中 (フルスクリーン時)"
#692# "キーの削除"
// Frame Rate Option
#700# "垂直割り込み/秒"
@ -355,6 +372,7 @@
#720# "この項目のリセット"
#721# "すべてリセット"
#722# "適用"
#723# "閉じる"
/*********************************************************************************
* ROM Information *

2
Source/3rdParty/sdl/sdl2.vcxproj vendored
View File

@ -35,7 +35,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader />
<AdditionalIncludeDirectories>include;$(Root)Source/3rd Party/directx/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include;$(Root)Source/3rdParty/directx/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>HAVE_LIBC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>

2
Source/Glide64/Gfx_1.3.h
View File

@ -69,7 +69,7 @@ the plugin
#include <stddef.h> // offsetof
#include <glide.h>
#include <Common/MemTest.h>
#include <settings/Settings.h>
#include <Settings/Settings.h>
#include "GlideExtensions.h"
#include "rdp.h"
#include "Keys.h"

2
Source/Glide64/Main.cpp
View File

@ -37,7 +37,7 @@
//
//****************************************************************
#include <common/StdString.h>
#include <Common/StdString.h>
#include "Gfx_1.3.h"
#include "Version.h"
#include <Settings/Settings.h>

2
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -310,7 +310,7 @@ bool CMipsMemoryVM::LW_VAddr(uint32_t VAddr, uint32_t& Value)
{
if (VAddr >= 0xA3F00000 && VAddr < 0xC0000000)
{
if (VAddr < 0xA4000000 || VAddr >= 0xA4002000)
if ((VAddr & 0xFFFFE000ul) != 0xA4000000ul) // !(A4000000 <= addr < A4002000)
{
VAddr &= 0x1FFFFFFF;
LW_NonMemory(VAddr, &Value);

162
Source/Project64/UserInterface/UIResources.rc
View File

@ -85,8 +85,8 @@ BEGIN
PUSHBUTTON "About",CONT_ABOUT,166,76,44,13,WS_DISABLED
COMBOBOX RSP_LIST,7,105,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "About",RSP_ABOUT,166,105,44,13,WS_DISABLED
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,8
CONTROL "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,8
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,10
CONTROL "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,10
GROUPBOX "Graphics:",IDC_GFX_NAME,6,6,208,29
GROUPBOX "Audio:",IDC_AUDIO_NAME,6,38,208,29
GROUPBOX "Controller:",IDC_CONT_NAME,6,66,208,29
@ -132,9 +132,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Use Rom Browser",IDC_USE_ROMBROWSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,7,206,10
CONTROL "Use Directory recursion",IDC_RECURSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,148,202,10
LTEXT "Available fields",IDC_ROMSEL_TEXT5,6,26,77,8
LTEXT "Available fields",IDC_ROMSEL_TEXT5,6,26,77,10
LISTBOX IDC_AVALIABLE,6,38,76,104,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LTEXT "Show fields in this order:",IDC_ROMSEL_TEXT6,135,26,81,8
LTEXT "Show fields in this order:",IDC_ROMSEL_TEXT6,135,26,81,10
LISTBOX IDC_USING,134,38,76,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Add ->",IDC_ADD,85,38,45,12
PUSHBUTTON "<- Remove",IDC_REMOVE,85,54,45,12
@ -148,16 +148,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Pause emulation when window is not active?",IDC_AUTOSLEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,9,206,8
CONTROL "On loading a ROM go to full screen",IDC_LOAD_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,25,206,8
CONTROL "Disable Screen Saver when running rom",IDC_SCREEN_SAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,41,206,8
CONTROL "Hide Advanced Settings",IDC_BASIC_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,57,206,8
LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,81,145,8
CONTROL "Pause emulation when window is not active?",IDC_AUTOSLEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,9,206,10
CONTROL "On loading a ROM go to full screen",IDC_LOAD_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,25,206,10
CONTROL "Disable Screen Saver when running rom",IDC_SCREEN_SAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,41,206,10
CONTROL "Hide Advanced Settings",IDC_BASIC_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,57,206,10
LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,81,145,10
EDITTEXT IDC_REMEMBER,148,79,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "roms",IDC_ROMSEL_TEXT2,178,82,31,8
LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,96,145,8
LTEXT "roms",IDC_ROMSEL_TEXT2,178,82,31,10
LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,96,145,10
EDITTEXT IDC_REMEMBERDIR,148,94,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "dirs",IDC_ROMSEL_TEXT4,178,98,34,8
LTEXT "dirs",IDC_ROMSEL_TEXT4,178,98,34,10
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,73,208,1
END
@ -168,27 +168,27 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Close",IDC_CLOSE_BUTTON,169,186,64,14
GROUPBOX "",IDC_STATIC,6,5,228,177
LTEXT "ROM Name:",IDC_ROM_NAME,11,16,64,9
LTEXT "ROM Name:",IDC_ROM_NAME,11,16,64,10
EDITTEXT IDC_INFO_ROMNAME,77,15,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "File Name:",IDC_FILE_NAME,11,31,64,9
LTEXT "File Name:",IDC_FILE_NAME,11,31,64,10
EDITTEXT IDC_INFO_FILENAME,77,30,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Rom Size:",IDC_ROM_SIZE,11,74,64,9
LTEXT "Rom Size:",IDC_ROM_SIZE,11,74,64,10
EDITTEXT IDC_INFO_ROMSIZE,77,74,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Cartridge ID:",IDC_CART_ID,11,90,64,9
LTEXT "Cartridge ID:",IDC_CART_ID,11,90,64,10
EDITTEXT IDC_INFO_CARTID,77,89,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Manufacturer:",IDC_MANUFACTURER,11,106,64,9
LTEXT "Manufacturer:",IDC_MANUFACTURER,11,106,64,10
EDITTEXT IDC_INFO_MANUFACTURER,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Country:",IDC_COUNTRY,11,122,64,9
LTEXT "Country:",IDC_COUNTRY,11,122,64,10
EDITTEXT IDC_INFO_COUNTRY,77,119,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "CRC1:",IDC_CRC1,11,135,64,9
LTEXT "CRC1:",IDC_CRC1,11,135,64,10
EDITTEXT IDC_INFO_CRC1,77,134,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "CRC2:",IDC_CRC2,11,151,64,9
LTEXT "CRC2:",IDC_CRC2,11,151,64,10
EDITTEXT IDC_INFO_CRC2,77,149,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "CIC Chip:",IDC_CIC_CHIP,11,167,64,9
LTEXT "CIC Chip:",IDC_CIC_CHIP,11,167,64,10
EDITTEXT IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Location:",IDC_LOCATION,11,45,64,10
EDITTEXT IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "MD5:",IDC_ROM_MD5,11,60,64,9
LTEXT "MD5:",IDC_ROM_MD5,11,60,64,10
EDITTEXT IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
END
@ -211,13 +211,13 @@ BEGIN
LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,90,91,10
EDITTEXT IDC_COUNTPERBYTE,102,88,109,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,3,103,208,1
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,107,91,8
CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,107,91,8
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,91,8
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,118,91,8
CONTROL "Delay DP Interrupt",IDC_DELAY_DP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,129,91,8
CONTROL "Delay SI Interrupt",IDC_DELAY_SI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,129,91,8
CONTROL "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,140,91,8
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,107,91,10
CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,107,91,10
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,118,91,10
CONTROL "Delay DP Interrupt",IDC_DELAY_DP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,129,91,10
CONTROL "Delay SI Interrupt",IDC_DELAY_SI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,129,91,10
CONTROL "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,140,91,10
END
IDD_Settings_Accelerator DIALOGEX 0, 0, 218, 183
@ -225,7 +225,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "CPU State:",IDC_S_CPU_STATE,8,9,52,11
LTEXT "CPU State:",IDC_S_CPU_STATE,8,9,52,10
COMBOBOX IDC_C_CPU_STATE,68,7,144,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Menu Item:",IDC_MENU_ITEM_TEXT,8,23,84,10
CONTROL "Tree1",IDC_MENU_ITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_NOTOOLTIPS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,33,128,78
@ -236,11 +236,11 @@ BEGIN
COMBOBOX IDC_VIRTUALKEY,8,125,91,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Detect Key",IDC_KEY_PROMPT,103,125,62,12
PUSHBUTTON "Assign to Menu",IDC_ASSIGN,170,125,42,12
CONTROL "&Ctrl",IDC_CTL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,23,9
CONTROL "A&lt",IDC_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,142,21,9
CONTROL "&Ctrl",IDC_CTL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,23,10
CONTROL "A&lt",IDC_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,142,21,10
CONTROL "&Shift",IDC_SHIFT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,142,26,10
LTEXT "Currently Assigned To:",IDC_S_CURRENT_ASSIGN,8,155,72,10
LTEXT "",IDC_ASSIGNED_MENU_ITEM,89,155,118,9
LTEXT "",IDC_ASSIGNED_MENU_ITEM,89,155,118,10
END
IDD_Key_Prompt DIALOGEX 0, 0, 105, 43
@ -276,7 +276,7 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "",IDC_ADDCHEATSFRAME,2,0,188,145
LTEXT "Name:",IDC_NAME,7,13,25,8
LTEXT "Name:",IDC_NAME,7,13,25,10
EDITTEXT IDC_CODE_NAME,37,12,146,12,ES_AUTOHSCROLL
LTEXT "Code:",IDC_CODE,7,30,25,10
LTEXT "<address> <value>",IDC_CODE_DES,7,40,60,10
@ -296,8 +296,8 @@ EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Code Extensions"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Please choose a value to be used for:",IDC_NOTE,7,7,172,9
LTEXT "",IDC_CHEAT_NAME,7,17,172,9
LTEXT "Please choose a value to be used for:",IDC_NOTE,7,7,172,10
LTEXT "",IDC_CHEAT_NAME,7,17,172,10
LISTBOX IDC_CHEAT_LIST,7,31,172,96,LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,74,132,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,132,50,14
@ -309,12 +309,12 @@ EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Quantity Digit"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Please choose a value for:",IDC_DIGITAL_TEXT,7,7,169,9
LTEXT "",IDC_CHEAT_NAME,7,17,169,9
LTEXT "&Value",IDC_VALUE_TEXT,14,32,22,9
LTEXT "Please choose a value for:",IDC_DIGITAL_TEXT,7,7,169,10
LTEXT "",IDC_CHEAT_NAME,7,17,169,10
LTEXT "&Value",IDC_VALUE_TEXT,14,32,22,10
EDITTEXT IDC_VALUE,38,31,48,12,ES_UPPERCASE | ES_AUTOHSCROLL
LTEXT "from blah to blah",IDC_RANGE,95,32,74,11
LTEXT "&Notes:",IDC_NOTES_TEXT,7,53,66,9
LTEXT "from blah to blah",IDC_RANGE,95,32,74,10
LTEXT "&Notes:",IDC_NOTES_TEXT,7,53,66,10
EDITTEXT IDC_NOTES,7,62,169,36,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,74,106,50,14
PUSHBUTTON "Cancel",IDCANCEL,126,106,50,14
@ -326,13 +326,13 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Start Emulation when rom is opened?",IDC_START_ON_ROM_OPEN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,8,191,11
CONTROL "Automatically compress instant saves",IDC_ZIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,24,191,11
CONTROL "Enable Debugger",IDC_DEBUGGER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,41,191,8
CONTROL "Remember selected cheats",IDC_REMEMBER_CHEAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,57,191,8
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,8,191,10
CONTROL "Automatically compress instant saves",IDC_ZIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,24,191,10
CONTROL "Enable Debugger",IDC_DEBUGGER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,41,191,10
CONTROL "Remember selected cheats",IDC_REMEMBER_CHEAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,57,191,10
CONTROL "Check if project64 is already running",IDC_CHECK_RUNNING,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,73,189,8
CONTROL "Frame rate display",IDC_DISPLAY_FRAMERATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,88,86,9
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,73,189,10
CONTROL "Frame rate display",IDC_DISPLAY_FRAMERATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,88,86,10
COMBOBOX IDC_FRAME_DISPLAY_TYPE,101,87,99,57,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
@ -342,14 +342,14 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "",IDC_STATIC,5,13,218,168
LTEXT "File extension association:",IDC_SHELL_INT_TEXT,73,37,85,8
CONTROL ".v64",IDC_V64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,50,37,9
CONTROL ".z64",IDC_Z64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,64,37,9
CONTROL ".n64",IDC_N64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,78,37,9
CONTROL ".rom",IDC_ROM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,92,37,9
CONTROL ".jap",IDC_JAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,106,37,9
CONTROL ".pal",IDC_PAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,120,37,9
CONTROL ".usa",IDC_USA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,134,37,9
LTEXT "File extension association:",IDC_SHELL_INT_TEXT,73,37,85,10
CONTROL ".v64",IDC_V64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,50,37,10
CONTROL ".z64",IDC_Z64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,64,37,10
CONTROL ".n64",IDC_N64,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,78,37,10
CONTROL ".rom",IDC_ROM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,92,37,10
CONTROL ".jap",IDC_JAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,106,37,10
CONTROL ".pal",IDC_PAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,120,37,10
CONTROL ".usa",IDC_USA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,134,37,10
END
IDD_About_Ini DIALOGEX 0, 0, 185, 250
@ -357,25 +357,25 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI
CAPTION "About INI Files"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX " Current Language ",IDC_LAN,5,3,175,42
LTEXT "Author:",IDC_LAN_AUTHOR,13,14,164,10
LTEXT "Version:",IDC_LAN_VERSION,13,24,164,10
LTEXT "Date:",IDC_LAN_DATE,13,34,164,10
GROUPBOX "ROM Database (.RDB)",IDC_RDB,5,46,175,59
LTEXT "Author:",IDC_RDB_AUTHOR,12,57,166,8
LTEXT "Version:",IDC_RDB_VERSION,12,67,166,8
LTEXT "Date:",IDC_RDB_DATE,12,76,166,8
LTEXT "Author:",IDC_RDB_AUTHOR,13,57,164,10
LTEXT "Version:",IDC_RDB_VERSION,13,67,164,10
LTEXT "Date:",IDC_RDB_DATE,13,76,164,10
PUSHBUTTON "visit home page",IDC_RDB_HOME,12,87,163,13
GROUPBOX "Cheat Code file (.CHT)",IDC_CHT,6,107,175,59
LTEXT "Author:",IDC_CHT_AUTHOR,13,118,166,8
LTEXT "Version:",IDC_CHT_VERSION,13,128,166,8
LTEXT "Date:",IDC_CHT_DATE,14,137,166,8
PUSHBUTTON "visit home page",IDC_CHT_HOME,13,148,163,13
GROUPBOX " Current Language ",IDC_LAN,5,3,175,42
LTEXT "Author:",IDC_LAN_AUTHOR,13,14,166,8
LTEXT "Version:",IDC_LAN_VERSION,13,24,166,8
LTEXT "Date:",IDC_LAN_DATE,13,34,166,8
LTEXT "Author:",IDC_CHT_AUTHOR,13,118,164,10
LTEXT "Version:",IDC_CHT_VERSION,13,128,164,10
LTEXT "Date:",IDC_CHT_DATE,13,137,164,10
PUSHBUTTON "visit home page",IDC_CHT_HOME,12,148,163,13
GROUPBOX "Extended Rom Info (.RDX)",IDC_RDX,6,168,175,59
LTEXT "Author:",IDC_RDX_AUTHOR,13,178,166,8
LTEXT "Version:",IDC_RDX_VERSION,13,188,166,8
PUSHBUTTON "visit home page",IDC_RDX_HOME,15,210,163,13
LTEXT "Date:",IDC_RDX_DATE,13,198,166,8
LTEXT "Author:",IDC_RDX_AUTHOR,13,178,164,10
LTEXT "Version:",IDC_RDX_VERSION,13,188,164,10
LTEXT "Date:",IDC_RDX_DATE,13,198,164,10
PUSHBUTTON "visit home page",IDC_RDX_HOME,12,210,163,13
PUSHBUTTON "OK",IDOK,134,230,47,13
END
@ -588,17 +588,17 @@ BEGIN
COMBOBOX IDC_CPU_TYPE,113,8,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Function lookup method:",IDC_FUNCFIND_TEXT,4,27,106,10
COMBOBOX IDC_FUNCFIND,113,25,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Register caching",IDC_ROM_REGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,95,11
CONTROL "Register caching",IDC_ROM_REGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,95,10
GROUPBOX "Self Mod Methods",IDC_SMM_FRAME,4,79,208,54
CONTROL "Cache",IDC_SMM_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,89,9
CONTROL "PI DMA",IDC_SMM_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,89,9
CONTROL "Start Changed",IDC_SMM_VALIDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,89,8
CONTROL "Protect Memory",IDC_SMM_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,115,89,8
CONTROL "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,103,89,8
CONTROL "Cache",IDC_SMM_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,89,10
CONTROL "PI DMA",IDC_SMM_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,89,10
CONTROL "Start Changed",IDC_SMM_VALIDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,89,10
CONTROL "Protect Memory",IDC_SMM_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,115,89,10
CONTROL "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,103,89,10
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,6,42,208,1
CONTROL "Advanced Block Linking",IDC_BLOCK_LINKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,49,95,11
CONTROL "Fast SP",IDC_ROM_FASTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,62,91,11
CONTROL "Store Instruction",IDC_SMM_STORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,91,89,8
CONTROL "Advanced Block Linking",IDC_BLOCK_LINKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,49,95,10
CONTROL "Fast SP",IDC_ROM_FASTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,62,91,10
CONTROL "Store Instruction",IDC_SMM_STORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,91,89,10
END
IDD_Settings_GamePlugin DIALOGEX 0, 0, 231, 206
@ -614,8 +614,8 @@ BEGIN
PUSHBUTTON "About",CONT_ABOUT,166,76,44,13,WS_DISABLED
COMBOBOX RSP_LIST,7,105,155,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "About",RSP_ABOUT,166,105,44,13,WS_DISABLED
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,8
CONTROL "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,8
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,127,193,10
CONTROL "Use High Level Audio",IDC_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,140,188,10
GROUPBOX "Graphics:",IDC_GFX_NAME,6,6,208,29
GROUPBOX "Audio:",IDC_AUDIO_NAME,6,38,208,29
GROUPBOX "Controller:",IDC_CONT_NAME,6,66,208,29

94
Source/RSP/Rsp.h
View File

@ -28,6 +28,16 @@
extern "C" {
#endif
#include <Common/stdtypes.h>
#if defined(_WIN32)
#define EXPORT __declspec(dllexport)
#define CALL _cdecl
#else
#define EXPORT __attribute__((visibility("default")))
#define CALL
#endif
/************ Profiling **************/
#define Default_ProfilingOn FALSE
#define Default_IndvidualBlock FALSE
@ -42,45 +52,45 @@ extern "C" {
#define PLUGIN_TYPE_CONTROLLER 4
typedef struct {
WORD Version; /* Should be set to 0x0101 */
WORD Type; /* Set to PLUGIN_TYPE_RSP */
uint16_t Version; /* Should be set to 0x0101 */
uint16_t Type; /* Set to PLUGIN_TYPE_RSP */
char Name[100]; /* Name of the DLL */
/* If DLL supports memory these memory options then set them to TRUE or FALSE
if it does not support it */
BOOL NormalMemory; /* a normal BYTE array */
BOOL MemoryBswaped; /* a normal BYTE array where the memory has been pre
bswap on a dword (32 bits) boundry */
int NormalMemory; /* a normal BYTE array */
int MemoryBswaped; /* a normal BYTE array where the memory has been pre
bswap on a dword (32 bits) boundry */
} PLUGIN_INFO;
typedef struct {
HINSTANCE hInst;
BOOL MemoryBswaped; /* If this is set to TRUE, then the memory has been pre
bswap on a dword (32 bits) boundry */
BYTE * RDRAM;
BYTE * DMEM;
BYTE * IMEM;
int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre
bswap on a dword (32 bits) boundry */
uint8_t * RDRAM;
uint8_t * DMEM;
uint8_t * IMEM;
DWORD * MI_INTR_REG;
uint32_t * MI_INTR_REG;
DWORD * SP_MEM_ADDR_REG;
DWORD * SP_DRAM_ADDR_REG;
DWORD * SP_RD_LEN_REG;
DWORD * SP_WR_LEN_REG;
DWORD * SP_STATUS_REG;
DWORD * SP_DMA_FULL_REG;
DWORD * SP_DMA_BUSY_REG;
DWORD * SP_PC_REG;
DWORD * SP_SEMAPHORE_REG;
uint32_t * SP_MEM_ADDR_REG;
uint32_t * SP_DRAM_ADDR_REG;
uint32_t * SP_RD_LEN_REG;
uint32_t * SP_WR_LEN_REG;
uint32_t * SP_STATUS_REG;
uint32_t * SP_DMA_FULL_REG;
uint32_t * SP_DMA_BUSY_REG;
uint32_t * SP_PC_REG;
uint32_t * SP_SEMAPHORE_REG;
DWORD * DPC_START_REG;
DWORD * DPC_END_REG;
DWORD * DPC_CURRENT_REG;
DWORD * DPC_STATUS_REG;
DWORD * DPC_CLOCK_REG;
DWORD * DPC_BUFBUSY_REG;
DWORD * DPC_PIPEBUSY_REG;
DWORD * DPC_TMEM_REG;
uint32_t * DPC_START_REG;
uint32_t * DPC_END_REG;
uint32_t * DPC_CURRENT_REG;
uint32_t * DPC_STATUS_REG;
uint32_t * DPC_CLOCK_REG;
uint32_t * DPC_BUFBUSY_REG;
uint32_t * DPC_PIPEBUSY_REG;
uint32_t * DPC_TMEM_REG;
void (*CheckInterrupts)( void );
void (*ProcessDList)( void );
@ -96,7 +106,7 @@ typedef struct {
void (*ProcessMenuItem) ( int ID );
/* Break Points */
BOOL UseBPoints;
int UseBPoints;
char BPPanelName[20];
void (*Add_BPoint) ( void );
void (*CreateBPPanel) ( HWND hDlg, RECT rcBox );
@ -122,18 +132,18 @@ typedef struct {
void (*Enter_Memory_Window)( void );
} DEBUG_INFO;
__declspec(dllexport) void CloseDLL (void);
__declspec(dllexport) void DllAbout ( HWND hParent );
__declspec(dllexport) DWORD DoRspCycles ( DWORD Cycles );
__declspec(dllexport) void GetDllInfo ( PLUGIN_INFO * PluginInfo );
__declspec(dllexport) void GetRspDebugInfo ( RSPDEBUG_INFO * DebugInfo );
__declspec(dllexport) void InitiateRSP ( RSP_INFO Rsp_Info, DWORD * CycleCount);
__declspec(dllexport) void InitiateRSPDebugger ( DEBUG_INFO Debug_Info);
__declspec(dllexport) void RomOpen (void);
__declspec(dllexport) void RomClosed (void);
__declspec(dllexport) void DllConfig (HWND hWnd);
__declspec(dllexport) void EnableDebugging (BOOL Enabled);
__declspec(dllexport) void PluginLoaded (void);
EXPORT void CloseDLL(void);
EXPORT void DllAbout(HWND hParent);
EXPORT DWORD DoRspCycles(DWORD Cycles);
EXPORT void GetDllInfo(PLUGIN_INFO * PluginInfo);
EXPORT void GetRspDebugInfo(RSPDEBUG_INFO * DebugInfo);
EXPORT void InitiateRSP(RSP_INFO Rsp_Info, DWORD * CycleCount);
EXPORT void InitiateRSPDebugger(DEBUG_INFO Debug_Info);
EXPORT void RomOpen(void);
EXPORT void RomClosed(void);
EXPORT void DllConfig(HWND hWnd);
EXPORT void EnableDebugging(BOOL Enabled);
EXPORT void PluginLoaded(void);
DWORD AsciiToHex (char * HexValue);
void DisplayError (char * Message, ...);
@ -142,7 +152,7 @@ int GetStoredWinPos( char * WinName, DWORD * X, DWORD * Y );
#define InterpreterCPU 0
#define RecompilerCPU 1
extern BOOL DebuggingEnabled, Profiling, IndvidualBlock, ShowErrors, BreakOnStart, LogRDP, LogX86Code;
extern int DebuggingEnabled, Profiling, IndvidualBlock, ShowErrors, BreakOnStart, LogRDP, LogX86Code;
extern DWORD CPUCore;
extern DEBUG_INFO DebugInfo;
extern RSP_INFO RSPInfo;

8
Source/Script/MinGW/common.cmd
View File

@ -25,13 +25,13 @@ set AS=%MinGW%\bin\as.exe
ECHO Compiling common library sources for Project64...
%CC% -o %obj%\CriticalSection.asm %src%\CriticalSection.cpp %C_FLAGS%
%CC% -o %obj%\FileClass.asm "%src%\File Class.cpp" %C_FLAGS%
%CC% -o %obj%\IniFileClass.asm "%src%\Ini File Class.cpp" %C_FLAGS%
%CC% -o %obj%\LogClass.asm "%src%\Log Class.cpp" %C_FLAGS%
%CC% -o %obj%\FileClass.asm %src%\FileClass.cpp %C_FLAGS%
%CC% -o %obj%\IniFileClass.asm %src%\IniFileClass.cpp %C_FLAGS%
%CC% -o %obj%\LogClass.asm %src%\LogClass.cpp %C_FLAGS%
%CC% -o %obj%\md5.asm %src%\md5.cpp %C_FLAGS%
%CC% -o %obj%\MemTest.asm %src%\MemTest.cpp %C_FLAGS%
%CC% -o %obj%\path.asm %src%\path.cpp %C_FLAGS%
%CC% -o %obj%\stdstring.asm "%src%\std string.cpp" %C_FLAGS%
%CC% -o %obj%\stdstring.asm %src%\StdString.cpp %C_FLAGS%
%CC% -o %obj%\SyncEvent.asm %src%\SyncEvent.cpp %C_FLAGS%
%CC% -o %obj%\Trace.asm %src%\Trace.cpp %C_FLAGS%
%CC% -o %obj%\Util.asm %src%\Util.cpp %C_FLAGS%

8
Source/Script/MinGW/glide64.cmd
View File

@ -12,10 +12,10 @@ mkdir %obj%
REM set MinGW=C:\msys64\mingw64\x86_64-w64-mingw32\..
set FLAGS_x86=^
-I"%src%\.."^
-I"%src%\..\3rd Party\wx\include"^
-I"%src%\..\3rd Party\wx\lib\vc_lib\msw"^
-I"%src%\..\Glitch64\inc"^
-I%src%\..^
-I%src%\..\3rdParty\wx\include^
-I%src%\..\3rdParty\wx\lib\vc_lib\msw^
-I%src%\..\Glitch64\inc^
-S^
-masm=intel^
-march=native^

2
Source/Script/MinGW/nrage.cmd
View File

@ -12,7 +12,7 @@ mkdir %obj%
REM set MinGW=C:\msys64\mingw64\x86_64-w64-mingw32\..
set FLAGS_x86=^
-I"%src%\..\3rd Party\directx\include"^
-I%src%\..\3rdParty\directx\include^
-Wno-write-strings^
-S^
-masm=intel^

18
Source/Script/MinGW/rsp.cmd
View File

@ -13,7 +13,7 @@ REM set MinGW=C:\msys64\mingw64\x86_64-w64-mingw32\..
set FLAGS_x86=^
-Wno-write-strings^
-I"%src%\.."^
-I%src%\..^
-S^
-masm=intel^
-march=native^
@ -32,15 +32,15 @@ ECHO Compiling RSP plugin sources...
%CC% -o %obj%\dma.asm %src%\dma.c %C_FLAGS%
%CC% -o %obj%\breakpoint.asm %src%\breakpoint.c %C_FLAGS%
%CC% -o %obj%\log.asm %src%\log.cpp %C_FLAGS%
%CC% -o %obj%\InterpreterCPU.asm "%src%\Interpreter CPU.c" %C_FLAGS%
%CC% -o %obj%\RecompilerCPU.asm "%src%\Recompiler CPU.c" %C_FLAGS%
%CC% -o %obj%\InterpreterOps.asm "%src%\Interpreter Ops.c" %C_FLAGS%
%CC% -o %obj%\RecompilerOps.asm "%src%\Recompiler Ops.c" %C_FLAGS%
%CC% -o %obj%\InterpreterCPU.asm %src%\InterpreterCPU.c %C_FLAGS%
%CC% -o %obj%\RecompilerCPU.asm %src%\RecompilerCPU.c %C_FLAGS%
%CC% -o %obj%\InterpreterOps.asm %src%\InterpreterOps.c %C_FLAGS%
%CC% -o %obj%\RecompilerOps.asm %src%\RecompilerOps.c %C_FLAGS%
%CC% -o %obj%\Profiling.asm %src%\Profiling.cpp %C_FLAGS%
%CC% -o %obj%\RSPCommand.asm "%src%\RSP Command.c" %C_FLAGS%
%CC% -o %obj%\RSPRegister.asm "%src%\RSP Register.c" %C_FLAGS%
%CC% -o %obj%\RecompilerSections.asm "%src%\Recompiler Sections.c" %C_FLAGS%
%CC% -o %obj%\RecompilerAnalysis.asm "%src%\Recompiler Analysis.c" %C_FLAGS%
%CC% -o %obj%\RSPCommand.asm %src%\RSPCommand.c %C_FLAGS%
%CC% -o %obj%\RSPRegister.asm %src%\RSPRegister.c %C_FLAGS%
%CC% -o %obj%\RecompilerSections.asm %src%\RecompilerSections.c %C_FLAGS%
%CC% -o %obj%\RecompilerAnalysis.asm %src%\RecompilerAnalysis.c %C_FLAGS%
%CC% -o %obj%\X86.asm %src%\X86.c %C_FLAGS%
%CC% -o %obj%\Mmx.asm %src%\Mmx.c %C_FLAGS%
%CC% -o %obj%\Sse.asm %src%\Sse.c %C_FLAGS%

8
Source/Script/Unix/common.sh
View File

@ -16,13 +16,13 @@ AS=as
echo Compiling common library sources for Project64...
$CC -o $obj/CriticalSection.asm $src/CriticalSection.cpp $C_FLAGS
$CC -o $obj/FileClass.asm "$src/File Class.cpp" $C_FLAGS
$CC -o $obj/IniFileClass.asm "$src/Ini File Class.cpp" $C_FLAGS
$CC -o $obj/LogClass.asm "$src/Log Class.cpp" $C_FLAGS
$CC -o $obj/FileClass.asm $src/FileClass.cpp $C_FLAGS
$CC -o $obj/IniFileClass.asm $src/IniFileClass.cpp $C_FLAGS
$CC -o $obj/LogClass.asm $src/LogClass.cpp $C_FLAGS
$CC -o $obj/md5.asm $src/md5.cpp $C_FLAGS
$CC -o $obj/MemTest.asm $src/MemTest.cpp $C_FLAGS
$CC -o $obj/path.asm $src/path.cpp $C_FLAGS
$CC -o $obj/stdstring.asm "$src/std string.cpp" $C_FLAGS
$CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS
$CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS
$CC -o $obj/Trace.asm $src/Trace.cpp $C_FLAGS
$CC -o $obj/Util.asm $src/Util.cpp $C_FLAGS

4
Source/nragev20/NRage_Input_V2.vcxproj
View File

@ -40,14 +40,14 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rd Party\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>