libretro/libretro-fceumm
1
0
Fork 0
mirror of https://github.com/libretro/libretro-fceumm.git synced 2025-02-11 03:16:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from libretro/master

Browse Source 
update
This commit is contained in:
arpruss 2023-01-07 11:03:27 -06:00 committed by GitHub
commit d454cef43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 9754 additions and 1716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intl/activate.py Executable file → Normal file
View File

@ -62,7 +62,7 @@ if __name__ == '__main__':
translate_txt = translate_txt.replace('<0-59>', f"{minutes}")
translate_txt = translate_txt.replace('<0-23>', f"{hour}")
translate_txt = translate_txt.replace('# Fridays at , UTC',
f"# Fridays at {hour%12}:{minutes} {'AM' if hour < 12 else 'PM'}, UTC")
f"# Fridays at {hour%12}:{minutes if minutes > 9 else '0' + str(minutes)} {'AM' if hour < 12 else 'PM'}, UTC")
translate_txt = translate_txt.replace("<CORE_NAME>", CORE_NAME)
translate_txt = translate_txt.replace('<PATH/TO>/libretro_core_options_intl.h',
core_intl_file)

16
intl/core_option_regex.py
View File

@ -1,14 +1,14 @@
import re
# 0: full struct; 1: up to & including first []; 2: content between first {}
p_struct = re.compile(r'(struct\s*[a-zA-Z0-9_\s]+\[])\s*'
r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+)\s*)*'
# 0: full struct; 1: up to & including first []; 2 & 3: comments; 4: content between first {}
p_struct = re.compile(r'(\bstruct\b\s*[a-zA-Z0-9_\s]+\[])\s*' # 1st capturing group
r'(?:(?=(\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+))\2\s*)*' # 2nd capturing group
r'=\s*' # =
r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+)\s*)*'
r'(?:(?=(\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+))\3\s*)*' # 3rd capturing group
r'{((?:.|[\r\n])*?)\{\s*NULL,\s*NULL,\s*NULL\s*(?:.|[\r\n])*?},?(?:.|[\r\n])*?};') # captures full struct, it's beginning and it's content
# 0: type name[]; 1: type; 2: name
p_type_name = re.compile(r'(retro_core_option_[a-zA-Z0-9_]+)\s*'
r'(option_cats([a-z_]{0,8})|option_defs([a-z_]{0,8}))\s*\[]')
p_type_name = re.compile(r'(\bretro_core_option_[a-zA-Z0-9_]+)\s*'
r'(\boption_cats([a-z_]{0,8})|\boption_defs([a-z_]*))\s*\[]')
# 0: full option; 1: key; 2: description; 3: additional info; 4: key/value pairs
p_option = re.compile(r'{\s*' # opening braces
r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
@ -76,9 +76,9 @@ p_key_value = re.compile(r'{\s*' # opening braces
p_masked = re.compile(r'([A-Z_][A-Z0-9_]+)\s*(\"(?:"\s*"|\\\s*|.)*\")')
p_intl = re.compile(r'(struct retro_core_option_definition \*option_defs_intl\[RETRO_LANGUAGE_LAST]) = {'
p_intl = re.compile(r'(\bstruct retro_core_option_definition \*option_defs_intl\[RETRO_LANGUAGE_LAST]) = {'
r'((?:.|[\r\n])*?)};')
p_set = re.compile(r'static INLINE void libretro_set_core_options\(retro_environment_t environ_cb\)'
p_set = re.compile(r'\bstatic INLINE void libretro_set_core_options\(retro_environment_t environ_cb\)'
r'(?:.|[\r\n])*?};?\s*#ifdef __cplusplus\s*}\s*#endif')
p_yaml = re.compile(r'"project_id": "[0-9]+".*\s*'

79
intl/core_option_translation.py Executable file → Normal file
View File

@ -134,13 +134,12 @@ def is_viable_non_dupe(text: str, comparison) -> bool:
def is_viable_value(text: str) -> bool:
"""text must be longer than 2 ('""'), not 'NULL' and text.lower() not in
{'"enabled"', '"disabled"', '"true"', '"false"', '"on"', '"off"'}.
"""text must be longer than 2 ('""') and not 'NULL'.
:param text: String to be tested.
:return: bool
"""
return 2 < len(text) and text != 'NULL' and text.lower() not in ON_OFFS
return 2 < len(text) and text != 'NULL'
def create_non_dupe(base_name: str, opt_num: int, comparison) -> str:
@ -183,17 +182,17 @@ def get_texts(text: str) -> dict:
if lang not in just_string:
hash_n_string[lang] = {}
just_string[lang] = set()
is_v2 = False
is_v2_definition = 'retro_core_option_v2_definition' == struct_type_name[0]
pre_name = ''
# info texts format
p = cor.p_info
if 'retro_core_option_v2_definition' == struct_type_name[0]:
is_v2 = True
elif 'retro_core_option_v2_category' == struct_type_name[0]:
if 'retro_core_option_v2_category' == struct_type_name[0]:
# prepend category labels, as they can be the same as option labels
pre_name = 'CATEGORY_'
# categories have different info texts format
p = cor.p_info_cat
struct_content = struct.group(2)
struct_content = struct.group(4)
# 0: full option; 1: key; 2: description; 3: additional info; 4: key/value pairs
struct_options = cor.p_option.finditer(struct_content)
for opt, option in enumerate(struct_options):
@ -219,7 +218,7 @@ def get_texts(text: str) -> dict:
if option.group(3):
infos = option.group(3)
option_info = p.finditer(infos)
if is_v2:
if is_v2_definition:
desc1 = next(option_info).group(1)
if is_viable_non_dupe(desc1, just_string[lang]):
just_string[lang].add(desc1)
@ -248,16 +247,21 @@ def get_texts(text: str) -> dict:
else:
raise ValueError(f'Too few arguments in struct {struct_type_name[1]} option {option.group(1)}!')
# group 4:
# group 4: key/value pairs
if option.group(4):
for j, kv_set in enumerate(cor.p_key_value.finditer(option.group(4))):
set_key, set_value = kv_set.group(1, 2)
if not is_viable_value(set_value):
if not is_viable_value(set_key):
continue
# use the key if value not available
set_value = set_key
if not is_viable_value(set_value):
continue
# re.fullmatch(r'(?:[+-][0-9]+)+', value[1:-1])
if set_value not in just_string[lang] and not re.sub(r'[+-]', '', set_value[1:-1]).isdigit():
# add only if non-dupe, not translated by RetroArch directly & not purely numeric
if set_value not in just_string[lang]\
and set_value.lower() not in ON_OFFS\
and not re.sub(r'[+-]', '', set_value[1:-1]).isdigit():
clean_key = set_key[1:-1]
clean_key = remove_special_chars(clean_key).upper().replace(' ', '_')
m_h = create_non_dupe(re.sub(r'__+', '_', f"OPTION_VAL_{clean_key}"), opt, hash_n_string[lang])
@ -298,8 +302,12 @@ def h2json(file_paths: dict) -> dict:
for file_lang in file_paths:
if not os.path.isfile(file_paths[file_lang]):
continue
jsons[file_lang] = file_paths[file_lang][:-2] + '.json'
file_path = file_paths[file_lang]
try:
jsons[file_lang] = file_path[:file_path.rindex('.')] + '.json'
except ValueError:
print(f"File {file_path} has incorrect format! File ending missing?")
continue
p = cor.p_masked
@ -397,11 +405,11 @@ def get_crowdin_client(dir_path: str) -> str:
return jar_path
def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str, file_path: str) -> None:
def create_intl_file(intl_file_path: str, localisations_path: str, text: str, file_path: str) -> None:
"""Creates 'libretro_core_options_intl.h' from Crowdin translations.
:param localisation_file_path: Path to 'libretro_core_options_intl.h'
:param intl_dir_path: Path to the intl/<core_name> directory.
:param intl_file_path: Path to 'libretro_core_options_intl.h'
:param localisations_path: Path to the intl/<core_name> directory.
:param text: Content of the 'libretro_core_options.h' being translated.
:param file_path: Path to the '_us.h' file, containing the original English texts.
:return: None
@ -497,10 +505,11 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
'extern "C" {\n' \
'#endif\n'
if os.path.isfile(localisation_file_path):
if os.path.isfile(intl_file_path):
# copy top of the file for re-use
with open(localisation_file_path, 'r', encoding='utf-8') as intl: # libretro_core_options_intl.h
with open(intl_file_path, 'r', encoding='utf-8') as intl: # libretro_core_options_intl.h
in_text = intl.read()
# attempt 1: find the distinct comment header
intl_start = re.search(re.escape('/*\n'
' ********************************\n'
' * Core Option Definitions\n'
@ -509,19 +518,22 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
if intl_start:
out_txt = in_text[:intl_start.end(0)]
else:
# attempt 2: if no comment header present, find c++ compiler instruction (it is kind of a must)
intl_start = re.search(re.escape('#ifdef __cplusplus\n'
'extern "C" {\n'
'#endif\n'), in_text)
if intl_start:
out_txt = in_text[:intl_start.end(0)]
# if all attempts fail, use default from above
# only write to file, if there is anything worthwhile to write!
overwrite = False
# iterate through localisation files
files = {}
for file in os.scandir(intl_dir_path):
for file in os.scandir(localisations_path):
files[file.name] = {'is_file': file.is_file(), 'path': file.path}
for file in sorted(files): # intl/<core_name>/_*
if files[file]['is_file'] \
and file.startswith('_') \
@ -532,6 +544,7 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
struct_groups = cor.p_struct.finditer(text)
lang_low = os.path.splitext(file)[0].lower()
lang_up = lang_low.upper()
# mark each language's section with a comment, for readability
out_txt = out_txt + f'/* RETRO_LANGUAGE{lang_up} */\n\n' # /* RETRO_LANGUAGE_NM */
# copy adjusted translations (makros)
@ -544,22 +557,22 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
if 3 > len(struct_type_name): # no language specifier
new_decl = re.sub(re.escape(struct_type_name[1]), struct_type_name[1] + lang_low, declaration)
else:
new_decl = re.sub(re.escape(struct_type_name[2]), lang_low, declaration)
if '_us' != struct_type_name[2]:
# only use _us constructs - other languages present in the source file are not important
continue
new_decl = re.sub(re.escape(struct_type_name[2]), lang_low, declaration)
p = cor.p_info
if 'retro_core_option_v2_category' == struct_type_name[0]:
p = cor.p_info_cat
p = (cor.p_info_cat if 'retro_core_option_v2_category' == struct_type_name[0] else cor.p_info)
offset_construct = construct.start(0)
# append localised construct name and ' = {'
start = construct.end(1) - offset_construct
end = construct.start(2) - offset_construct
end = construct.start(4) - offset_construct
out_txt = out_txt + new_decl + construct.group(0)[start:end]
content = construct.group(2)
# insert macros
content = construct.group(4)
new_content = cor.p_option.sub(replace_option, content)
start = construct.end(2) - offset_construct
start = construct.end(4) - offset_construct
# append macro-filled content and close the construct
out_txt = out_txt + new_content + construct.group(0)[start:] + '\n'
# for v2
@ -574,7 +587,7 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
# only write to file, if there is anything worthwhile to write!
if overwrite:
with open(localisation_file_path, 'w', encoding='utf-8') as intl:
with open(intl_file_path, 'w', encoding='utf-8') as intl:
intl.write(out_txt + '\n#ifdef __cplusplus\n'
'}\n#endif\n'
'\n#endif')
@ -585,7 +598,7 @@ def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str,
if __name__ == '__main__':
try:
if os.path.isfile(sys.argv[1]):
if os.path.isfile(sys.argv[1]) or sys.argv[1].endswith('.h'):
_temp = os.path.dirname(sys.argv[1])
else:
_temp = sys.argv[1]

4
intl/crowdin.yaml
View File

@ -6,8 +6,8 @@
"files":
[
{
"source": "/intl/_core_name_/_us.json",
"source": "/_core_name_/_us.json",
"dest": "/_core_name_/_core_name_.json",
"translation": "/intl/_core_name_/_%two_letters_code%.json",
"translation": "/_core_name_/_%two_letters_code%.json",
},
]

2
intl/crowdin_prep.py Executable file → Normal file
View File

@ -4,7 +4,7 @@ import core_option_translation as t
if __name__ == '__main__':
try:
if t.os.path.isfile(t.sys.argv[1]):
if t.os.path.isfile(t.sys.argv[1]) or t.sys.argv[1].endswith('.h'):
_temp = t.os.path.dirname(t.sys.argv[1])
else:
_temp = t.sys.argv[1]

0
intl/crowdin_source_upload.py Executable file → Normal file
View File

2
intl/crowdin_translate.py Executable file → Normal file
View File

@ -4,7 +4,7 @@ import core_option_translation as t
if __name__ == '__main__':
try:
if t.os.path.isfile(t.sys.argv[1]):
if t.os.path.isfile(t.sys.argv[1]) or t.sys.argv[1].endswith('.h'):
_temp = t.os.path.dirname(t.sys.argv[1])
else:
_temp = t.sys.argv[1]

0
intl/crowdin_translation_download.py Executable file → Normal file
View File

0
intl/download_workflow.py Executable file → Normal file
View File

0
intl/initial_sync.py Executable file → Normal file
View File

0
intl/remove_initial_cycle.py Executable file → Normal file
View File

0
intl/upload_workflow.py Executable file → Normal file
View File

15
intl/v1_to_v2_converter.py Executable file → Normal file
View File

@ -9,7 +9,6 @@ The original files will be preserved as *.v1
"""
import core_option_regex as cor
import os
import sys
import glob
@ -380,7 +379,8 @@ def create_v2_code_file(struct_text, file_name):
f' option_defs{struct_type_name_lang[2]}\n'
'};',
construct.group(0)[construct.end(2) - offset:])
out_text = cor.re.sub(cor.re.escape(construct.group(0)), repl_text, out_text)
out_text = out_text.replace(construct.group(0), repl_text)
#out_text = cor.re.sub(cor.re.escape(construct.group(0)), repl_text, raw_out)
else:
return -2
with open(file_name, 'w', encoding='utf-8') as code_file:
@ -409,11 +409,19 @@ def create_v2_code_file(struct_text, file_name):
' &options_ar, /* RETRO_LANGUAGE_ARABIC */\n' \
' &options_el, /* RETRO_LANGUAGE_GREEK */\n' \
' &options_tr, /* RETRO_LANGUAGE_TURKISH */\n' \
' &options_sv, /* RETRO_LANGUAGE_SLOVAK */\n' \
' &options_sk, /* RETRO_LANGUAGE_SLOVAK */\n' \
' &options_fa, /* RETRO_LANGUAGE_PERSIAN */\n' \
' &options_he, /* RETRO_LANGUAGE_HEBREW */\n' \
' &options_ast, /* RETRO_LANGUAGE_ASTURIAN */\n' \
' &options_fi, /* RETRO_LANGUAGE_FINNISH */\n' \
' &options_id, /* RETRO_LANGUAGE_INDONESIAN */\n' \
' &options_sv, /* RETRO_LANGUAGE_SWEDISH */\n' \
' &options_uk, /* RETRO_LANGUAGE_UKRAINIAN */\n' \
' &options_cs, /* RETRO_LANGUAGE_CZECH */\n' \
' &options_val, /* RETRO_LANGUAGE_CATALAN_VALENCIA */\n' \
' &options_ca, /* RETRO_LANGUAGE_CATALAN */\n' \
' &options_en, /* RETRO_LANGUAGE_BRITISH_ENGLISH */\n' \
' &options_hu, /* RETRO_LANGUAGE_HUNGARIAN */\n' \
+ out_text[intl.end(2):]
out_text = p_set.sub(new_set, new_intl)
else:
@ -456,7 +464,6 @@ if __name__ == '__main__':
H_FILE_PATH = core_op_file
INTL_FILE_PATH = core_op_file.replace("libretro_core_options.h", 'libretro_core_options_intl.h')
for file in (H_FILE_PATH, INTL_FILE_PATH):
if os.path.isfile(file):
with open(file, 'r+', encoding='utf-8') as h_file:

272
src/boards/468.c Normal file
View File

@ -0,0 +1,272 @@
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2022 NewRisingSun
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* BlazePro CPLD-based multicarts
Unsolved issue: how is CHR RAM write-protection triggered?
Known problems:
Forever Duo of NES 852-in-1 (rev1):
#A370 Time Lord: Hangs with glitchy status bar on NTSC and PAL but not Dendy
#A133 Galactic Crusader: Wrong mirroring
#A249 Mission Cobra: Wrong mirroring
Legendary Games of NES 509-in-1:
#189 Huang Di Battle of Zhuolu: Wrong mirroring during intro
#227 Kid Niki Niki 2: Title screen animation flickers and looks strange
#234 Klax: Screen in wrong position during options screen
#365 Rocman X: Graphical garbage in waterfall (middle) level
#403 Star Wars: Blank tiles due to lack of CHR RAM write-protection
#404 The Empire Strikes Back: Blank tiles due to lack of CHR RAM write-protection
#460 Twin Dragons: Wrong mirroring
Unlicensed Collection 142-in-1:
#59 Huang Di: Wrong mirroring during intro
#84 Ms. Pac-Man: Wrong mirroring
#102 Rocman X: Graphical garbage in waterfall (middle) level
#132 Trolls on Treasure Island: Wrong mirroring during map
Unreleased Collection 73-in-1 (v1.01):
#38 Holy Diver: Wrong mirroring during first scene
*/
#include "mapinc.h"
#include "state.h"
static uint8 submapper;
static uint8 eeprom[16], clock, state, command, output; /* Some strange serial EEPROM */
static uint8 *WRAM;
static uint32 WRAMSIZE;
static int prevSFEXINDEX;
extern int SFEXINDEX;
extern SFORMAT SFMDATA[64];
static uint8 mapper; /* 5700 MSB >>4 OR'd with submapper <<4 */
static uint8 mapperFlags; /* 5700 LSB */
static uint8 misc; /* 5601 */
static uint8 misc2; /* 5702 */
static void (*sync)();
static uint16 prgOR;
static uint8 prgAND;
static uint8 regByte[16];
static int16 regWord[9];
#include "468_mmc1.h"
#include "468_mmc24.h"
#include "468_mmc3.h"
#include "468_vrc1.h"
#include "468_vrc24.h"
#include "468_vrc3.h"
#include "468_vrc6.h"
#include "468_vrc7.h"
#include "468_fme7.h"
#include "468_discrete.h"
#include "468_cnrom.h"
#include "468_if12.h"
#include "468_lf36.h"
#include "468_nanjing.h"
static SFORMAT stateRegs[] = {
{ &mapper, 1, "SUP0" },
{ &mapperFlags, 1, "SUP1" },
{ &misc, 1, "SUP2" },
{ &misc2, 1, "SUP3" },
{ &prgOR, 2, "SUP4" },
{ &prgAND, 1, "SUP5" },
{ eeprom, 16,"EEPR" },
{ &clock, 1, "EEP0" },
{ &state, 1, "EEP1" },
{ &command, 1, "EEP2" },
{ &output, 1, "EEP3" },
{ regByte, 16,"REGB" },
{ regWord, 16,"REGW" },
{ 0 }
};
static const uint16 lut509[512] ={ /* Strange look-up table, used only by Legendary Games of NES 509-in-1 */
7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 0, 1, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 4, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
124, 125, 126, 127, 128, 129, 2, 3, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 5, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 238, 239, 240, 241,
242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 256, 6, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402,
403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442,
443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482,
483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 512, 513, 514, 515, 516, 517
};
void setPins(uint8 select, uint8 newClock, uint8 newData) { /* Serial EEPROM */
if (select)
state =0;
else
if (!clock && !!newClock) {
if (state <8) {
command =command <<1 | !!(newData)*1;
if (++state ==8 && (command &0xF0) !=0x50 && (command &0xF0) !=0xA0) state =0;
} else {
int mask =1 <<(15 -state);
int address =command &0x0F;
if ((command &0xF0) ==0xA0) {
eeprom[address] =eeprom[address] &~mask | !!(newData)*mask;
/* The "write" command also silently returns the content of a strange lookup table */
output =!!(lut509[eeprom[0] | eeprom[1] | eeprom[2] <<8 &0x1FF] >>(address &1? 0: 8) &mask);
} else
if ((command &0xF0) ==0x50)
output =!!(eeprom[address] &mask);
if (++state ==16) state =0;
}
}
clock =newClock;
}
static DECLFR(readReg);
static DECLFW(writeReg);
static void setMapper(uint8 clearRegs) {
int i;
if (clearRegs) {
for (i =0; i <16; i++) regByte[i] =0;
for (i =0; i < 8; i++) regWord[i] =0;
X6502_IRQEnd(FCEU_IQEXT);
}
SetReadHandler(0x5000, 0x5FFF, readReg);
SetReadHandler(0x6000, 0xFFFF, CartBR);
SetWriteHandler(0x5000, 0x5FFF, writeReg);
SetWriteHandler(0x6000, 0xFFFF, CartBW);
MapIRQHook = NULL;
PPU_hook = NULL;
GameHBIRQHook = NULL;
setprg8r(0x10, 0x6000, 0);
switch(mapper) { /* 5700 MSB >>4 OR'd with submapper <<4 */
case 0x00: case 0x01: case 0x32: MMC1_reset(clearRegs); break;
case 0x0A: MMC2_reset(clearRegs); break;
case 0x10: case 0x11: case 0x12: MMC3_reset(clearRegs); break;
case 0x08: MMC4_reset(clearRegs); break;
case 0x40: VRC1_reset(clearRegs); break;
case 0x20: case 0x21: case 0x22: case 0x23: VRC24_reset(clearRegs); break;
case 0x44: VRC3_reset(clearRegs); break;
case 0x30: case 0x31: VRC6_reset(clearRegs); break;
case 0x41: VRC7_reset(clearRegs); break;
case 0x07: LF36_reset(clearRegs); break;
case 0x50: FME7_reset(clearRegs); break;
case 0x0E: case 0x1E: NANJING_reset(clearRegs); break;
case 0x09: case 0x0B: case 0x17: case 0x37: UNROM_IF12_reset(clearRegs); break;
case 0x04: case 0x06: case 0x14: case 0x16: ANROM_BNROM_reset(clearRegs); break;
case 0x05: case 0x15: CNROM_BF9097_reset(clearRegs); break;
case 0x0C: case 0x0D: case 0x1C: case 0x1D: GNROM_reset(clearRegs); break;
default: break;
}
sync();
}
static DECLFR(readReg) {
switch(A) {
case 0x5301: case 0x5601:
return output? 0x80: 0x00;
default:
return 0xFF;
}
}
static DECLFW(writeReg) {
switch(A) {
case 0x5301:
if (submapper ==0) setPins(!!(V &0x04), !!(V &0x02), !!(V &0x01));
break;
case 0x5601:
if (~misc &0x80) {
misc =V;
if (submapper !=1) {
prgOR =prgOR &~0x2000 | V <<9 &0x2000;
sync();
}
}
if (submapper ==1) setPins(!!(V &0x10), !!(V &0x02), !!(V &0x01));
break;
case 0x5700:
mapper =V >>4 | submapper <<4;
mapperFlags =V &0xF;
prgOR =prgOR &~0x0010 | V <<4 &0x0010;
setMapper(1);
break;
case 0x5701:
prgOR =prgOR &~0x1FE0 | V <<5 &0x1FE0;
sync();
break;
case 0x5702:
if (submapper ==1) {
misc2 =V;
prgOR =prgOR &~0x2000 | V <<9 &0x2000;
setMapper(0); /* The misc2 value is required for prgAND by MMC3 and UNROM */
}
break;
}
}
static void reset(void) {
mapper =submapper <<4;
mapperFlags =0x0F;
misc =0;
misc2 =0;
prgOR =0x7FF0;
clock =command =output =1;
command =state =0;
setMapper(1);
}
static void power(void) {
int i;
for (i =0; i <16; i++) eeprom[i] =0;
reset();
}
static void close(void) {
if (WRAM)
FCEU_gfree(WRAM);
WRAM = NULL;
}
static void stateRestore(int version) {
setMapper(0);
}
void Mapper468_Init(CartInfo *info) {
submapper =info->submapper;
info->Reset =reset;
info->Power =power;
info->Close =close;
GameStateRestore =stateRestore;
WRAMSIZE =8192;
WRAM =(uint8*) FCEU_gmalloc(WRAMSIZE);
SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
AddExState(WRAM, WRAMSIZE, 0, "WRAM");
AddExState(stateRegs, ~0, 0, 0);
prevSFEXINDEX =SFEXINDEX;
}

45
src/boards/468_cnrom.h Normal file
View File

@ -0,0 +1,45 @@
#define CNROM_reg regByte
static void CNROM_sync () {
int OR =prgOR >>1;
if (mapperFlags &2) {
setprg16(0x8000, CNROM_reg[2] <<1 &0xE | mapperFlags &1 | OR &~0xF);
setprg16(0xC000, CNROM_reg[2] <<1 &0xE | mapperFlags &1 | OR &~0xF);
setchr8(CNROM_reg[0] &0x03);
} else {
OR >>=1;
setprg32(0x8000, CNROM_reg[2] &0x7 | OR &~0x7);
setchr8(CNROM_reg[0] &0x0F);
}
if (mapperFlags &8)
setmirror(mapperFlags &0x04? MI_H: MI_V);
else
setmirror(CNROM_reg[1] &0x10? MI_1: MI_0);
}
static DECLFW(CNROM_writeReg) {
switch(A &0xE000) {
case 0x8000: case 0xA000:
CNROM_reg[0] =V;
break;
case 0xE000:
CNROM_reg[2] =V;
break;
}
sync();
}
static DECLFW(BF9097_writeMirroring) {
CNROM_reg[1] =V;
sync();
}
void CNROM_BF9097_reset(uint8 clearRegs) { /* This strange mapper is used for both (C)NROM games and FireHawk. What an absurd combination!*/
sync =CNROM_sync;
SetWriteHandler(0x8000, 0xFFFF, CNROM_writeReg);
if (~mapperFlags &8)
SetWriteHandler(0x9000, 0x9FFF, BF9097_writeMirroring);
sync();
}
#undef CNROM_reg

73
src/boards/468_discrete.h Normal file
View File

@ -0,0 +1,73 @@
#define latch regByte[0]
static void ANROM_sync () {
int AND =prgAND >>2;
int OR =prgOR >>2;
setprg32(0x8000, latch &AND | OR &~AND);
setchr8(0);
setmirror(latch &0x10? MI_1: MI_0);
}
static void BNROM_sync () {
int AND =prgAND >>2;
int OR =prgOR >>2;
setprg32(0x8000, latch &AND | OR &~AND);
setchr8(0);
setmirror(mapperFlags &4? MI_H: MI_V);
}
static void GNROM_sync () {
int AND =prgAND >>2;
int OR =prgOR >>2 | (mapperFlags &4? 2: 0);
setprg32(0x8000, latch >>4 &AND | OR &~AND);
setchr8(latch &0x0F);
setmirror(mapper &1? MI_H: MI_V);
}
static void UNROM_sync () {
int AND =prgAND >>1;
int OR =prgOR >>1;
setprg16(0x8000, latch &AND | OR &~AND);
setprg16(0xC000, 0xFF &AND | OR &~AND);
setchr8(0);
setmirror(mapperFlags &4? MI_H: MI_V);
}
static DECLFW(DISCRETE_writeLatch) {
latch =V;
sync();
}
static DECLFW(Portopia_writeLatch) {
DISCRETE_writeLatch(A, A ==0xA000 && V ==0x00? 0x06: V); /* Strange hack, needed to get #282 "Portopia Serial Murder Case" on 852-in-1 running */
}
static DECLFW(ColorDreams_writeLatch) {
DISCRETE_writeLatch(A, V >>4 &0xF | V <<4 &0xF0); /* Sswap nibbles to mimic GNROM */
}
void ANROM_BNROM_reset(uint8 clearRegs) {
sync =mapperFlags &8? BNROM_sync: ANROM_sync;
prgAND =(mapper ==0x06 || mapper ==0x16)? 0x3F: mapperFlags &2? 0x0F: 0x1F;
SetWriteHandler(0x8000, 0xFFFF, DISCRETE_writeLatch);
latch =0;
sync();
}
void GNROM_reset(uint8 clearRegs) {
sync =GNROM_sync;
prgAND =mapperFlags &8? 0x07: 0x0F;
SetWriteHandler(0x8000, 0xFFFF, misc &0x10 && mapper &~0x10? DISCRETE_writeLatch: ColorDreams_writeLatch);
latch =0;
sync();
}
void UNROM_reset(uint8 clearRegs) {
sync =UNROM_sync;
prgAND =mapper ==0x0B || misc2 &0x10? 0x3F: mapperFlags &2? 0x0F: 0x1F;
SetWriteHandler(0x8000, 0xFFFF, mapper ==0x09 && mapperFlags ==0xE? Portopia_writeLatch: DISCRETE_writeLatch);
sync();
}
#undef latch

72
src/boards/468_fme7.h Normal file
View File

@ -0,0 +1,72 @@
#define FME7_reg regByte
#define FME7_index regByte[15]
#define FME7_counter regWord[0]
static void FME7_sync() {
int AND =mapperFlags &8? 0xFF: 0x7F;
switch(FME7_reg[8] &0xC0) {
case 0x00: case 0x80:
setprg8(0x6000, FME7_reg[0x8] &prgAND | prgOR &~prgAND);
break;
case 0x40:
/* Open Bus */
break;
case 0xC0:
setprg8r(0x10, 0x6000, 0);
break;
}
setprg8(0x8000, FME7_reg[0x9] &prgAND | prgOR &~prgAND);
setprg8(0xA000, FME7_reg[0xA] &prgAND | prgOR &~prgAND);
setprg8(0xC000, FME7_reg[0xB] &prgAND | prgOR &~prgAND);
setprg8(0xE000, prgAND | prgOR &~prgAND);
setchr1(0x0000, FME7_reg[0x0] &AND);
setchr1(0x0400, FME7_reg[0x1] &AND);
setchr1(0x0800, FME7_reg[0x2] &AND);
setchr1(0x0C00, FME7_reg[0x3] &AND);
setchr1(0x1000, FME7_reg[0x4] &AND);
setchr1(0x1400, FME7_reg[0x5] &AND);
setchr1(0x1800, FME7_reg[0x6] &AND);
setchr1(0x1C00, FME7_reg[0x7] &AND);
setmirror(FME7_reg[0xC] &3 ^(FME7_reg[0xC] &2? 0: 1));
}
static DECLFW(FME7_writeIndex) {
FME7_index =V &0xF;
}
static DECLFW(FME7_writeReg) {
switch(FME7_index) {
case 0xE:
FME7_counter =FME7_counter &0xFF00 |V;
break;
case 0xF:
FME7_counter =FME7_counter &0x00FF |V <<8;
break;
case 0xD:
X6502_IRQEnd(FCEU_IQEXT);
/* Falling through */
default:
FME7_reg[FME7_index] =V;
sync();
}
}
static void FP_FASTAPASS(1) FME7_cpuCycle(int a) {
while (a--) {
if (FME7_reg[0xD] &0x80 && !--FME7_counter && FME7_reg[0xD] &0x01) X6502_IRQBegin(FCEU_IQEXT);
}
}
void FME7_reset(uint8 clearRegs) {
sync =FME7_sync;
prgAND =mapperFlags &2? 0x0F: 0x1F;
MapIRQHook =FME7_cpuCycle;
SetWriteHandler(0x8000, 0x9FFF, FME7_writeIndex);
SetWriteHandler(0xA000, 0xBFFF, FME7_writeReg);
sync();
}
#undef FME7_reg
#undef FME7_index
#undef FME7_counter

31
src/boards/468_if12.h Normal file
View File

@ -0,0 +1,31 @@
#define IF12_reg regByte
static void IF12_sync () {
int AND =prgAND >>1;
int OR =prgOR >>1;
setprg16(0x8000, IF12_reg[1] &AND | OR &~AND);
setprg16(0xC000, 0xFF &AND | OR &~AND);
setchr8(IF12_reg[0] >>1 &0xF);
setmirror(IF12_reg[0] &1? MI_H: MI_V);
}
static DECLFW(IF12_writeReg) {
IF12_reg[A >>14 &1] =V;
sync();
}
void IF12_reset(uint8 clearRegs) {
sync =IF12_sync;
prgAND =mapperFlags &2? 0x0F: 0x1F;
SetWriteHandler(0x8000, 0xFFFF, IF12_writeReg);
sync();
}
void UNROM_IF12_reset(uint8 clearRegs) {
if (mapperFlags &8)
UNROM_reset(clearRegs);
else
IF12_reset(clearRegs);
}
#undef IF12_reg

46
src/boards/468_lf36.h Normal file
View File

@ -0,0 +1,46 @@
#define LF36_prg regByte[0]
#define LF36_irq regByte[1]
#define LF36_counter regWord[0]
static void LF36_sync () {
int OR =prgOR | mapperFlags &0x08;
setprg8(0x8000, 0x04 | OR);
setprg8(0xA000, 0x05 | OR);
setprg8(0xC000, LF36_prg &0x07 | OR);
setprg8(0xE000, 0x07 | OR);
setchr8(0);
setmirror(mapperFlags &4? MI_H: MI_V);
}
static DECLFW(LF36_writeReg) {
switch (A &0xE000) {
case 0x8000: LF36_irq =0; break;
case 0xA000: LF36_irq =1; break;
case 0XE000: LF36_prg =V; sync(); break;
}
}
static void FP_FASTAPASS(1) LF36_cpuCycle(int a) {
while (a--) {
if (LF36_irq) {
if (++LF36_counter &0x1000)
X6502_IRQBegin(FCEU_IQEXT);
else
X6502_IRQEnd(FCEU_IQEXT);
} else {
X6502_IRQEnd(FCEU_IQEXT);
LF36_counter =0;
}
}
}
void LF36_reset(uint8 clearRegs) {
sync =LF36_sync;
MapIRQHook =LF36_cpuCycle;
SetWriteHandler(0x8000, 0xFFFF, LF36_writeReg);
sync();
}
#undef LF36_prg
#undef LF36_irq
#undef LF36_counter

72
src/boards/468_mmc1.h Normal file
View File

@ -0,0 +1,72 @@
#define MMC1_reg regByte
#define MMC1_control regByte[0]
#define MMC1_chr0 regByte[1]
#define MMC1_chr1 regByte[2]
#define MMC1_prg regByte[3]
#define MMC1_shift regByte[4]
#define MMC1_count regByte[5]
#define MMC1_filter regByte[6]
static void MMC1_sync () {
int AND =prgAND >>1;
int OR =prgOR >>1 | (mapper &0x01? (MMC1_chr0 &0x10): (mapperFlags &0x06));
if (MMC1_control &0x08) { /* 16 KiB mode */
if (MMC1_control &0x04) { /* OR logic */
setprg16(0x8000, MMC1_prg &AND | OR &~AND);
setprg16(0xC000, 0xFF &AND | OR &~AND);
} else { /* AND logic */
setprg16(0x8000, 0 &AND | OR &~AND);
setprg16(0xC000, MMC1_prg &AND | OR &~AND);
}
} else
setprg32(0x8000, (MMC1_prg &AND | OR &~AND) >>1);
AND =mapper &0x01? 0x0F: 0x1F; /* SUROM needs to have the upper PRG bank bit, which is in the CHR registers, masked off */
if (MMC1_control &0x10) { /* 4 KiB mode */
setchr4(0x0000, MMC1_chr0 &AND);
setchr4(0x1000, MMC1_chr1 &AND);
} else /* 8 KiB mode */
setchr8(MMC1_chr0 >>1 &(AND >>1));
setmirror(MMC1_control &2? (MMC1_control &1? MI_H: MI_V): (MMC1_control &1? MI_1: MI_0));
}
static DECLFW(MMC1_writeReg) {
if (V &0x80) {
MMC1_shift =MMC1_count =0;
MMC1_control |=0x0C;
sync();
} else
if (!MMC1_filter) {
MMC1_shift |=(V &1) <<MMC1_count++;
if (MMC1_count ==5) {
MMC1_reg[A >>13 &3] =MMC1_shift;
MMC1_count =0;
MMC1_shift =0;
sync();
}
}
MMC1_filter =2;
}
static void FP_FASTAPASS(1) MMC1_cpuCycle(int a) {
while (a--) if (MMC1_filter) MMC1_filter--;
}
void MMC1_reset(uint8 clearRegs) {
sync =MMC1_sync;
MapIRQHook =MMC1_cpuCycle;
prgAND =mapperFlags &2? (mapperFlags &8? 0x07: 0x0F): 0x1F;
SetWriteHandler(0x8000, 0xFFFF, MMC1_writeReg);
if (clearRegs) MMC1_control =0x0C;
sync();
}
#undef MMC1_reg
#undef MMC1_control
#undef MMC1_chr0
#undef MMC1_chr1
#undef MMC1_prg
#undef MMC1_shift
#undef MMC1_count
#undef MMC1_filter

67
src/boards/468_mmc24.h Normal file
View File

@ -0,0 +1,67 @@
#define MMC24_reg regByte
static void MMC2_sync() {
setprg8(0x8000, MMC24_reg[0] &prgAND | prgOR &~prgAND);
setprg8(0xA000, 0xFD &prgAND | prgOR &~prgAND);
setprg8(0xC000, 0xFE &prgAND | prgOR &~prgAND);
setprg8(0xE000, 0xFF &prgAND | prgOR &~prgAND);
setchr4(0x0000, MMC24_reg[1 +MMC24_reg[6]]);
setchr4(0x1000, MMC24_reg[3 +MMC24_reg[7]]);
setmirror(MMC24_reg[5] &1? MI_H: MI_V);
}
static void MMC4_sync() {
int AND =prgAND >>1;
int OR =prgOR >>1;
setprg16(0x8000, MMC24_reg[0] &AND | OR &~AND);
setprg16(0xC000, 0xFF &AND | OR &~AND);
setchr4(0x0000, MMC24_reg[1 +MMC24_reg[6]]);
setchr4(0x1000, MMC24_reg[3 +MMC24_reg[7]]);
setmirror(MMC24_reg[5] &1? MI_H: MI_V);
}
static DECLFW(MMC24_writeReg) {
MMC24_reg[(A >>12) -0xA] =V;
sync();
}
static void FP_FASTAPASS(1) MMC24_ppuHook(uint32 A) {
uint8 l, h = A >> 8;
if (h >= 0x20 || ((h & 0xF) != 0xF)) return;
l = A & 0xF0;
if (h < 0x10) {
if (l == 0xD0) {
MMC24_reg[6] =0;
sync();
} else if (l == 0xE0) {
MMC24_reg[6] =1;
sync();
}
} else {
if (l == 0xD0) {
MMC24_reg[7] =0;
sync();
} else if (l == 0xE0) {
MMC24_reg[7] =1;
sync();
}
}
}
void MMC2_reset(uint8 clearRegs) {
sync =MMC2_sync;
prgAND =0x0F;
PPU_hook =MMC24_ppuHook;
SetWriteHandler(0xA000, 0xFFFF, MMC24_writeReg);
sync();
}
void MMC4_reset(uint8 clearRegs) {
sync =MMC4_sync;
prgAND =mapperFlags &2? 0x0F: 0x1F;
PPU_hook =MMC24_ppuHook;
SetWriteHandler(0xA000, 0xFFFF, MMC24_writeReg);
sync();
}
#undef MMC24_reg

80
src/boards/468_mmc3.h Normal file
View File

@ -0,0 +1,80 @@
#define MMC3_reg regByte
#define MMC3_index regByte[8]
#define MMC3_mirroring regByte[9]
#define MMC3_wram regByte[10]
#define MMC3_reload regByte[11]
#define MMC3_count regByte[12]
#define MMC3_irq regByte[13]
#define MMC3_lastReg regByte[14]
static void MMC3_sync () {
int chrAND =mapper &0x01? 0xFF: 0x7F;
int OR =prgOR | (misc2 &1? 12: 0);
setprg8(0x8000 ^(MMC3_index <<8 &0x4000), MMC3_reg[6] &prgAND | OR &~prgAND);
setprg8(0xA000, MMC3_reg[7] &prgAND | OR &~prgAND);
setprg8(0xC000 ^(MMC3_index <<8 &0x4000), 0xFE &prgAND | OR &~prgAND);
setprg8(0xE000, 0xFF &prgAND | OR &~prgAND);
setchr1(0x0000 ^(MMC3_index <<5 &0x1000),(MMC3_reg[0] &0xFE)&chrAND);
setchr1(0x0400 ^(MMC3_index <<5 &0x1000),(MMC3_reg[0] |0x01)&chrAND);
setchr1(0x0800 ^(MMC3_index <<5 &0x1000),(MMC3_reg[1] &0xFE)&chrAND);
setchr1(0x0C00 ^(MMC3_index <<5 &0x1000),(MMC3_reg[1] |0x01)&chrAND);
setchr1(0x1000 ^(MMC3_index <<5 &0x1000), MMC3_reg[2] &chrAND);
setchr1(0x1400 ^(MMC3_index <<5 &0x1000), MMC3_reg[3] &chrAND);
setchr1(0x1800 ^(MMC3_index <<5 &0x1000), MMC3_reg[4] &chrAND);
setchr1(0x1C00 ^(MMC3_index <<5 &0x1000), MMC3_reg[5] &chrAND);
if (mapper &2) switch(MMC3_mirroring &3) {
case 0: setmirror(MI_V); break;
case 1: setmirror(MI_H); break;
case 2: setmirror(MMC3_reg[MMC3_lastReg] &0x80? MI_1: MI_0); break;
case 3: setmirror(MI_1); break;
} else
setmirror(MMC3_mirroring &1? MI_H: MI_V);
}
static DECLFW(MMC3_writeReg) {
switch(A &0xE001) {
case 0x8000: MMC3_index =V; sync(); break;
case 0x8001: MMC3_reg[MMC3_index &7] =V; sync(); break;
case 0xA000: MMC3_mirroring =V; sync(); break;
case 0xA001: MMC3_wram =V; sync(); break;
case 0xC000: MMC3_reload =V; break;
case 0xC001: MMC3_count =0; break;
case 0xE000: MMC3_irq =0; X6502_IRQEnd(FCEU_IQEXT); break;
case 0xE001: MMC3_irq =1; break;
}
}
static void MMC3_horizontalBlanking(void) {
MMC3_count =!MMC3_count? MMC3_reload: --MMC3_count;
if (!MMC3_count && MMC3_irq) X6502_IRQBegin(FCEU_IQEXT);
}
static void FP_FASTAPASS(1) MMC3_ppuHook(uint32 A) {
A &=0x1FFF;
if (MMC3_index &0x80) A ^=0x1000;
if (A <0x1000)
MMC3_lastReg =A >>11;
else
MMC3_lastReg =(A >>10) -2;
if ((MMC3_mirroring &3) ==2) setmirror(MMC3_reg[MMC3_lastReg] &0x80? MI_1: MI_0);
}
void MMC3_reset(uint8 clearRegs) {
sync =MMC3_sync;
GameHBIRQHook =MMC3_horizontalBlanking;
if (mapper &2) PPU_hook =MMC3_ppuHook;
prgAND =mapperFlags &8? (mapperFlags &4? (mapperFlags &2? (misc2 &2? 0x07: 0x0F): 0x1F): 0x3F): 0x7F;
SetWriteHandler(0x8000, 0xFFFF, MMC3_writeReg);
MMC3_mirroring =1; /* "Legendary Games of NES' 509-in-1"'s menu runs as MMC3 with H mirroring and expects that setting to stay when running a mapper 206 game such as Legend of Valkyrie. */
sync();
}
#undef MMC3_reg
#undef MMC3_index
#undef MMC3_mirroring
#undef MMC3_wram
#undef MMC3_reload
#undef MMC3_count
#undef MMC3_irq
#undef MMC3_lastReg

29
src/boards/468_nanjing.h Normal file
View File

@ -0,0 +1,29 @@
#define NANJING_reg regByte
static void NANJING_sync () {
setprg32(0x8000, NANJING_reg[2] <<4 &0x30 | NANJING_reg[0] &0x0F | (NANJING_reg[3] &4? 0x00: 0x03) | prgOR >>2);
setchr8(0);
setmirror(mapperFlags &4? MI_H: MI_V);
}
static DECLFW(NANJING_writeReg) {
NANJING_reg[A >>8 &3] =V;
sync();
}
static void NANJING_horizontalBlanking(void) {
if (NANJING_reg[0] &0x80 && scanline <239) { /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
setchr4(0x0000, scanline >=127? 1: 0);
setchr4(0x1000, scanline >=127? 1: 0);
} else
setchr8(0);
}
void NANJING_reset(uint8 clearRegs) {
sync =NANJING_sync;
GameHBIRQHook = NANJING_horizontalBlanking;
SetWriteHandler(0x5000, 0x53FF, NANJING_writeReg);
sync();
}
#undef NANJING_reg

25
src/boards/468_vrc1.h Normal file
View File

@ -0,0 +1,25 @@
#define VRC1_reg regByte
static void VRC1_sync () {
setprg8(0x8000, VRC1_reg[0] &prgAND | prgOR &~prgAND);
setprg8(0xA000, VRC1_reg[2] &prgAND | prgOR &~prgAND);
setprg8(0xC000, VRC1_reg[4] &prgAND | prgOR &~prgAND);
setprg8(0xE000, 0xFF &prgAND | prgOR &~prgAND);
setchr4(0x0000, VRC1_reg[6] &0x0F | VRC1_reg[1] <<3 &0x10);
setchr4(0x1000, VRC1_reg[7] &0x0F | VRC1_reg[1] <<2 &0x10);
setmirror(VRC1_reg[1] &1? MI_H: MI_V);
}
static DECLFW(VRC1_writeReg) {
VRC1_reg[A >>12 &7] =V;
sync();
}
void VRC1_reset(uint8 clearRegs) {
sync =VRC1_sync;
prgAND =mapperFlags &8? (mapperFlags &4? (mapperFlags &2? 0x0F: 0x1F): 0x3F): 0x7F;
SetWriteHandler(0x8000, 0xFFFF, VRC1_writeReg);
sync();
}
#undef VRC1_reg

92
src/boards/468_vrc24.h Normal file
View File

@ -0,0 +1,92 @@
#define VRC24_prg regByte
#define VRC24_mirroring regByte[2]
#define VRC24_misc regByte[3]
#define VRC24_chr regWord
#define VRCIRQ_latch regByte[13]
#define VRCIRQ_mode regByte[14]
#define VRCIRQ_count regByte[15]
#define VRCIRQ_cycles regWord[8]
static void VRC24_sync() {
setprg8(0x8000 ^(VRC24_misc <<13 &0x4000), VRC24_prg[0] &prgAND | prgOR &~prgAND);
setprg8(0xA000, VRC24_prg[1] &prgAND | prgOR &~prgAND);
setprg8(0xC000 ^(VRC24_misc <<13 &0x4000), 0xFE &prgAND | prgOR &~prgAND);
setprg8(0xE000, 0xFF &prgAND | prgOR &~prgAND);
setchr1(0x0000, VRC24_chr[0]);
setchr1(0x0400, VRC24_chr[1]);
setchr1(0x0800, VRC24_chr[2]);
setchr1(0x0C00, VRC24_chr[3]);
setchr1(0x1000, VRC24_chr[4]);
setchr1(0x1400, VRC24_chr[5]);
setchr1(0x1800, VRC24_chr[6]);
setchr1(0x1C00, VRC24_chr[7]);
setmirror(VRC24_mirroring &3 ^(VRC24_mirroring &2? 0: 1));
}
static DECLFW(VRC24_writeReg) {
uint8 index;
A =A &0xF000 | (mapper &2? ((A &0xA? 1: 0) | (A &0x5? 2: 0)): ((A &0x5? 1: 0) | (A &0xA? 2: 0)));
switch (A &0xF000) {
case 0x8000: case 0xA000:
VRC24_prg[A >>13 &1] =V;
sync();
break;
case 0x9000:
if (~A &2)
VRC24_mirroring =V & (mapper &1? 3: 1);
else
if (~A &1 && mapper &1)
VRC24_misc =V;
sync();
break;
case 0xF000:
if (mapper &1) switch (A &3) {
case 0: VRCIRQ_latch =VRCIRQ_latch &0xF0 | V &0x0F; break;
case 1: VRCIRQ_latch =VRCIRQ_latch &0x0F | V <<4; break;
case 2: VRCIRQ_mode =V;
if (VRCIRQ_mode &0x02) {
VRCIRQ_count =VRCIRQ_latch;
VRCIRQ_cycles =341;
}
X6502_IRQEnd(FCEU_IQEXT);
break;
case 3: VRCIRQ_mode =VRCIRQ_mode &~0x02 | VRCIRQ_mode <<1 &0x02;
X6502_IRQEnd(FCEU_IQEXT);
break;
}
break;
default:
index =(A -0xB000) >>11 | A >>1 &1;
if (A &1)
VRC24_chr[index] =VRC24_chr[index] & 0x0F | V <<4;
else
VRC24_chr[index] =VRC24_chr[index] &~0x0F | V &0x0F;
sync();
break;
}
}
static void FP_FASTAPASS(1) VRCIRQ_cpuCycle(int a) {
while (a--) {
if (VRCIRQ_mode &0x02 && (VRCIRQ_mode &0x04 || (VRCIRQ_cycles -=3) <=0)) {
if (~VRCIRQ_mode &0x04) VRCIRQ_cycles +=341;
if (!++VRCIRQ_count) {
VRCIRQ_count =VRCIRQ_latch;
X6502_IRQBegin(FCEU_IQEXT);
}
}
}
}
void VRC24_reset(uint8 clearRegs) {
sync =VRC24_sync;
prgAND =mapperFlags &2? 0x0F: 0x1F;
if (mapper &1) MapIRQHook =VRCIRQ_cpuCycle;
SetWriteHandler(0x8000, 0xFFFF, VRC24_writeReg);
sync();
}
#undef VRC24_prg
#undef VRC24_mirroring
#undef VRC24_misc
#undef VRC24_chr

63
src/boards/468_vrc3.h Normal file
View File

@ -0,0 +1,63 @@
#define VRC3_prg regByte[0]
#define VRC3_latch regWord[0]
#define VRC3_mode regByte[1]
#define VRC3_count regWord[1]
static void VRC3_sync() {
int AND =prgAND >>1;
int OR =prgOR >>1;
setprg16(0x8000, VRC3_prg &AND | OR &~AND);
setprg16(0xC000, AND | OR &~AND);
setchr8(0);
setmirror(mapperFlags &4? MI_H: MI_V);
}
static DECLFW(VRC3_writeReg) {
int shift;
switch(A &0xF000) {
case 0x8000: case 0x9000: case 0xA000: case 0xB000:
V &=0xF;
shift =A >>10 &0xC;
VRC3_latch =VRC3_latch &~(0xF <<shift) | V <<shift;
break;
case 0xC000:
VRC3_mode =V;
if (VRC3_mode &0x02) VRC3_count =VRC3_latch;
X6502_IRQEnd(FCEU_IQEXT);
break;
case 0xD000:
VRC3_mode =VRC3_mode &~0x02 | VRC3_mode <<1 &0x02;
X6502_IRQEnd(FCEU_IQEXT);
break;
case 0xF000:
VRC3_prg =V;
sync();
break;
}
}
static void FP_FASTAPASS(1) VRC3_cpuCycle(int a) {
while (a--) {
int mask =VRC3_mode &0x04? 0xFF: 0xFFFF;
if (VRC3_mode &0x02) {
if ((VRC3_count &mask) ==mask) {
VRC3_count =VRC3_latch;
X6502_IRQBegin(FCEU_IQEXT);
} else
++VRC3_count;
}
}
}
void VRC3_reset(uint8 clearRegs) {
sync =VRC3_sync;
prgAND =0x0F;
MapIRQHook =VRC3_cpuCycle;
SetWriteHandler(0x8000, 0xFFFF, VRC3_writeReg);
sync();
}
#undef VRC3_prg
#undef VRC3_latch
#undef VRC3_mode
#undef VRC3_count

72
src/boards/468_vrc6.h Normal file
View File

@ -0,0 +1,72 @@
#define VRC6_chr regByte
#define VRC6_prg16 regByte[8]
#define VRC6_prg8 regByte[9]
#define VRC6_misc regByte[10]
static void VRC6_sync() {
int AND =prgAND >>1;
int OR =prgOR >>1;
setprg16(0x8000, VRC6_prg16 & AND | OR & ~AND);
setprg8(0xC000, VRC6_prg8 &prgAND | prgOR &~prgAND);
setprg8(0xE000, prgAND | prgOR &~prgAND);
setchr1(0x0000, VRC6_chr[0]);
setchr1(0x0400, VRC6_chr[1]);
setchr1(0x0800, VRC6_chr[2]);
setchr1(0x0C00, VRC6_chr[3]);
setchr1(0x1000, VRC6_chr[4]);
setchr1(0x1400, VRC6_chr[5]);
setchr1(0x1800, VRC6_chr[6]);
setchr1(0x1C00, VRC6_chr[7]);
setmirror((VRC6_misc &0xC ^(VRC6_misc &0x8? 0: 0x4)) >>2);
}
static DECLFW(VRC6_writeReg) {
uint8 index;
switch (A &0xF003) {
case 0x8000: case 0x8001: case 0x8002: case 0x8003:
VRC6_prg16 =V;
sync();
break;
case 0xB003:
VRC6_misc =V;
sync();
break;
case 0xC000: case 0xC001: case 0xC002: case 0xC003:
VRC6_prg8 =V;
sync();
break;
case 0xD000: case 0xD001: case 0xD002: case 0xD003: case 0xE000: case 0xE001: case 0xE002: case 0xE003:
index =(A -0xD000) >>10 | A &3;
VRC6_chr[index] =V;
sync();
break;
case 0xF000:
VRCIRQ_latch =V;
break;
case 0xF001:
VRCIRQ_mode =V;
if (VRCIRQ_mode &0x02) {
VRCIRQ_count =VRCIRQ_latch;
VRCIRQ_cycles =341;
}
X6502_IRQEnd(FCEU_IQEXT);
break;
case 0xF002:
VRCIRQ_mode =VRCIRQ_mode &~0x02 | VRCIRQ_mode <<1 &0x02;
X6502_IRQEnd(FCEU_IQEXT);
break;
}
}
void VRC6_reset(uint8 clearRegs) {
sync =VRC6_sync;
prgAND =mapperFlags &2? 0x0F: 0x1F;
MapIRQHook =VRCIRQ_cpuCycle;
SetWriteHandler(0x8000, 0xFFFF, VRC6_writeReg);
sync();
}
#undef VRC6_chr
#undef VRC6_prg16
#undef VRC6_prg8
#undef VRC6_misc

82
src/boards/468_vrc7.h Normal file
View File

@ -0,0 +1,82 @@
#define VRC7_chr regByte
#define VRC7_prg0 regByte[8]
#define VRC7_prg1 regByte[9]
#define VRC7_prg2 regByte[10]
#define VRC7_misc regByte[11]
static void VRC7_sync() {
setprg8(0x8000, VRC7_prg0 &prgAND | prgOR &~prgAND);
setprg8(0xA000, VRC7_prg1 &prgAND | prgOR &~prgAND);
setprg8(0xC000, VRC7_prg2 &prgAND | prgOR &~prgAND);
setprg8(0xE000, prgAND | prgOR &~prgAND);
setchr1(0x0000, VRC7_chr[0]);
setchr1(0x0400, VRC7_chr[1]);
setchr1(0x0800, VRC7_chr[2]);
setchr1(0x0C00, VRC7_chr[3]);
setchr1(0x1000, VRC7_chr[4]);
setchr1(0x1400, VRC7_chr[5]);
setchr1(0x1800, VRC7_chr[6]);
setchr1(0x1C00, VRC7_chr[7]);
setmirror(VRC7_misc &3 ^(VRC7_misc &2? 0: 1));
}
static DECLFW(VRC7_writeReg) {
uint8 index;
A =A &0xF000 | (A &0x18? 1: 0) | (A &0x20? 2: 0);
switch (A &0xF003) {
case 0x8000:
VRC7_prg0 =V;
sync();
break;
case 0x8001:
VRC7_prg1 =V;
sync();
break;
case 0x9000:
VRC7_prg2 =V;
sync();
break;
case 0x9001: case 0x9002:
/* sound */
break;
case 0xA000: case 0xA001: case 0xB000: case 0xB001: case 0xC000: case 0xC001: case 0xD000: case 0xD001:
index =(A -0xA000) >>11 | A &1;
VRC7_chr[index] =V;
sync();
break;
case 0xE000:
VRC7_misc =V;
sync();
break;
case 0xE001:
VRCIRQ_latch =V;
break;
case 0xF000:
VRCIRQ_mode =V;
if (VRCIRQ_mode &0x02) {
VRCIRQ_count =VRCIRQ_latch;
VRCIRQ_cycles =341;
}
X6502_IRQEnd(FCEU_IQEXT);
break;
case 0xF001:
VRCIRQ_mode =VRCIRQ_mode &~0x02 | VRCIRQ_mode <<1 &0x02;
X6502_IRQEnd(FCEU_IQEXT);
break;
}
}
void VRC7_reset(uint8 clearRegs) {
sync =VRC7_sync;
prgAND =mapperFlags &8? (mapperFlags &4? (mapperFlags &2? 0x0F: 0x1F): 0x3F): 0x7F;
MapIRQHook =VRCIRQ_cpuCycle;
SetWriteHandler(0x8000, 0xFFFF, VRC7_writeReg);
sync();
}
#undef VRC7_chr
#undef VRC7_prg0
#undef VRC7_prg1
#undef VRC7_prg2
#undef VRC7_misc

47
src/drivers/libretro/libretro-common/include/libretro.h
View File

@ -283,6 +283,14 @@ enum retro_language
RETRO_LANGUAGE_HEBREW = 21,
RETRO_LANGUAGE_ASTURIAN = 22,
RETRO_LANGUAGE_FINNISH = 23,
RETRO_LANGUAGE_INDONESIAN = 24,
RETRO_LANGUAGE_SWEDISH = 25,
RETRO_LANGUAGE_UKRAINIAN = 26,
RETRO_LANGUAGE_CZECH = 27,
RETRO_LANGUAGE_CATALAN_VALENCIA = 28,
RETRO_LANGUAGE_CATALAN = 29,
RETRO_LANGUAGE_BRITISH_ENGLISH = 30,
RETRO_LANGUAGE_HUNGARIAN = 31,
RETRO_LANGUAGE_LAST,
/* Ensure sizeof(enum) == sizeof(int) */
@ -1753,6 +1761,12 @@ enum retro_mod
* the frontend is attempting to call retro_run().
*/
#define RETRO_ENVIRONMENT_GET_SAVESTATE_CONTEXT (72 | RETRO_ENVIRONMENT_EXPERIMENTAL)
/* int * --
* Tells the core about the context the frontend is asking for savestate.
* (see enum retro_savestate_context)
*/
/* VFS functionality */
/* File paths:
@ -2990,6 +3004,35 @@ enum retro_pixel_format
RETRO_PIXEL_FORMAT_UNKNOWN = INT_MAX
};
enum retro_savestate_context
{
/* Standard savestate written to disk. */
RETRO_SAVESTATE_CONTEXT_NORMAL = 0,
/* Savestate where you are guaranteed that the same instance will load the save state.
* You can store internal pointers to code or data.
* It's still a full serialization and deserialization, and could be loaded or saved at any time.
* It won't be written to disk or sent over the network.
*/
RETRO_SAVESTATE_CONTEXT_RUNAHEAD_SAME_INSTANCE = 1,
/* Savestate where you are guaranteed that the same emulator binary will load that savestate.
* You can skip anything that would slow down saving or loading state but you can not store internal pointers.
* It won't be written to disk or sent over the network.
* Example: "Second Instance" runahead
*/
RETRO_SAVESTATE_CONTEXT_RUNAHEAD_SAME_BINARY = 2,
/* Savestate used within a rollback netplay feature.
* You should skip anything that would unnecessarily increase bandwidth usage.
* It won't be written to disk but it will be sent over the network.
*/
RETRO_SAVESTATE_CONTEXT_ROLLBACK_NETPLAY = 3,
/* Ensure sizeof() == sizeof(int). */
RETRO_SAVESTATE_CONTEXT_UNKNOWN = INT_MAX
};
struct retro_message
{
const char *msg; /* Message to be displayed. */
@ -3461,6 +3504,10 @@ struct retro_core_option_definition
const char *default_value;
};
#ifdef __PS3__
#undef local
#endif
struct retro_core_options_intl
{
/* Pointer to an array of retro_core_option_definition structs

3
src/drivers/libretro/libretro.c
View File

@ -2240,8 +2240,9 @@ static void check_variables(bool startup)
void add_powerpad_input(unsigned port, uint32 variant, uint32_t *ppdata)
{
unsigned k;
const uint32_t* map = (variant == RETRO_DEVICE_POWERPADA) ? powerpadamap : powerpadbmap;
for (unsigned k = 0 ; k < 12 ; k++)
for (k = 0 ; k < 12 ; k++)
if (input_cb(0, RETRO_DEVICE_KEYBOARD, 0, map[k]))
*ppdata |= (1 << k);
}

10175
src/drivers/libretro/libretro_core_options_intl.h
View File

File diff suppressed because it is too large Load Diff

1
src/ines.c
View File

@ -831,6 +831,7 @@ INES_BOARD_BEGIN()
INES_BOARD( "ET-120", 465, Mapper465_Init )
INES_BOARD( "Keybyte Computer", 466, Mapper466_Init )
INES_BOARD( "47-2", 467, Mapper467_Init )
INES_BOARD( "BlazePro CPLD", 468, Mapper468_Init )
INES_BOARD( "SA-9602B", 513, SA9602B_Init )
INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init )
INES_BOARD( "DANCE2000", 518, UNLD2000_Init )

1
src/ines.h
View File

@ -339,6 +339,7 @@ void Mapper464_Init(CartInfo *);
void Mapper465_Init(CartInfo *);
void Mapper466_Init(CartInfo *);
void Mapper467_Init(CartInfo *);
void Mapper468_Init(CartInfo *);
void Mapper516_Init(CartInfo *);
void Mapper523_Init(CartInfo *);
void Mapper533_Init(CartInfo *);

2
src/state.c
View File

@ -45,7 +45,7 @@ static void (*SPostSave)(void);
/* static int SaveStateStatus[10]; */
static SFORMAT SFMDATA[64];
static int SFEXINDEX;
int SFEXINDEX;
#define RLSB FCEUSTATE_RLSB /* 0x80000000 */