libretro/vice-libretro
1
0 Fork 0
mirror of https://github.com/libretro/vice-libretro.git synced 2026-11-07 11:16:00 -10:00
Code Issues Packages Projects Releases Wiki Activity

Update 3.9

Browse Source
This commit is contained in:
sonninnos authored and sonninnos committed 2025-02-23 18:19:26 +02:00
1 parent 67b18766e5
commit a072441b2f
965 files changed
+33855 -18537
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.common
+5
View File
@@ -216,6 +216,7 @@ SOURCES_C_JOYPORT := \
$(EMU)/joyport/paperclip64.c \
$(EMU)/joyport/paperclip64e.c \
$(EMU)/joyport/paperclip64sc.c \
$(EMU)/joyport/powerpad.c \
$(EMU)/joyport/protopad.c \
$(EMU)/joyport/rushware_keypad.c \
$(EMU)/joyport/sampler2bit.c \
@@ -232,6 +233,7 @@ SOURCES_C_USERPORT := \
$(EMU)/userport/userport_8bss.c \
$(EMU)/userport/userport_dac.c \
$(EMU)/userport/userport_diag_586220_harness.c \
$(EMU)/userport/userport_diag_pin.c \
$(EMU)/userport/userport_digimax.c \
$(EMU)/userport/userport_hks_joystick.c \
$(EMU)/userport/userport_hummer_joystick.c \
@@ -257,6 +259,7 @@ SOURCES_C_C64_CART := \
$(EMU)/c64/cart/blackbox4.c \
$(EMU)/c64/cart/blackbox8.c \
$(EMU)/c64/cart/blackbox9.c \
$(EMU)/c64/cart/bmpdataturbo.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
@@ -345,6 +348,8 @@ SOURCES_C_C64_CART := \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/turtlegraphics.c \
$(EMU)/c64/cart/uc1.c \
$(EMU)/c64/cart/uc2.c \
$(EMU)/c64/cart/rexramfloppy.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
Makefile.xcbm2
+5 -3
View File
@@ -46,28 +46,30 @@ SOURCES_CXX += \
SOURCES_C += \
$(SOURCES_C_COMMON) \
$(EMU)/cbm2/cbm2-cmdline-options.c \
$(EMU)/cbm2/cbm2-resources.c \
$(EMU)/cbm2/cbm2-stubs.c \
$(EMU)/cbm2/cbm2.c \
$(EMU)/cbm2/cbm2acia1.c \
$(EMU)/cbm2/cbm2bus.c \
$(EMU)/cbm2/cbm2cia1.c \
$(EMU)/cbm2/cbm2-cmdline-options.c \
$(EMU)/cbm2/cbm2cpu.c \
$(EMU)/cbm2/cbm2datasette.c \
$(EMU)/cbm2/cbm2drive.c \
$(EMU)/cbm2/cbm2export.c \
$(EMU)/cbm2/cbm2iec.c \
$(EMU)/cbm2/cbm2io.c \
$(EMU)/cbm2/cbm2mem.c \
$(EMU)/cbm2/cbm2memsnapshot.c \
$(EMU)/cbm2/cbm2model.c \
$(EMU)/cbm2/cbm2printer.c \
$(EMU)/cbm2/cbm2-resources.c \
$(EMU)/cbm2/cbm2rom.c \
$(EMU)/cbm2/cbm2romset.c \
$(EMU)/cbm2/cbm2sound.c \
$(EMU)/cbm2/cbm2-stubs.c \
$(EMU)/cbm2/cbm2tpi1.c \
$(EMU)/cbm2/cbm2tpi2.c \
$(EMU)/cbm2/cbm2video.c \
$(EMU)/cbm2/cart/cbm2-generic.c \
$(EMU)/cbm2/cart/cbm2cart.c \
$(EMU)/cbm2/cart/debugcart.c \
$(EMU)/crtc/crtc-cmdline-options.c \
Makefile.xcbm5x0
+10 -8
View File
@@ -48,28 +48,30 @@ SOURCES_CXX += \
SOURCES_C += \
$(SOURCES_C_COMMON) \
$(EMU)/cbm2/cbm5x0.c \
$(EMU)/cbm2/cbm2-cmdline-options.c \
$(EMU)/cbm2/cbm2acia1.c \
$(EMU)/cbm2/cbm2bus.c \
$(EMU)/cbm2/cbm5x0cia1.c \
$(EMU)/cbm2/cbm2-cmdline-options.c \
$(EMU)/cbm2/cbm2cpu.c \
$(EMU)/cbm2/cbm2datasette.c \
$(EMU)/cbm2/cbm2drive.c \
$(EMU)/cbm2/cbm2export.c \
$(EMU)/cbm2/cbm2iec.c \
$(EMU)/cbm2/cbm2io.c \
$(EMU)/cbm2/cbm5x0mem.c \
$(EMU)/cbm2/cbm2memsnapshot.c \
$(EMU)/cbm2/cbm2model.c \
$(EMU)/cbm2/cbm5x0printer.c \
$(EMU)/cbm2/cbm5x0-resources.c \
$(EMU)/cbm2/cbm5x0-stubs.c \
$(EMU)/cbm2/cbm5x0rom.c \
$(EMU)/cbm2/cbm2romset.c \
$(EMU)/cbm2/cbm2sound.c \
$(EMU)/cbm2/cbm2tpi1.c \
$(EMU)/cbm2/cbm2tpi2.c \
$(EMU)/cbm2/cbm5x0-resources.c \
$(EMU)/cbm2/cbm5x0-stubs.c \
$(EMU)/cbm2/cbm5x0.c \
$(EMU)/cbm2/cbm5x0cia1.c \
$(EMU)/cbm2/cbm5x0printer.c \
$(EMU)/cbm2/cbm5x0mem.c \
$(EMU)/cbm2/cbm5x0rom.c \
$(EMU)/cbm2/cbm5x0video.c \
$(EMU)/cbm2/cart/cbm2-generic.c \
$(EMU)/cbm2/cart/cbm2cart.c \
$(EMU)/cbm2/cart/debugcart.c \
$(EMU)/datasette/datasette.c \
Makefile.xplus4
+3 -2
View File
@@ -81,10 +81,8 @@ SOURCES_C += \
$(EMU)/drive/iecieee/iecieee.c \
$(EMU)/drive/iecieee/via2d.c \
$(SOURCES_C_JOYPORT) \
$(EMU)/plus4/digiblaster.c \
$(EMU)/plus4/plus4-cmdline-options.c \
$(EMU)/plus4/plus4-resources.c \
$(EMU)/plus4/plus4-sidcart.c \
$(EMU)/plus4/plus4-stubs.c \
$(EMU)/plus4/plus4.c \
$(EMU)/plus4/plus4acia.c \
@@ -92,6 +90,7 @@ SOURCES_C += \
$(EMU)/plus4/plus4cpu.c \
$(EMU)/plus4/plus4datasette.c \
$(EMU)/plus4/plus4drive.c \
$(EMU)/plus4/plus4export.c \
$(EMU)/plus4/plus4iec.c \
$(EMU)/plus4/plus4io.c \
$(EMU)/plus4/plus4mem.c \
@@ -112,10 +111,12 @@ SOURCES_C += \
$(EMU)/plus4/plus4tcbm.c \
$(EMU)/plus4/plus4video.c \
$(EMU)/plus4/cart/debugcart.c \
$(EMU)/plus4/cart/digiblaster.c \
$(EMU)/plus4/cart/jacint1mb.c \
$(EMU)/plus4/cart/magiccart.c \
$(EMU)/plus4/cart/multicart.c \
$(EMU)/plus4/cart/plus4-generic.c \
$(EMU)/plus4/cart/plus4-sidcart.c \
$(EMU)/plus4/cart/plus4cart.c \
$(EMU)/plus4/ted-badline.c \
$(EMU)/plus4/ted-cmdline-options.c \
Makefile.xvic
+4
View File
@@ -133,6 +133,9 @@ SOURCES_C += \
$(EMU)/vic20/cart/ioramcart.c \
$(EMU)/vic20/cart/mascuerade-stubs.c \
$(EMU)/vic20/cart/megacart.c \
$(EMU)/vic20/cart/mikroassembler.c \
$(EMU)/vic20/cart/rabbit.c \
$(EMU)/vic20/cart/superexpander.c \
$(EMU)/vic20/cart/ultimem.c \
$(EMU)/vic20/cart/vic-fp.c \
$(EMU)/vic20/cart/vic20-generic.c \
@@ -152,6 +155,7 @@ SOURCES_C += \
$(EMU)/vic20/vic.c \
$(EMU)/vic20/vic20-cmdline-options.c \
$(EMU)/vic20/vic20-resources.c \
$(EMU)/vic20/vic20-stubs.c \
$(EMU)/vic20/vic20.c \
$(EMU)/vic20/vic20bus.c \
$(EMU)/vic20/vic20cpu.c \
README.md
+23 -22
View File
@@ -1,8 +1,8 @@
# VICE LIBRETRO
Port of VICE, the Versatile Commodore Emulator 3.8
Port of VICE, the Versatile Commodore Emulator 3.9
Source base: [https://sourceforge.net/projects/vice-emu/files/releases/vice-3.8.tar.gz](https://sourceforge.net/projects/vice-emu/files/releases/vice-3.8.tar.gz)
Source base: [https://sourceforge.net/projects/vice-emu/files/releases/vice-3.9.tar.gz](https://sourceforge.net/projects/vice-emu/files/releases/vice-3.9.tar.gz)
Supported platforms: Linux, Windows, Apple, Android, emscripten, Switch, Vita
@@ -265,7 +265,8 @@ ndk-build
## VICE readme
VICE 3.8 Dec 2023
VICE 3.9 Dez 2024
_______________
@@ -290,7 +291,7 @@ ndk-build
----------------------------------------------------------------------------
This is version 3.8 of VICE, the multi-platform C64, C128, VIC20,
This is version 3.9 of VICE, the multi-platform C64, C128, VIC20,
PET, PLUS4 and CBM-II emulator. This version can be compiled for
Win32, macOS, Haiku and for most Unix systems provided with the X Window
System version 11, R5 or later.
@@ -457,24 +458,24 @@ ndk-build
VICE, the Versatile Commodore Emulator
Core Team Members:
1999-2023 Pottendo
2005-2023 Marco van den Heuvel
2007-2023 Fabrizio Gennari
2009-2023 Groepaz
2009-2023 Errol Smith
2009-2023 Ingo Korb
2010-2023 Olaf Seibert
2011-2023 Marcus Sutton
2011-2023 Kajtar Zsolt
2016-2023 AreaScout
2016-2023 Bas Wassink
2017-2023 Michael C. Martin
2018-2023 Christopher Phillips
2019-2023 David Hogan
2020-2023 Empathic Qubit
2020-2023 Roberto Muscedere
2021-2023 June Tate-Gans
2021-2023 Pablo Roldan
1999-2024 Pottendo
2005-2024 Marco van den Heuvel
2007-2024 Fabrizio Gennari
2009-2024 Groepaz
2009-2024 Errol Smith
2009-2024 Ingo Korb
2010-2024 Olaf Seibert
2011-2024 Marcus Sutton
2011-2024 Kajtar Zsolt
2016-2024 AreaScout
2016-2024 Bas Wassink
2017-2024 Michael C. Martin
2018-2024 Christopher Phillips
2019-2024 David Hogan
2020-2024 Empathic Qubit
2020-2024 Roberto Muscedere
2021-2024 June Tate-Gans
2021-2024 Pablo Roldan
Inactive/Ex Team Members:
2011-2016 Stefan Haubenthal
include/config.h
+1 -1
View File
@@ -148,7 +148,7 @@
#define PACKAGE_NAME "VICE"
/* Define to the version of this package. */
#define PACKAGE_VERSION "3.8"
#define PACKAGE_VERSION "3.9"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
include/embedded/vicii_lemon64_vpl.h
+20
View File
@@ -0,0 +1,20 @@
/* Autogenerated file, do not edit */
unsigned char vicii_lemon64_vpl[] = {
0x00, 0x00, 0x00, 0x0,
0xff, 0xff, 0xff, 0x0,
0x8b, 0x3e, 0x42, 0x0,
0x7c, 0xd3, 0xcd, 0x0,
0x97, 0x46, 0xa0, 0x0,
0x5c, 0xb2, 0x54, 0x0,
0x3c, 0x39, 0xa9, 0x0,
0xe3, 0xe7, 0x6e, 0x0,
0x94, 0x57, 0x31, 0x0,
0x59, 0x3c, 0x07, 0x0,
0xcd, 0x77, 0x7c, 0x0,
0x50, 0x50, 0x50, 0x0,
0x83, 0x83, 0x83, 0x0,
0xaf, 0xf8, 0xa6, 0x0,
0x7f, 0x7d, 0xf4, 0x0,
0xba, 0xba, 0xba, 0x0,
16 };
libretro/libretro-core.c
+20 -5
View File
@@ -3371,6 +3371,7 @@ static void retro_set_core_options()
{ "deekay", "Deekay/Crest" },
{ "frodo", "Frodo" },
{ "godot", "Godot" },
{ "lemon64", "Lemon64" },
{ "palette", "PALette" },
{ "palette_6569R1_v1r", "PALette 6569R1" },
{ "palette_6569R5_v1r", "PALette 6569R5" },
@@ -5607,7 +5608,7 @@ static void update_variables(void)
log_cb(RETRO_LOG_INFO, "Updating variables, UI finalized = %d\n", retro_ui_finalized);
#endif
#if !defined(__XPET__)
#if !defined(__XPET__) && !defined(__X64DTV__)
var.key = "vice_cartridge";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -5641,6 +5642,7 @@ static void update_variables(void)
}
#endif
#if !defined(__X64DTV__)
var.key = "vice_autostart";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -5663,7 +5665,9 @@ static void update_variables(void)
vice_opt.AutostartWarp = autostartwarp;
}
#endif
#if !defined(__X64DTV__)
var.key = "vice_autoloadwarp";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -5690,21 +5694,23 @@ static void update_variables(void)
resources_set_int("AutostartWarp", vice_opt.AutostartWarp);
}
#if !defined(__XSCPU64__) && !defined(__X64DTV__)
#if !defined(__XSCPU64__)
/* Silently restore tape sounds when autoloadwarp is disabled */
if (retro_ui_finalized && vice_opt.DatasetteSound &&
(!(opt_autoloadwarp & AUTOLOADWARP_TAPE) && !(opt_autoloadwarp & AUTOLOADWARP_MUTE)))
resources_set_int("DatasetteSound", vice_opt.DatasetteSound);
#endif
#if defined(__X64__) || defined(__X64SC__) || defined(__X64DTV__) || defined(__X128__) || defined(__XSCPU64__) || defined(__XCBM5x0__) || defined(__XVIC__) || defined(__XPLUS4__)
#if defined(__X64__) || defined(__X64SC__) || defined(__X128__) || defined(__XSCPU64__) || defined(__XCBM5x0__) || defined(__XVIC__) || defined(__XPLUS4__)
/* Silently restore audio leak when autoloadwarp is disabled */
if (retro_ui_finalized && vice_opt.AudioLeak &&
(!opt_autoloadwarp || opt_autoloadwarp & AUTOLOADWARP_MUTE))
resources_set_int(AUDIOLEAK_RESOURCE, vice_opt.AudioLeak);
#endif
}
#endif
#if !defined(__X64DTV__)
var.key = "vice_floppy_multidrive";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -5730,6 +5736,7 @@ static void update_variables(void)
vice_opt.AttachDevice8Readonly = readonly;
}
#endif
#if defined(__X64__) || defined(__X64SC__) || defined(__X128__)
var.key = "vice_easyflash_write_protection";
@@ -5748,6 +5755,7 @@ static void update_variables(void)
}
#endif
#if !defined(__X64DTV__)
var.key = "vice_work_disk";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -5800,8 +5808,9 @@ static void update_variables(void)
if (!strcmp(var.value, "disabled")) vice_opt.VirtualDevices = 0;
else vice_opt.VirtualDevices = 1;
}
#endif
#if !defined(__XPET__) && !defined(__XPLUS4__) && !defined(__XVIC__)
#if !defined(__XPET__) && !defined(__XPLUS4__) && !defined(__XVIC__) && !defined(__X64DTV__)
var.key = "vice_warp_boost";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -6348,6 +6357,7 @@ static void update_variables(void)
vice_opt.SidEngine = sid_engine;
}
#if !defined(__X64DTV__)
var.key = "vice_sid_model";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -6402,6 +6412,7 @@ static void update_variables(void)
vice_opt.SidExtra = sid_extra;
}
#endif
var.key = "vice_resid_sampling";
var.value = NULL;
@@ -6462,6 +6473,7 @@ static void update_variables(void)
vice_opt.SidResidFilterBias = val;
}
#if !defined(__X64DTV__)
var.key = "vice_resid_8580filterbias";
var.value = NULL;
@@ -6475,6 +6487,7 @@ static void update_variables(void)
vice_opt.SidResid8580FilterBias = val;
}
#endif
#endif
#if defined(__X64__) || defined(__X64SC__) || defined(__X128__)
var.key = "vice_sfx_sound_expander";
@@ -6801,7 +6814,7 @@ static void update_variables(void)
sprintf(vice_opt.ExternalPalette, "%s", var.value);
}
#else
#elif !defined(__X64DTV__)
var.key = "vice_external_palette";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -7136,6 +7149,7 @@ static void update_variables(void)
else opt_keyboard_pass_through = true;
}
#if !defined(__X64DTV__)
var.key = "vice_reset";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -7145,6 +7159,7 @@ static void update_variables(void)
else if (!strcmp(var.value, "hard")) opt_reset_type = 2;
else if (!strcmp(var.value, "freeze")) opt_reset_type = 3;
}
#endif
var.key = "vice_vkbd_theme";
var.value = NULL;
retrodep/cart/cpmcart.c
+10
View File
@@ -325,3 +325,13 @@ int cpmcart_snapshot_read_module(snapshot_t *s)
{
return -1;
}
int cpmcart_enable(void)
{
return 0;
}
int cpmcart_disable(void)
{
return 0;
}
retrodep/embedded/c64embedded.c
+2
View File
@@ -50,6 +50,7 @@
#include "vicii_deekay_vpl.h"
#include "vicii_frodo_vpl.h"
#include "vicii_godot_vpl.h"
#include "vicii_lemon64_vpl.h"
#include "vicii_palette_vpl.h"
#include "vicii_palette_6569R1_v1r_vpl.h"
#include "vicii_palette_6569R5_v1r_vpl.h"
@@ -108,6 +109,7 @@ static embedded_palette_t palette_files[] = {
{ "deekay", "deekay.vpl", 16, vicii_deekay_vpl },
{ "frodo", "frodo.vpl", 16, vicii_frodo_vpl },
{ "godot", "godot.vpl", 16, vicii_godot_vpl },
{ "lemon64", "lemon64.vpl", 16, vicii_lemon64_vpl },
{ "palette", "palette.vpl", 16, vicii_palette_vpl },
{ "palette_6569R1_v1r", "palette_6569R1_v1r.vpl", 16, vicii_palette_6569R1_v1r_vpl },
{ "palette_6569R5_v1r", "palette_6569R5_v1r.vpl", 16, vicii_palette_6569R5_v1r_vpl },
retrodep/monitor/monitor.c
+6
View File
@@ -878,3 +878,9 @@ void monitor_resources_shutdown(void)
void monitor_cpu_type_set_value(int searchcpu)
{
}
/* 3.9 -> */
bool monitor_is_inside_monitor(void)
{
return false;
}
retrodep/snapshot_stream.c
+9 -9
View File
@@ -24,7 +24,7 @@
/* #define DEBUG_SNAPSHOT */
#ifdef DEBUG_SNAPSHOT
#define DBG(x) printf x
#define DBG(x) log_printf x
#else
#define DBG(x)
#endif
@@ -1126,7 +1126,7 @@ snapshot_module_t *snapshot_module_open(snapshot_t *s, const char *name, uint8_t
if (snapshot_fseek(s->file, s->first_module_offset, SEEK_SET) < 0) {
snapshot_error = SNAPSHOT_FIRST_MODULE_NOT_FOUND_ERROR;
DBG(("snapshot_module_open error: name: '%s' NOT found\n", name));
DBG(("snapshot_module_open error: name: '%s' NOT found", name));
return NULL;
}
@@ -1136,7 +1136,7 @@ snapshot_module_t *snapshot_module_open(snapshot_t *s, const char *name, uint8_t
m->offset = s->first_module_offset;
DBG(("snapshot_module_open name: '%s'\n", name));
DBG(("snapshot_module_open name: '%s'", name));
/* Search for the module name. This is quite inefficient, but I don't
think we care. */
@@ -1164,37 +1164,37 @@ snapshot_module_t *snapshot_module_open(snapshot_t *s, const char *name, uint8_t
}
m->size_offset = snapshot_ftell(s->file) - sizeof(uint32_t);
DBG(("snapshot_module_open name: '%s', version %u.%u found\n", name, *major_version_return, *minor_version_return));
DBG(("snapshot_module_open name: '%s', version %u.%u found", name, *major_version_return, *minor_version_return));
return m;
fail:
snapshot_fseek(s->file, s->first_module_offset, SEEK_SET);
lib_free(m);
DBG(("snapshot_module_open error: name: '%s' NOT found\n", name));
DBG(("snapshot_module_open error: name: '%s' NOT found", name));
return NULL;
}
int snapshot_module_close(snapshot_module_t *m)
{
DBG(("snapshot_module_close name: '%s'\n", current_module));
DBG(("snapshot_module_close name: '%s'", current_module));
/* Backpatch module size if writing. */
if (m->write_mode
&& (snapshot_fseek(m->file, m->size_offset, SEEK_SET) < 0
|| snapshot_write_dword(m->file, m->size) < 0)) {
snapshot_error = SNAPSHOT_MODULE_CLOSE_ERROR;
DBG(("snapshot_module_close error\n"));
DBG(("snapshot_module_close error"));
return -1;
}
/* Skip module. */
if (snapshot_fseek(m->file, m->offset + m->size, SEEK_SET) < 0) {
snapshot_error = SNAPSHOT_MODULE_SKIP_ERROR;
DBG(("snapshot_module_close error\n"));
DBG(("snapshot_module_close error"));
return -1;
}
lib_free(m);
DBG(("snapshot_module_close ok\n"));
DBG(("snapshot_module_close ok"));
return 0;
}
retrodep/ui.c
+6 -2
View File
@@ -17,6 +17,7 @@
#include "sid.h"
#include "sid-resources.h"
#include "util.h"
#include "videoarch.h"
#include "keyboard.h"
#include "driverom.h"
#if !defined(__XCBM5x0__)
@@ -218,6 +219,11 @@ void ui_action_trigger(int action)
{
}
video_canvas_t *ui_get_active_canvas(void)
{
return NULL;
}
extern int log_resources_set_int(const char *name, int value);
extern int log_resources_set_string(const char *name, const char* value);
@@ -420,8 +426,6 @@ int ui_init_finalize(void)
#elif defined(__XPET__) || defined(__XCBM2__)
log_resources_set_int("CrtcFilter", (vice_opt.Filter > -1) ? 1 : 0);
log_resources_set_int("CrtcPALBlur", vice_opt.Filter);
log_resources_set_int("CrtcPALOddLinePhase", vice_opt.FilterOddLinePhase);
log_resources_set_int("CrtcPALOddLineOffset", vice_opt.FilterOddLineOffset);
#endif
#if defined(__X128__)
retrodep/uistatusbar.c
+1 -1
View File
@@ -287,7 +287,7 @@ void ui_display_reset(int device, int mode)
/* uiapi.h */
/* Display a mesage without interrupting emulation */
void ui_display_statustext(const char *text, int fade_out)
void ui_display_statustext(const char *text, bool fade_out)
{
#ifdef SDL_DEBUG
fprintf(stderr, "%s: \"%s\", %i\n", __func__, text, fade_out);
vice/Makefile.in
+2
View File
@@ -409,6 +409,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/NEWS
+245
View File
@@ -19,6 +19,251 @@ with the "-default" command line argument or use "restore default config"
in the UI).
* Changes in Vice 3.9
=====================
** general
----------
- (mostly) rewritten joystick mapping and -input system. Both the SDL and GTK
versions share common code now, have the same features, and can use the same
mapping files. However, unfortunately we ran out of time and could not implement
a related UI in the GTK port yet - which means you will have to create and/or
install the required mapping file manually like this, if the (very simple)
default mapping does not work for you:
1) find a matching SDL mapping file in DATA/C64. If none of the existing ones
matches your controller, you may create one yourself (either manually or
using the SDL port). (*)
2) rename the mapping file to "gtk3-joymap-<MACHINE>.vjm" - for example
gtk3-joymap-C64SC.vjm
3) copy the resulting file to the (current) default location:
Windows: the bin directory (where the .exe resides)
Linux: $HOME/.config/vice/
(*) if you create one for a controller we do not support yet, please send that
mapping file to us, so we can include it.
WE ARE LOOKING FOR WINDOWS AND MACOS DEVELOPERS WHO WANT TO HELP IMPLEMENTING
AND FIXING FURTHER GAMECONTROLLER RELATED ISSUES - PLEASE GET IN TOUCH!
- Interrupt logic fix: Only when the first IRQ source becomes active, the CPU
sees the IRQ input line go active; on additional ones, no change is visible.
So most of the actions that are done should only be done when the first
IRQ source becomes active, and not on additional ones. (bug #2052)
IF YOU ARE USING VICE TO DEVELOP/DEBUG, IT IS STRONGLY RECOMMENDED TO UPDATE
- added an option that allows to skip soundchip emulation in warpmode (to increase
performance, at the cost of some accuracy).
- reSID: scale down filtered voices on 6581
- reSID: scale and clip volume by an arbitrary factor, makes 6581/8580 nearly
the same volume.
- reSID: implement DAC leakage.
- reSID: fix uninitialized var in old filter
- reSID: Fixed the 8580 filter voltages, now the values really make sense
- CIA: always toggle AM/PM flag when writing 12 o'clock time, no matter if this
is a change to the hours register or not.
- cleanup of the userport system, devices that do not (and can not) work are no
more available for a particular machine
- Added C64/C128/SCPU64 palette file created by Kim Lemon to allow for consistency
in screenshots for lemon64.com.
- fixed handling of warp mode while movie recording is active
- improved ZMBV recording, now handles accurate fractional FPS
- fixed recording with external ffmpeg executable
- fixed polling POTX/POTY when no mouse is active
- added Chalkboard PowerPad emulation
- fixed Rushware Keypad
- fixed Cardco Cardkey keypad
- fixed Atari CX21 Keypad
- fixed SNES pad's raw data
- fixed mapping for keypads attached to joyports
- fix: WOJ Adapter bits where inverted (bug #2026)
- removed support for right and middle button with Amiga and AtariST mice -
These connect POT lines with GND when pressed, and are open if not, which the
CBM machines can not detect (since there is no pullup resistor)
- Allow CMD smartmouse time/date to be read and written even if the mouse is not
grabbed
- When writing .tap values, add the remainder of the current value to the next,
so overall tap length will be correct.
- do not automatically 'press play' when attaching a t64 image, we don't do this
for taps either.
- 'press STOP' when detaching a tap image.
- Fix default tape header type (t64) for vic20 and c128 (it should be type 3,
ie absolute).
- Fix the 'load to basic start' autostart option for tape.
- Reworked the log system. logging to stdout and to an actual file can coexist
now, each can be selected separately.
- (Optional) support for colors in log messages
- Made ANE/LXA logging options available in all emus, except SCPU
- VICII: init color ram at powerup (bug #2037)
- fsdevice: fixed file name pattern matching.
- fsdevice: Directory loading of "$:" was loading the full directory but should
have matched no files at all. It is actually a degenerate case where you
specify an empty pattern and that matches no names. (bug #2047)
- fsdevice: make the first 'line number' in the directory 1 instead of 0. This
is the partition number on cmd devices, and apparently the c64os setup chokes
on it being 0
- fixed DigiMAX DAC addresses to make stereo replay work correctly
- RAMLINK: IO1 wouldn't bet setup properly after RAMLINK was turned back on
- fixed RTC core (RTC on CMD FD/HD and RAMLink)
- save 'jammed' status into snapshot for each cpu (bug #1770)
** Buildsystem
--------------
- make configure bail if pkg-config isn't found
- generate linker map files with `--enable-debug`
- configure: barf if `--enable-gtk3ui` is combined with `--without-zlib`
- Added "Game" and "Emulator" categories in the .desktop file template used by
the `--enable-desktop-files` configure switch. Should fix issues with desktop
environments not showing the icons after a `make install`.
** C64 fixes
------------
- extended DQBB support, support 16-256k RAM, support C128 mode.
- added support for UC1/UC15/UC2 cartridges
- added support for BMP Data Turbo 2000 cartridge
- correctly assign rr revision when mounting crt file
- various WiC64 related fixes
- Make possible to enable the CP/M cartridge again
** C128 fixes
-------------
- added snapshot support for c128 cartridge system
- Fixed various Z80 timing issues
- Fix: Z80 can not see charrom in c128 mode, but it can in c64 mode (bug #1987)
- added WZ reg for improved bit 3 and 5 status register results. x128 Z80 now passes ZEXALL.
- RAMlink: also exposes open-circuit when internal function roms are off (bug #1963)
- VDC memory is now properly accessed when memory configs differ; vdcdump runs
in 16KB mode. (bug #1981)
** VIC20 fixes
--------------
- tweak ram init pattern, this makes some known cases that rely on it work
(AE, Jelly Monsters)
- make the 'exp' command work in the monitor
- added support for 'rabbit tape' cartridge
- added support for 'Super Expander' cartridge
- added support for 'Mikro Assembler' cartridge
- added missing 'bin save', 'crt save', 'flush image' for Final Expansion,
Megacart, Ultimem, VIC Flash Plugin
- added VIC20 SDL keymaps for UK(symbolic and positional) and DE (positional).
** Plus4 fixes
--------------
- fixed crash when xplus4 runs for a while
- new TED sound logic, heavily inspired by SDL-YAPE
- enabled userport printer
- added support for the 'PETSCII SNES ADAPTER'
- allow 8 controller ports
- make expansion port system (and 'exp' command) work like in other emus, move
sid-card and digiblaster to cartridges
- improve the case when the TED is reading from floating bus.
- remove support for 'Hannes 4MB' expansion, which was kindof broken, and no
software exists for even the 1mb variant :)
** PET fixes
------------
- remove the 'load to basic start (tape)' option, since PETs always load absolute
- CRTC emulation fixes (bug #2054)
- fixed PETREU. The masking of the memory bank number allowed too many bank
address bits, overflowing the allocated memory. (bug #2061)
- fix monitor IO command in range 8800-8fff
** CBM2 fixes
-------------
- remove the 'load to basic start (tape)' option, since CBM2s always load absolute
- Implemented the missing cbm2 cartridge stuff
- handle Machine Power Frequency
** Monitor fixes
----------------
- Remove the weird delayed 'importing' of registers that were changed in the
monitor. Instead explicitly export before, and import after, each invokation
of any function that may 'break' into the monitor (and thus lets the user
change the registers by the R or G command). (see bug #2025, bug #2024.)
It is strongly recommended, for everyone who uses the monitor for debugging,
to update to this version - as simply entering and exiting the monitor
potentially screwed up registers and/or executes the last instruction twice,
which obviously can lead to all kind of unexpected behaviour.
THIS BUG EXISTS IN ALL VICE RELEASES PRIOR TO THIS RELEASE. You have been warned :)
- memmap extension: show reads of non initialized ram.
- added read/write as alias for load/store
- implement 'warp on'/'warp off' as advertised.
- limit the output of i and ii commands to a power of two, if the output would
be smaller than a full screen width
- added monitor command 'tapeoffs <offset>' to set .tap to given offset, or to
return the current offset when no args are given.
- Improve "help" command.
- Fixed some commands output wrapping against wide and narrow terminals.
- 6809 assembler fixes, "post-byte with submode" was wrong in some cases
** SDL fixes
------------
- added missing ui items for megacart, final expansion, ultimem, vic flash plugin
- Add menu item "Enable joystick menu navigation", enable joystick menu navigation
by default
- support for Autostart Drag&Drop Mode
** GTK fixes
------------
- added a hidden feature for the 'set to default' button for the CRT sliders:
hold shift or control, or click with right button, to reset to neutral setting
instead of whatever (tweaked) defaults. Allows to quickly switch to a setting
that reproduces a loaded palette 100%
- disable the "Recent files" in file dialogs
- Fix drag-n-drop not working on Windows
- Fix "Reset" button of the mixer widget
- New "ROM Settings" interface. The new interface actually allows users to
load/save .vrs files, unlike the old interface. No support for ROM set
archives (.vra), since nobody uses those and they're an unwieldy mess.
- Fixed "Printer Formfeed"
- register provided PETSCII fonts (PetMe, C64 Pro Mono) at startup
- removed DirectX 5 fallback from Win32 joystick driver
- Added "Autostart Drop Mode" option to control autostart behaviour on image drop.
For Window managers that support it, the user can "override" the behaviour with
Shift held during drop (attach only) or Alt held (attach and load). Not holding
a key during drop will use the resource value.
- make GTK monitor window larger by default
- use scroll-wheel to scroll terminal window forth/back, ctrl+scroll wheel to zoom
- show only monospace fonts in the monitor font selection dialog
- Monitor uses PETSCII font (if available/selected)
** c1541 fixes
--------------
- actually check if opening disk images succeeded, Exit with `EXIT_FAILURE` if
c1541 fails to open any of the images specified on the command line.
* Changes in Vice 3.8
=====================
vice/README
+20 -20
View File
@@ -1,5 +1,5 @@
VICE 3.8 Dez 2023
VICE 3.9 Dez 2024
_______________
@@ -24,7 +24,7 @@
----------------------------------------------------------------------------
This is version 3.8 of VICE, the multi-platform C64, C128, VIC20,
This is version 3.9 of VICE, the multi-platform C64, C128, VIC20,
PET, PLUS4 and CBM-II emulator. This version can be compiled for
Win32, macOS, Haiku and for most Unix systems provided with the X Window
System version 11, R5 or later.
@@ -191,24 +191,24 @@
VICE, the Versatile Commodore Emulator
Core Team Members:
1999-2023 Pottendo
2005-2023 Marco van den Heuvel
2007-2023 Fabrizio Gennari
2009-2023 Groepaz
2009-2023 Errol Smith
2009-2023 Ingo Korb
2010-2023 Olaf Seibert
2011-2023 Marcus Sutton
2011-2023 Kajtar Zsolt
2016-2023 AreaScout
2016-2023 Bas Wassink
2017-2023 Michael C. Martin
2018-2023 Christopher Phillips
2019-2023 David Hogan
2020-2023 Empathic Qubit
2020-2023 Roberto Muscedere
2021-2023 June Tate-Gans
2021-2023 Pablo Roldan
1999-2024 Pottendo
2005-2024 Marco van den Heuvel
2007-2024 Fabrizio Gennari
2009-2024 Groepaz
2009-2024 Errol Smith
2009-2024 Ingo Korb
2010-2024 Olaf Seibert
2011-2024 Marcus Sutton
2011-2024 Kajtar Zsolt
2016-2024 AreaScout
2016-2024 Bas Wassink
2017-2024 Michael C. Martin
2018-2024 Christopher Phillips
2019-2024 David Hogan
2020-2024 Empathic Qubit
2020-2024 Roberto Muscedere
2021-2024 June Tate-Gans
2021-2024 Pablo Roldan
Inactive/Ex Team Members:
2011-2016 Stefan Haubenthal
vice/cmake-bootstrap.sh
+11 -4
View File
@@ -182,8 +182,15 @@ function extract_include_dirs {
| sed "s#^\\..*\\./src\$#\\\${CMAKE_SOURCE_DIR}$vpath/src#" \
| sed "s#^\\..*\\./src/#\\\${CMAKE_SOURCE_DIR}$vpath/src/#" \
| sed -n "p; s#^\\\${CMAKE_SOURCE_DIR}$vpath#\\\${CMAKE_SOURCE_DIR}#p" \
| unique_preserve_order \
| indent_file_list
| unique_preserve_order
(extract_make_var AM_CPPFLAGS; space; extract_make_var VICE_CFLAGS; space; extract_make_var VICE_CXXFLAGS) \
| sed $'s/ -/\\\n-/g' \
| grep '^-isystem' \
| sed 's/^-isystem//' \
| sed 's/^[[:space:]]*//' \
| sed 's/[[:space:]]*$//' \
| unique_preserve_order
}
function extract_link_dirs {
@@ -460,7 +467,7 @@ function process_source_makefile {
PRIVATE
\${CMAKE_CURRENT_SOURCE_DIR}
\${CMAKE_CURRENT_SOURCE_DIR}/$(extract_make_var VPATH)
$(extract_include_dirs)
$(extract_include_dirs | indent_file_list)
)
target_compile_options(
@@ -571,7 +578,7 @@ function generate_executable_target {
PRIVATE
\${CMAKE_CURRENT_SOURCE_DIR}
\${CMAKE_CURRENT_SOURCE_DIR}/$(extract_make_var VPATH)
$(extract_include_dirs)
$(extract_include_dirs | indent_file_list)
)
target_compile_options(
vice/configure
Vendored
+348 -146
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for vice 3.8.
# Generated by GNU Autoconf 2.71 for vice 3.9.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='vice'
PACKAGE_TARNAME='vice'
PACKAGE_VERSION='3.8'
PACKAGE_STRING='vice 3.8'
PACKAGE_VERSION='3.9'
PACKAGE_STRING='vice 3.9'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -731,7 +731,13 @@ NETPLAY_LIBS
libcurl_LIBS
libcurl_CFLAGS
ZLIB_LIBS
HAVE_ZLIB_FALSE
HAVE_ZLIB_TRUE
JOY_LIBS
libevdev_LIBS
libevdev_CFLAGS
HAVE_LINUX_EVDEV_FALSE
HAVE_LINUX_EVDEV_TRUE
DYNLIB_LIBS
CROSS
CROSS_FALSE
@@ -780,6 +786,8 @@ GTK_CFLAGS
HAVE_DEBUG_THREADS_FALSE
HAVE_DEBUG_THREADS_TRUE
DEBUGBUILD
HAVE_DEBUG_FALSE
HAVE_DEBUG_TRUE
OBJCPP
HAVE_PARSID_FALSE
HAVE_PARSID_TRUE
@@ -1012,6 +1020,7 @@ enable_extra_warnings
enable_io_simulation
enable_experimental_devices
with_libcurl
with_evdev
enable_headlessui
enable_sdl1ui
enable_sdl2ui
@@ -1061,6 +1070,8 @@ SDL2_IMAGE_CFLAGS
SDL2_IMAGE_LIBS
SDL_IMAGE_CFLAGS
SDL_IMAGE_LIBS
libevdev_CFLAGS
libevdev_LIBS
libcurl_CFLAGS
libcurl_LIBS
FFMPEG_AV_CFLAGS
@@ -1621,7 +1632,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures vice 3.8 to adapt to many kinds of systems.
\`configure' configures vice 3.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1692,7 +1703,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of vice 3.8:";;
short | recursive ) echo "Configuration of vice 3.9:";;
esac
cat <<\_ACEOF
@@ -1768,6 +1779,7 @@ Optional Packages:
--with-unzip-bin enables distribution of unzip.exe in the windows bindist
--with-libieee1284 use the libieee1284 parallel port library
--without-libcurl disable libcurl support [default=no]
--without-evdev disable Linux evdev joystick driver [default=no]
--with-gnu-ld assume the C compiler uses GNU ld default=no
Some influential environment variables:
@@ -1811,6 +1823,10 @@ Some influential environment variables:
C compiler flags for SDL_IMAGE, overriding pkg-config
SDL_IMAGE_LIBS
linker flags for SDL_IMAGE, overriding pkg-config
libevdev_CFLAGS
C compiler flags for libevdev, overriding pkg-config
libevdev_LIBS
linker flags for libevdev, overriding pkg-config
libcurl_CFLAGS
C compiler flags for libcurl, overriding pkg-config
libcurl_LIBS
@@ -1901,7 +1917,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
vice configure 3.8
vice configure 3.9
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2155,6 +2171,96 @@ fi
} # ac_fn_c_try_link
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
# variable VAR accordingly.
ac_fn_c_check_type ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
printf %s "checking for $2... " >&6; }
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
else $as_nop
eval "$3=no"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
int
main (void)
{
if (sizeof ($2))
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
int
main (void)
{
if (sizeof (($2)))
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
else $as_nop
eval "$3=yes"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_type
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
# INCLUDES, setting the cache variable VAR accordingly.
ac_fn_c_check_header_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
printf %s "checking for $2... " >&6; }
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
eval "$3=yes"
else $as_nop
eval "$3=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
# ac_fn_c_try_run LINENO
# ----------------------
# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
@@ -2387,39 +2493,6 @@ rm -f conftest.val
} # ac_fn_c_compute_int
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
# INCLUDES, setting the cache variable VAR accordingly.
ac_fn_c_check_header_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
printf %s "checking for $2... " >&6; }
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
eval "$3=yes"
else $as_nop
eval "$3=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
# ac_fn_objc_try_cpp LINENO
# -------------------------
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -2520,63 +2593,6 @@ printf "%s\n" "$ac_res" >&6; }
} # ac_fn_c_check_func
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
# variable VAR accordingly.
ac_fn_c_check_type ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
printf %s "checking for $2... " >&6; }
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
else $as_nop
eval "$3=no"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
int
main (void)
{
if (sizeof ($2))
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
int
main (void)
{
if (sizeof (($2)))
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
else $as_nop
eval "$3=yes"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_type
# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
# ------------------------------------------------------------------
# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
@@ -2652,7 +2668,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by vice $as_me 3.8, which was
It was created by vice $as_me 3.9, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4145,7 +4161,7 @@ fi
# Define the identity of the package.
PACKAGE='vice'
VERSION='3.8'
VERSION='3.9'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -4267,9 +4283,9 @@ VICE_LDFLAGS=""
VICE_VERSION_MAJOR=3
VICE_VERSION_MINOR=8
VICE_VERSION_MINOR=9
VICE_VERSION_BUILD=0
VICE_VERSION=3.8
VICE_VERSION=3.9
VERSION_RC="$VICE_VERSION_MAJOR,$VICE_VERSION_MINOR,$VICE_VERSION_BUILD,0"
VERSION_COMBINED=`expr $VICE_VERSION_MAJOR \* 65536 + $VICE_VERSION_MINOR \* 256 + $VICE_VERSION_BUILD`
@@ -4708,6 +4724,17 @@ vice_arg_with_list="$vice_arg_with_list libcurl"
# Check whether --with-evdev was given.
if test ${with_evdev+y}
then :
withval=$with_evdev;
fi
vice_arg_with_list="$vice_arg_with_list evdev"
# Check whether --enable-headlessui was given.
if test ${enable_headlessui+y}
then :
@@ -6259,11 +6286,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
if test ${ac_cv_prog_cxx_11+y}
if test ${ac_cv_prog_cxx_cxx11+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_11=no
ac_cv_prog_cxx_cxx11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6305,11 +6332,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
if test ${ac_cv_prog_cxx_98+y}
if test ${ac_cv_prog_cxx_cxx98+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_98=no
ac_cv_prog_cxx_cxx98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -11652,6 +11679,46 @@ rm -rf conftest*
fi
fi
ac_header= ac_cache=
for ac_item in $ac_header_c_list
do
if test $ac_cache; then
ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
printf "%s\n" "#define $ac_item 1" >> confdefs.h
fi
ac_header= ac_cache=
elif test $ac_header; then
ac_cache=$ac_item
else
ac_header=$ac_item
fi
done
if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
then :
printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
fi
ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
if test "x$ac_cv_type_ssize_t" = xyes
then :
else $as_nop
printf "%s\n" "#define ssize_t int" >>confdefs.h
fi
ac_config_headers="$ac_config_headers src/config.h"
@@ -11660,6 +11727,7 @@ ac_config_headers="$ac_config_headers src/config.h"
is_unix=no
is_unix_x11=no
is_unix_macosx=no
is_unix_linux=no
is_win32=no
is_win32_gtk3=no
is_beos=no
@@ -11724,6 +11792,7 @@ USE_DESKTOP_FILES="no "
HAVE_X64_IMAGE_SUPPORT="no "
HAVE_CAPABILITIES_SUPPORT="no "
HAVE_LIBCURL_SUPPORT="no "
HAVE_LINUX_EVDEV_SUPPORT="no "
HAVE_EXPERIMENTAL_DEVICES_SUPPORT="no "
if false; then
@@ -11969,6 +12038,9 @@ printf "%s\n" "no" >&6; }
fi
fi
if test -z "$PKG_CONFIG"; then
as_fn_error $? "Could not locate pkg-config, please install pkg-config" "$LINENO" 5
fi
SOUND_DRIVERS=""
@@ -12578,36 +12650,7 @@ fi
if test x"$with_libieee1284" = "xyes"; then
LIBIEEE1284_HEADERS_PRESENT=yes
ac_header= ac_cache=
for ac_item in $ac_header_c_list
do
if test $ac_cache; then
ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
printf "%s\n" "#define $ac_item 1" >> confdefs.h
fi
ac_header= ac_cache=
elif test $ac_header; then
ac_cache=$ac_item
else
ac_header=$ac_item
fi
done
if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
then :
printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
fi
for ac_header in ieee1284.h
for ac_header in ieee1284.h
do :
ac_fn_c_check_header_compile "$LINENO" "ieee1284.h" "ac_cv_header_ieee1284_h" "$ac_includes_default"
if test "x$ac_cv_header_ieee1284_h" = xyes
@@ -13110,7 +13153,7 @@ fi
printf "%s\n" "$ac_cv_file__opt_local_include" >&6; }
if test "x$ac_cv_file__opt_local_include" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/local/include"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/local/include"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /opt/local/include/libomp" >&5
@@ -13131,7 +13174,7 @@ fi
printf "%s\n" "$ac_cv_file__opt_local_include_libomp" >&6; }
if test "x$ac_cv_file__opt_local_include_libomp" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/local/include/libomp"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/local/include/libomp"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /opt/local/lib" >&5
@@ -13197,7 +13240,7 @@ fi
printf "%s\n" "$ac_cv_file__opt_homebrew_include" >&6; }
if test "x$ac_cv_file__opt_homebrew_include" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/homebrew/include"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/homebrew/include"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /opt/homebrew/include/libomp" >&5
@@ -13218,7 +13261,7 @@ fi
printf "%s\n" "$ac_cv_file__opt_homebrew_include_libomp" >&6; }
if test "x$ac_cv_file__opt_homebrew_include_libomp" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/homebrew/include/libomp"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/homebrew/include/libomp"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /opt/homebrew/lib" >&5
@@ -13282,7 +13325,7 @@ fi
printf "%s\n" "$ac_cv_file__usr_local_include" >&6; }
if test "x$ac_cv_file__usr_local_include" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/usr/local/include"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/usr/local/include"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libomp" >&5
@@ -13303,7 +13346,7 @@ fi
printf "%s\n" "$ac_cv_file__usr_local_include_libomp" >&6; }
if test "x$ac_cv_file__usr_local_include_libomp" = xyes
then :
MAC_CCPFLAGS="$MAC_CCPFLAGS -I/usr/local/include/libomp"
MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/usr/local/include/libomp"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/local/lib" >&5
@@ -13374,6 +13417,7 @@ else
LINUX_COMPILE_FALSE=
fi
is_unix_linux=yes
;;
esac
@@ -13404,6 +13448,14 @@ fi
if test x"$enable_debug" = "xyes"; then
have_backtrace_symbols="no"
DEBUGBUILD=1
if true; then
HAVE_DEBUG_TRUE=
HAVE_DEBUG_FALSE='#'
else
HAVE_DEBUG_TRUE='#'
HAVE_DEBUG_FALSE=
fi
STRIP=":"
DEBUG_SUPPORT="yes"
ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
@@ -13481,6 +13533,14 @@ printf "%s\n" "#define HAVE_BT_SYMBOLS /**/" >>confdefs.h
else
VICE_CPPFLAGS="$VICE_CPPFLAGS -DNDEBUG"
DEBUGBUILD=0
if false; then
HAVE_DEBUG_TRUE=
HAVE_DEBUG_FALSE='#'
else
HAVE_DEBUG_TRUE='#'
HAVE_DEBUG_FALSE=
fi
if test x"$is_win32" = "xyes" -a x"$enable_headlessui" != "xyes"; then
VICE_CPPFLAGS="$VICE_CPPFLAGS -mwindows"
VICE_CFLAGS="$VICE_CFLAGS -mwindows"
@@ -13743,6 +13803,9 @@ fi
as_fn_error $? "GTK3 UI requested, but GTK3 support packages are missing" "$LINENO" 5
fi
fi
if test x"$enable_gtk3ui" = "xyes" -a x"$with_zlib" = "xno"; then
as_fn_error $? "GTK3 UI requested, but zlib is explicitly disabled" "$LINENO" 5
fi
# Extract the first word of "glib-compile-resources", so it can be a program name with args.
set dummy glib-compile-resources; ac_word=$2
@@ -15936,11 +15999,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
if test ${ac_cv_prog_cxx_11+y}
if test ${ac_cv_prog_cxx_cxx11+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_11=no
ac_cv_prog_cxx_cxx11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15982,11 +16045,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
if test ${ac_cv_prog_cxx_98+y}
if test ${ac_cv_prog_cxx_cxx98+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_98=no
ac_cv_prog_cxx_cxx98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17610,6 +17673,14 @@ fi
JOY_LIBS=
if false; then
HAVE_LINUX_EVDEV_TRUE=
HAVE_LINUX_EVDEV_FALSE='#'
else
HAVE_LINUX_EVDEV_TRUE='#'
HAVE_LINUX_EVDEV_FALSE=
fi
if test x"$is_unix_x11" = "xyes" -a x"$enable_sdl1ui" != "xyes" -a x"$enable_sdl2ui" != "xyes" -a x"$enable_headlessui" != "xyes"; then
ac_fn_c_check_header_compile "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_joystick_h" = xyes
@@ -17629,6 +17700,92 @@ printf "%s\n" "#define LINUX_JOYSTICK /**/" >>confdefs.h
fi
fi
if test x"$with_evdev" != "xno" -a x"$is_unix_linux" = "xyes"; then
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libevdev" >&5
printf %s "checking for libevdev... " >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$libevdev_CFLAGS"; then
pkg_cv_libevdev_CFLAGS="$libevdev_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevdev\""; } >&5
($PKG_CONFIG --exists --print-errors "libevdev") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_libevdev_CFLAGS=`$PKG_CONFIG --cflags "libevdev" 2>/dev/null`
else
pkg_failed=yes
fi
fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
if test -n "$libevdev_LIBS"; then
pkg_cv_libevdev_LIBS="$libevdev_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevdev\""; } >&5
($PKG_CONFIG --exists --print-errors "libevdev") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_libevdev_LIBS=`$PKG_CONFIG --libs "libevdev" 2>/dev/null`
else
pkg_failed=yes
fi
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
libevdev_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libevdev"`
else
libevdev_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libevdev"`
fi
# Put the nasty error message in config.log where it belongs
echo "$libevdev_PKG_ERRORS" >&5
as_fn_error $? "Linux evdev joystick driver requested (--with-evdev) but the libevdev headers are missing." "$LINENO" 5
elif test $pkg_failed = untried; then
as_fn_error $? "Linux evdev joystick driver requested (--with-evdev) but the libevdev headers are missing." "$LINENO" 5
else
libevdev_CFLAGS=$pkg_cv_libevdev_CFLAGS
libevdev_LIBS=$pkg_cv_libevdev_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
printf "%s\n" "#define HAVE_LINUX_EVDEV /**/" >>confdefs.h
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joystick_linux_evdev.o"
HAVE_LINUX_EVDEV_SUPPORT="yes"
fi
VICE_CFLAGS="$VICE_CFLAGS $libevdev_CFLAGS"
VICE_CXXFLAGS="$VICE_CXXFLAGS $libevdev_CXXFLAGS"
LIBS="$LIBS $libevdev_LIBS"
if true; then
HAVE_LINUX_EVDEV_TRUE=
HAVE_LINUX_EVDEV_FALSE='#'
else
HAVE_LINUX_EVDEV_TRUE='#'
HAVE_LINUX_EVDEV_FALSE=
fi
fi
usbhid_header=no
usbhid_lib=no
@@ -17934,6 +18091,26 @@ fi
fi
fi
if test x"$HAVE_ZLIB_SUPPORT" = "xyes" ; then
if true; then
HAVE_ZLIB_TRUE=
HAVE_ZLIB_FALSE='#'
else
HAVE_ZLIB_TRUE='#'
HAVE_ZLIB_FALSE=
fi
else
if false; then
HAVE_ZLIB_TRUE=
HAVE_ZLIB_FALSE='#'
else
HAVE_ZLIB_TRUE='#'
HAVE_ZLIB_FALSE=
fi
fi
@@ -23641,6 +23818,14 @@ if test -z "${LINUX_COMPILE_TRUE}" && test -z "${LINUX_COMPILE_FALSE}"; then
as_fn_error $? "conditional \"LINUX_COMPILE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_DEBUG_TRUE}" && test -z "${HAVE_DEBUG_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_DEBUG_TRUE}" && test -z "${HAVE_DEBUG_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_DEBUG_THREADS_TRUE}" && test -z "${HAVE_DEBUG_THREADS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DEBUG_THREADS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23876,6 +24061,22 @@ if test -z "${CROSS_TRUE}" && test -z "${CROSS_FALSE}"; then
as_fn_error $? "conditional \"CROSS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LINUX_EVDEV_TRUE}" && test -z "${HAVE_LINUX_EVDEV_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LINUX_EVDEV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LINUX_EVDEV_TRUE}" && test -z "${HAVE_LINUX_EVDEV_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LINUX_EVDEV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ZLIB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ZLIB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_FC_CACHE_TRUE}" && test -z "${HAVE_FC_CACHE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_FC_CACHE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24446,7 +24647,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by vice $as_me 3.8, which was
This file was extended by vice $as_me 3.9, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24514,7 +24715,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
vice config.status 3.8
vice config.status 3.9
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
@@ -25746,6 +25947,7 @@ echo "Build old x64 emulator : $X64_INCLUDED (--enable/--disable-x64)"
echo "Install XDG .desktop files : $USE_DESKTOP_FILES"
echo "icotool for Windows found : $ICOTOOL"
echo "Experimental devices emulation: $HAVE_EXPERIMENTAL_DEVICES_SUPPORT (--enable-experimental-devices)"
echo "Linux evdev joystick driver : $HAVE_LINUX_EVDEV_SUPPORT (--with-evdev)"
echo ""
echo "User CPPFLAGS: $CPPFLAGS"
vice/configure.ac
+46 -7
View File
@@ -10,7 +10,7 @@ dnl a development version. Don't add any strings to the version number (such
dnl as '-dev' or 'beta'), the '-r$SVNREV' revision string is the only thing we
dnl alllow after the version number.
m4_define(vice_version_major, 3)
m4_define(vice_version_minor, 8)
m4_define(vice_version_minor, 9)
m4_define(vice_version_build, 0)
dnl Some people lose their shit if a version ends in .0
@@ -142,6 +142,9 @@ VICE_ARG_ENABLE_LIST(experimental-devices, [ --enable-experimental-devices
dnl Needed for WIC64
VICE_ARG_WITH_LIST(libcurl, [ --without-libcurl disable libcurl support [[default=no]]])
dnl Linux evdev joysticks
VICE_ARG_WITH_LIST(evdev, [ --without-evdev disable Linux evdev joystick driver [[default=no]]])
dnl
dnl UI options
dnl
@@ -420,6 +423,8 @@ AM_PROG_AS
dnl Other build environment checks
AC_SYS_LARGEFILE
AC_TYPE_SSIZE_T
AC_CONFIG_HEADERS([src/config.h])
@@ -427,6 +432,7 @@ AC_CONFIG_HEADERS([src/config.h])
is_unix=no
is_unix_x11=no
is_unix_macosx=no
is_unix_linux=no
is_win32=no
is_win32_gtk3=no
is_beos=no
@@ -491,6 +497,7 @@ USE_DESKTOP_FILES="no "
HAVE_X64_IMAGE_SUPPORT="no "
HAVE_CAPABILITIES_SUPPORT="no "
HAVE_LIBCURL_SUPPORT="no "
HAVE_LINUX_EVDEV_SUPPORT="no "
HAVE_EXPERIMENTAL_DEVICES_SUPPORT="no "
dnl Why do we have this?
@@ -536,7 +543,11 @@ AM_CONDITIONAL(VICE_QUIET, test x"$verbose" != "xyes" -a x"$enable_silent_rules"
user_cflags=$CFLAGS
dnl Make sure we have pkg-config >- 0.9.0
PKG_PROG_PKG_CONFIG
if test -z "$PKG_CONFIG"; then
AC_MSG_ERROR([Could not locate pkg-config, please install pkg-config])
fi
SOUND_DRIVERS=""
@@ -1008,21 +1019,21 @@ darwin*)
dnl Macports headers and libraries
AC_CHECK_FILE(/opt/local/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/local/include" ])
AC_CHECK_FILE(/opt/local/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/local/include/libomp" ])
AC_CHECK_FILE(/opt/local/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/local/include" ])
AC_CHECK_FILE(/opt/local/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/local/include/libomp" ])
AC_CHECK_FILE(/opt/local/lib, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/opt/local/lib -Wl,-rpath,/opt/local/lib" ])
AC_CHECK_FILE(/opt/local/lib/libomp, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/opt/local/lib/libomp -Wl,-rpath,/opt/local/lib/libomp" ])
dnl Homebrew headers and libraries
if test "`uname -m`" = "arm64"; then
AC_CHECK_FILE(/opt/homebrew/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/homebrew/include" ])
AC_CHECK_FILE(/opt/homebrew/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/opt/homebrew/include/libomp" ])
AC_CHECK_FILE(/opt/homebrew/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/homebrew/include" ])
AC_CHECK_FILE(/opt/homebrew/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/opt/homebrew/include/libomp" ])
AC_CHECK_FILE(/opt/homebrew/lib, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/opt/homebrew/lib -Wl,-rpath,/opt/homebrew/lib" ])
AC_CHECK_FILE(/opt/homebrew/lib/libomp, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/opt/homebrew/lib/libomp -Wl,-rpath,/opt/homebrew/lib/libomp" ])
else
AC_CHECK_FILE(/usr/local/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/usr/local/include" ])
AC_CHECK_FILE(/usr/local/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -I/usr/local/include/libomp" ])
AC_CHECK_FILE(/usr/local/include, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/usr/local/include" ])
AC_CHECK_FILE(/usr/local/include/libomp, [ MAC_CCPFLAGS="$MAC_CCPFLAGS -isystem/usr/local/include/libomp" ])
AC_CHECK_FILE(/usr/local/lib, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/usr/local/lib -Wl,-rpath,/usr/local/lib" ])
AC_CHECK_FILE(/usr/local/lib/libomp, [ MAC_LDFLAGS="$MAC_LDFLAGS -L/usr/local/lib/libomp -Wl,-rpath,/usr/local/lib/libomp" ])
fi
@@ -1043,6 +1054,7 @@ dnl All other UN*X systems
linux*)
AC_DEFINE(LINUX_COMPILE,,[Are we compiling for Linux?])
AM_CONDITIONAL(LINUX_COMPILE, true)
is_unix_linux=yes
;;
esac
@@ -1066,6 +1078,7 @@ dnl check for debug build
if test x"$enable_debug" = "xyes"; then
have_backtrace_symbols="no"
DEBUGBUILD=1
AM_CONDITIONAL(HAVE_DEBUG, true)
STRIP=":"
DEBUG_SUPPORT="yes"
AC_CHECK_HEADERS(execinfo.h,,)
@@ -1094,6 +1107,7 @@ else
dnl Disable asserts
VICE_CPPFLAGS="$VICE_CPPFLAGS -DNDEBUG"
DEBUGBUILD=0
AM_CONDITIONAL(HAVE_DEBUG, false)
dnl Remove super annoying horrible terminal window on Windows
dnl (but not when using the headless 'UI')
if test x"$is_win32" = "xyes" -a x"$enable_headlessui" != "xyes"; then
@@ -1186,6 +1200,10 @@ if test x"$check_gtk3" = "xyes"; then
AC_MSG_ERROR([GTK3 UI requested, but GTK3 support packages are missing])
fi
fi
dnl error out if gtk3 support is requested but zlib is disabled
if test x"$enable_gtk3ui" = "xyes" -a x"$with_zlib" = "xno"; then
AC_MSG_ERROR([GTK3 UI requested, but zlib is explicitly disabled])
fi
dnl Used to compile the vice.gresource.xml file
AC_CHECK_PROG(GLIB_COMPILE_RESOURCES, [glib-compile-resources], [glib-compile-resources], [no])
@@ -2044,6 +2062,7 @@ AC_SUBST(DYNLIB_LIBS)
dnl ----- Joystick support -----
JOY_LIBS=
AM_CONDITIONAL(HAVE_LINUX_EVDEV, false)
if test x"$is_unix_x11" = "xyes" -a x"$enable_sdl1ui" != "xyes" -a x"$enable_sdl2ui" != "xyes" -a x"$enable_headlessui" != "xyes"; then
AC_CHECK_HEADER(linux/joystick.h,
[
@@ -2053,6 +2072,19 @@ if test x"$is_unix_x11" = "xyes" -a x"$enable_sdl1ui" != "xyes" -a x"$enable_sdl
[Enable support for Linux style joysticks.])
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joystick_linux.o";
],[],[#include <linux/joystick.h>])],)
dnl Linux evdev joystick driver
if test x"$with_evdev" != "xno" -a x"$is_unix_linux" = "xyes"; then
PKG_CHECK_MODULES([libevdev],
[libevdev],
[AC_DEFINE(HAVE_LINUX_EVDEV,,[Enable support for Linux evdev joysticks.])
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joystick_linux_evdev.o"
HAVE_LINUX_EVDEV_SUPPORT="yes"],
[AC_MSG_ERROR([Linux evdev joystick driver requested (--with-evdev) but the libevdev headers are missing.])])
VICE_CFLAGS="$VICE_CFLAGS $libevdev_CFLAGS"
VICE_CXXFLAGS="$VICE_CXXFLAGS $libevdev_CXXFLAGS"
LIBS="$LIBS $libevdev_LIBS"
AM_CONDITIONAL(HAVE_LINUX_EVDEV, true)
fi
dnl NetBSD/FreeBSD USB joystick support
usbhid_header=no
@@ -2144,6 +2176,12 @@ if test x"$with_zlib" != "xno" ; then
fi
fi
if test x"$HAVE_ZLIB_SUPPORT" = "xyes" ; then
AM_CONDITIONAL(HAVE_ZLIB, true)
else
AM_CONDITIONAL(HAVE_ZLIB, false)
fi
AC_SUBST(ZLIB_LIBS)
@@ -3862,6 +3900,7 @@ echo "Build old x64 emulator : $X64_INCLUDED (--enable/--disable-x64)"
echo "Install XDG .desktop files : $USE_DESKTOP_FILES"
echo "icotool for Windows found : $ICOTOOL"
echo "Experimental devices emulation: $HAVE_EXPERIMENTAL_DEVICES_SUPPORT (--enable-experimental-devices)"
echo "Linux evdev joystick driver : $HAVE_LINUX_EVDEV_SUPPORT (--with-evdev)"
echo ""
echo "User CPPFLAGS: $CPPFLAGS"
vice/data/C128/Makefile.am
+2 -1
View File
@@ -55,7 +55,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
vice/data/C128/Makefile.in
+4 -1
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -444,7 +446,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
vice/data/C128/lemon64.vpl
+54
View File
@@ -0,0 +1,54 @@
# VICE Palette file
#
# Palette file by Kim Lemon of lemon64.com, to be used for screenshots.
#
# TYPE:VICII
# NAME:Lemon64
# Black
00 00 00
# White
ff ff ff
# Red
8b 3e 42
# Cyan
7c d3 cd
# Purple
97 46 a0
# Green
5c b2 54
# Blue
3c 39 a9
# Yellow
e3 e7 6e
# Orange
94 57 31
# Brown
59 3c 07
# Light Red
cd 77 7c
# Dark Gray
50 50 50
# Medium Gray
83 83 83
# Light Green
af f8 a6
# Light Blue
7f 7d f4
# Light Gray
ba ba ba
vice/data/C64/Makefile.am
+4 -1
View File
@@ -41,7 +41,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
@@ -69,6 +70,8 @@ gtk3_keymaps = \
sdl_keymaps = \
sdl_joymap_ps3.vjm \
sdl_joymap_thec64.vjm \
sdl_joymap_keyrah_v3.vjm \
sdl_joymap_xbox360.vjm \
sdl_pos.vkm \
sdl_pos_uk.vkm \
sdl_pos_ch.vkm \
vice/data/C64/Makefile.in
+6 -1
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -430,7 +432,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
@@ -458,6 +461,8 @@ gtk3_keymaps = \
sdl_keymaps = \
sdl_joymap_ps3.vjm \
sdl_joymap_thec64.vjm \
sdl_joymap_keyrah_v3.vjm \
sdl_joymap_xbox360.vjm \
sdl_pos.vkm \
sdl_pos_uk.vkm \
sdl_pos_ch.vkm \
vice/data/C64/gtk3_pos_de.vkm
+1
View File
@@ -387,5 +387,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/C64/gtk3_sym_de.vkm
+1
View File
@@ -401,5 +401,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/C64/lemon64.vpl
+54
View File
@@ -0,0 +1,54 @@
# VICE Palette file
#
# Palette file by Kim Lemon of lemon64.com, to be used for screenshots.
#
# TYPE:VICII
# NAME:Lemon64
# Black
00 00 00
# White
ff ff ff
# Red
8b 3e 42
# Cyan
7c d3 cd
# Purple
97 46 a0
# Green
5c b2 54
# Blue
3c 39 a9
# Yellow
e3 e7 6e
# Orange
94 57 31
# Brown
59 3c 07
# Light Red
cd 77 7c
# Dark Gray
50 50 50
# Medium Gray
83 83 83
# Light Green
af f8 a6
# Light Blue
7f 7d f4
# Light Gray
ba ba ba
vice/data/C64/sdl_joymap_keyrah_v3.vjm
+49
View File
@@ -0,0 +1,49 @@
# VICE joystick mapping file
#
# A joystick map is read in as patch to the current map.
#
# File format:
# - comment lines start with '#'
# - keyword lines start with '!keyword'
# - normal line has 'joynum inputtype inputindex action'
#
# Keywords and their lines are:
# '!CLEAR' clear all mappings
#
# inputtype:
# 0 axis
# 1 button
# 2 hat
#
# For buttons, inputindex is the zero-based index of the button.
# For hats: hat 0 has inputindex 0,1,2,3 respectively for up, down, left and right. Hat 1 has 5,6,7,8 etc.
# For axes, and action 1 (joystick) and 2 (keyboard): axis 0 has inputindex 0,1 respectively for positive and negative, axis 1 has 2,3 etc.
# For axes, and action 6 (pot axis): inputindex is the zero-based index of the axis.
#
# action [action_parameters]:
# 0 none
# 1 pin joystick (pin: 1/2/4/8/16/32/64 = u/d/l/r/fire/fire2/fire3)
# 2 row col keyboard
# 3 map
# 4 UI activate
# 5 action-name UI function
# 6 pot potentiometer (1=pot x, 2=pot y)
#
!CLEAR
# Joystick
0 0 0 1 8
0 0 1 1 4
0 0 2 1 2
0 0 3 1 1
# paddles
0 0 2 6 1
0 0 3 6 2
# buttons
0 1 0 1 16
0 1 1 1 32
0 1 2 1 64
vice/data/C64/sdl_joymap_xbox360.vjm
+63
View File
@@ -0,0 +1,63 @@
# Controller (Cyborg Rumble Pad - PC/Xbox 360)
# Left analog stick - right
0 0 0 1 8
# Left analog stick - left
0 0 1 1 4
# Left analog stick - down
0 0 2 1 2
# Left analog stick - up
0 0 3 1 1
# Right analog stick - right
0 0 4 0
# Right analog stick - left
0 0 5 0
# Right analog stick - down
0 0 6 0
# Right analog stick - up
0 0 7 0
# Left analog trigger - pressed
0 0 8 0
# Left analog trigger - released
0 0 9 0
# Right analog trigger - pressed
0 0 10 0
# Right analog trigger - released
0 0 11 0
# A
0 1 0 1 16
# B
0 1 1 1 32
# X
0 1 2 1 64
# Y
0 1 3 0
# LB
0 1 4 0
# RB
0 1 5 0
# Back
0 1 6 0
# Start
0 1 7 0
# LSB
0 1 8 0
# RSB
0 1 9 0
# Guide
0 1 10 0
# DPAD up
0 2 0 1 1
# DPAD down
0 2 1 1 2
# DPAD left
0 2 2 1 4
# DPAD right
0 2 3 1 8
vice/data/C64/sdl_pos.vkm
+1 -1
View File
@@ -195,7 +195,7 @@
281 6 5 8 /* Page down -> = */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64/sdl_pos_de.vkm
+1 -1
View File
@@ -165,7 +165,6 @@
112 5 1 8 /* P -> P */
252 5 6 8 /* (de) ue -> @ */
43 6 1 8 /* * -> * */
279 6 6 8 /* End -> Up Arrow */
27 7 7 8 /* ESC -> Run/Stop */
301 1 7 64 /* Caps Lock -> Shift Lock */
@@ -215,6 +214,7 @@
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
267 6 7 8 /* NumPad / -> / */
268 6 1 8 /* NumPad * -> * */
vice/data/C64/sdl_pos_uk.vkm
+5 -7
View File
@@ -120,9 +120,7 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 0 0 8 /* End -> */
#281 0 0 8 /* Page down -> */
#92 0 0 8 /* \ -> */
92 6 0 8 /* \ -> Pound */
9 7 2 16392 /* TAB -> Ctrl */
13 0 1 8 /* Return -> Return */
@@ -200,13 +198,13 @@
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 6 0 8 /* Ins -> Pound */
127 6 6 8 /* Del -> Up Arrow /pi */
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64/sdl_sym.vkm
+1 -1
View File
@@ -208,7 +208,7 @@
281 6 6 8 /* Page Down -> Arrow up */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64/sdl_sym_de.vkm
+1 -1
View File
@@ -277,7 +277,7 @@
122 1 4 8 /* Z -> Z */
# Restore key mappings
280 -3 0 /* Page Up -> RESTORE */
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64/sdl_sym_uk.vkm
+4 -3
View File
@@ -122,7 +122,6 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 7 1 8 /* End -> Left Arrow */
#92 4 4 33 /* \ -> shift m */
#92 6 0 129 /* | -> up arrow */
@@ -137,7 +136,7 @@
53 2 0 8 /* 5 -> 5 % */
54 2 3 32 /* 6 -> 6 & */
54 6 6 144 /* ^ -> power of */
54 6 6 144 /* ^ -> Arrow up */
55 3 0 32 /* 7 -> 7 ' */
55 2 3 129 /* & -> & */
@@ -225,11 +224,13 @@
276 0 2 1 /* Left -> CRSR LEFT */
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 0 0 1 /* Insert -> INS */
127 0 0 8 /* Delete -> DEL */
279 7 1 8 /* End -> Left Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64DTV/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/C64DTV/gtk3_pos_de.vkm
+1
View File
@@ -387,5 +387,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/C64DTV/gtk3_sym_de.vkm
+1
View File
@@ -401,5 +401,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/C64DTV/sdl_pos.vkm
+1 -1
View File
@@ -195,7 +195,7 @@
281 6 5 8 /* Page down -> = */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64DTV/sdl_pos_de.vkm
+1 -1
View File
@@ -165,7 +165,6 @@
112 5 1 8 /* P -> P */
252 5 6 8 /* (de) ue -> @ */
43 6 1 8 /* * -> * */
279 6 6 8 /* End -> Up Arrow */
27 7 7 8 /* ESC -> Run/Stop */
301 1 7 64 /* Caps Lock -> Shift Lock */
@@ -215,6 +214,7 @@
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
267 6 7 8 /* NumPad / -> / */
268 6 1 8 /* NumPad * -> * */
vice/data/C64DTV/sdl_pos_uk.vkm
+5 -7
View File
@@ -120,9 +120,7 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 0 0 8 /* End -> */
#281 0 0 8 /* Page down -> */
#92 0 0 8 /* \ -> */
92 6 0 8 /* \ -> Pound */
9 7 2 16392 /* TAB -> Ctrl */
13 0 1 8 /* Return -> Return */
@@ -200,13 +198,13 @@
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 6 0 8 /* Ins -> Pound */
127 6 6 8 /* Del -> Up Arrow /pi */
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64DTV/sdl_sym.vkm
+1 -1
View File
@@ -208,7 +208,7 @@
281 6 6 8 /* Page Down -> Arrow up */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64DTV/sdl_sym_de.vkm
+2 -2
View File
@@ -183,7 +183,7 @@
# 32+1 not shifted on host, shifted on c64
60 5 7 33 /* < -> < */
# 128 shifted on host, shifted on c64
# 32+128 shifted on host, shifted on c64
60 5 4 160 /* > -> > */
60 6 0 0x210 /* altr+< -> pound */
@@ -277,7 +277,7 @@
122 1 4 8 /* Z -> Z */
# Restore key mappings
280 -3 0 /* Page Up -> RESTORE */
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/C64DTV/sdl_sym_uk.vkm
+4 -3
View File
@@ -122,7 +122,6 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 7 1 8 /* End -> Left Arrow */
#92 4 4 33 /* \ -> shift m */
#92 6 0 129 /* | -> up arrow */
@@ -137,7 +136,7 @@
53 2 0 8 /* 5 -> 5 % */
54 2 3 32 /* 6 -> 6 & */
54 6 6 144 /* ^ -> power of */
54 6 6 144 /* ^ -> Arrow up */
55 3 0 32 /* 7 -> 7 ' */
55 2 3 129 /* & -> & */
@@ -225,11 +224,13 @@
276 0 2 1 /* Left -> CRSR LEFT */
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 0 0 1 /* Insert -> INS */
127 0 0 8 /* Delete -> DEL */
279 7 1 8 /* End -> Left Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/CBM-II/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/DRIVES/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/GLSL/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/Makefile.in
+2
View File
@@ -386,6 +386,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/PET/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/PLUS4/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/PLUS4/gtk3_pos_de.vkm
+1
View File
@@ -343,5 +343,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/PLUS4/gtk3_sym_de.vkm
+1
View File
@@ -321,5 +321,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/PRINTER/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/data/SCPU64/Makefile.am
+2 -1
View File
@@ -34,7 +34,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
vice/data/SCPU64/Makefile.in
+4 -1
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -423,7 +425,8 @@ palettes = \
palette_8565R2_v1r.vpl \
palette_C64_amber.vpl \
palette_C64_cyan.vpl \
palette_C64_green.vpl
palette_C64_green.vpl \
lemon64.vpl
gtk3_keymaps = \
gtk3_sym.vkm \
vice/data/SCPU64/gtk3_pos_de.vkm
+1
View File
@@ -387,5 +387,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/SCPU64/gtk3_sym_de.vkm
+1
View File
@@ -401,5 +401,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/SCPU64/lemon64.vpl
+54
View File
@@ -0,0 +1,54 @@
# VICE Palette file
#
# Palette file by Kim Lemon of lemon64.com, to be used for screenshots.
#
# TYPE:VICII
# NAME:Lemon64
# Black
00 00 00
# White
ff ff ff
# Red
8b 3e 42
# Cyan
7c d3 cd
# Purple
97 46 a0
# Green
5c b2 54
# Blue
3c 39 a9
# Yellow
e3 e7 6e
# Orange
94 57 31
# Brown
59 3c 07
# Light Red
cd 77 7c
# Dark Gray
50 50 50
# Medium Gray
83 83 83
# Light Green
af f8 a6
# Light Blue
7f 7d f4
# Light Gray
ba ba ba
vice/data/SCPU64/sdl_pos.vkm
+1 -1
View File
@@ -195,7 +195,7 @@
281 6 5 8 /* Page down -> = */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/SCPU64/sdl_pos_de.vkm
+1 -1
View File
@@ -165,7 +165,6 @@
112 5 1 8 /* P -> P */
252 5 6 8 /* (de) ue -> @ */
43 6 1 8 /* * -> * */
279 6 6 8 /* End -> Up Arrow */
27 7 7 8 /* ESC -> Run/Stop */
301 1 7 64 /* Caps Lock -> Shift Lock */
@@ -215,6 +214,7 @@
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
267 6 7 8 /* NumPad / -> / */
268 6 1 8 /* NumPad * -> * */
vice/data/SCPU64/sdl_pos_uk.vkm
+5 -7
View File
@@ -120,9 +120,7 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 0 0 8 /* End -> */
#281 0 0 8 /* Page down -> */
#92 0 0 8 /* \ -> */
92 6 0 8 /* \ -> Pound */
9 7 2 16392 /* TAB -> Ctrl */
13 0 1 8 /* Return -> Return */
@@ -200,13 +198,13 @@
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 6 0 8 /* Ins -> Pound */
127 6 6 8 /* Del -> Up Arrow /pi */
127 0 0 8 /* Ins -> Ins */
277 0 0 1 /* Del -> Del */
278 6 3 8 /* Home -> CLR/HOME */
279 6 6 8 /* End -> Up Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/SCPU64/sdl_sym.vkm
+1 -1
View File
@@ -208,7 +208,7 @@
281 6 6 8 /* Page Down -> Arrow up */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/SCPU64/sdl_sym_de.vkm
+2 -2
View File
@@ -183,7 +183,7 @@
# 32+1 not shifted on host, shifted on c64
60 5 7 33 /* < -> < */
# 128 shifted on host, shifted on c64
# 32+128 shifted on host, shifted on c64
60 5 4 160 /* > -> > */
60 6 0 0x210 /* altr+< -> pound */
@@ -277,7 +277,7 @@
122 1 4 8 /* Z -> Z */
# Restore key mappings
280 -3 0 /* Page Up -> RESTORE */
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/SCPU64/sdl_sym_uk.vkm
+4 -3
View File
@@ -122,7 +122,6 @@
!LCTRL 7 2
!VCTRL LCTRL
#279 7 1 8 /* End -> Left Arrow */
#92 4 4 33 /* \ -> shift m */
#92 6 0 129 /* | -> up arrow */
@@ -137,7 +136,7 @@
53 2 0 8 /* 5 -> 5 % */
54 2 3 32 /* 6 -> 6 & */
54 6 6 144 /* ^ -> power of */
54 6 6 144 /* ^ -> Arrow up */
55 3 0 32 /* 7 -> 7 ' */
55 2 3 129 /* & -> & */
@@ -225,11 +224,13 @@
276 0 2 1 /* Left -> CRSR LEFT */
275 0 2 8 /* Right -> CRSR RIGHT */
274 0 7 8 /* Down -> CRSR DOWN */
277 0 0 1 /* Insert -> INS */
127 0 0 8 /* Delete -> DEL */
279 7 1 8 /* End -> Left Arrow */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/VIC20/Makefile.am
+3
View File
@@ -30,7 +30,10 @@ gtk3_keymaps = \
sdl_keymaps = \
sdl_sym.vkm \
sdl_sym_de.vkm \
sdl_sym_uk.vkm \
sdl_pos.vkm \
sdl_pos_de.vkm \
sdl_pos_uk.vkm \
sdl_pos_fr.vkm \
sdl_pos_fi.vkm
vice/data/VIC20/Makefile.in
+5
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -419,7 +421,10 @@ gtk3_keymaps = \
sdl_keymaps = \
sdl_sym.vkm \
sdl_sym_de.vkm \
sdl_sym_uk.vkm \
sdl_pos.vkm \
sdl_pos_de.vkm \
sdl_pos_uk.vkm \
sdl_pos_fr.vkm \
sdl_pos_fi.vkm
vice/data/VIC20/gtk3_pos_de.vkm
+1
View File
@@ -390,5 +390,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/VIC20/gtk3_sym_de.vkm
+1
View File
@@ -405,5 +405,6 @@ KP_Subtract -5 14
Print -5 15
KP_0 -5 16
KP_Delete -5 17
KP_Decimal -5 17
KP_Enter -5 18
KP_Add -5 19
vice/data/VIC20/sdl_pos.vkm
+15 -7
View File
@@ -127,6 +127,8 @@
!VCTRL LCTRL
27 0 3 8 /* ESC -> Run/Stop */
96 0 1 8 /* ` -> Left Arrow */
49 0 0 8 /* 1 -> 1 */
50 0 7 8 /* 2 -> 2 */
51 1 0 8 /* 3 -> 3 */
@@ -140,6 +142,7 @@
45 5 0 8 /* Minus -> Plus */
61 5 7 8 /* Equal -> Minus */
8 7 0 8 /* Backspace -> Del */
9 0 2 16392 /* TAB -> Ctrl */
113 0 6 8 /* Q -> Q */
119 1 1 8 /* W -> W */
@@ -153,8 +156,10 @@
112 5 1 8 /* P -> P */
91 5 6 8 /* [ -> @ */
93 6 1 8 /* ] -> * */
92 6 6 8 /* \ -> Up Arrow */
13 7 1 8 /* Return -> Return */
306 0 5 8200 /* Left Ctrl -> CBM */
301 1 3 64 /* Caps Lock -> Shift Lock */
97 1 2 8 /* A -> A */
115 1 5 8 /* S -> S */
100 2 2 8 /* D -> D */
@@ -166,10 +171,8 @@
108 5 2 8 /* L -> L */
59 5 5 8 /* ; -> : */
39 6 2 8 /* ' -> ; */
96 0 1 8 /* ` -> Left Arrow */
92 6 6 8 /* \ -> Up Arrow */
304 1 3 2 /* Left Shift -> Left Shift */
301 1 3 64 /* Caps Lock -> Shift Lock */
122 1 4 8 /* Z -> Z */
120 2 3 8 /* X -> X */
99 2 4 8 /* C -> C */
@@ -181,7 +184,10 @@
46 5 4 8 /* . -> . */
47 6 3 8 /* / -> / */
303 6 4 4 /* Right Shift -> Right Shift */
306 0 5 8200 /* Left Ctrl -> CBM */
32 0 4 8 /* Space -> Space */
282 7 4 8 /* F1 -> F1 */
283 7 4 1 /* F2 -> F2 */
284 7 5 8 /* F3 -> F3 */
@@ -190,18 +196,20 @@
287 7 6 1 /* F6 -> F6 */
288 7 7 8 /* F7 -> F7 */
289 7 7 1 /* F8 -> F8 */
278 6 7 8 /* Home -> CLR/HOME */
273 7 3 1 /* Up -> CRSR UP */
276 7 2 1 /* Left -> CRSR LEFT */
275 7 2 8 /* Right -> CRSR RIGHT */
274 7 3 8 /* Down -> CRSR DOWN */
277 7 0 1 /* Ins -> Insert */
127 7 0 8 /* Del -> Delete */
279 6 0 8 /* End -> Pound */
281 6 5 8 /* Page down -> = */
277 7 0 1 /* Insert -> Insert */
127 7 0 8 /* Del -> Delete */
# Restore key mappings
280 -3 0
280 -3 0 /* Page up -> Restore */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/VIC20/sdl_pos_de.vkm
+253
View File
@@ -0,0 +1,253 @@
# VICE keyboard mapping file
#
# A Keyboard map is read in as patch to the current map.
#
# File format:
# - comment lines start with '#'
# - keyword lines start with '!keyword'
# - normal lines have 'keysym/scancode row column shiftflag'
#
# Keywords and their lines are:
# '!CLEAR' clear whole table
# '!INCLUDE filename' read file as mapping file
# '!LSHIFT row col' left shift keyboard row/column
# '!RSHIFT row col' right shift keyboard row/column
# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
# '!SHIFTL shiftkey' shift lock key (RSHIFT or LSHIFT)
# for emulated keyboards that have only one shift key, set both LSHIFT
# and RSHIFT to the same row/col and use RSHIFT for VSHIFT and SHIFTL.
# '!LCTRL row col' left control keyboard row/column
# '!VCTRL ctrlkey' virtual control key (LCTRL)
# '!LCBM row col' left CBM keyboard row/column
# '!VCBM cbmkey' virtual CBM key (LCBM)
# '!UNDEF keysym' remove keysym from table
#
# Shiftflag can have these values, flags can be ORed to combine them:
# 0x0000 0 key is not shifted for this keysym/scancode
# 0x0001 1 key is combined with shift for this keysym/scancode
# 0x0002 2 key is left shift on emulated machine
# 0x0004 4 key is right shift on emulated machine (use only this one
# for emulated keyboards that have only one shift key)
# 0x0008 8 key can be shifted or not with this keysym/scancode
# 0x0010 16 deshift key for this keysym/scancode
# 0x0020 32 another definition for this keysym/scancode follows
# 0x0040 64 key is shift-lock on emulated machine
# 0x0080 128 shift modifier required on host
# 0x0100 256 key is used for an alternative keyboard mapping, e.g. C64 mode in x128
# 0x0200 512 alt-r (alt-gr) modifier required on host
# 0x0400 1024 ctrl modifier required on host
# 0x0800 2048 key is combined with cbm for this keysym/scancode
# 0x1000 4096 key is combined with ctrl for this keysym/scancode
# 0x2000 8192 key is (left) cbm on emulated machine
# 0x4000 16384 key is (left) ctrl on emulated machine
#
# Negative row values:
# 'keysym -1 n' joystick keymap A, direction n
# 'keysym -2 n' joystick keymap B, direction n
# 'keysym -3 0' first RESTORE key
# 'keysym -3 1' second RESTORE key
# 'keysym -4 0' 40/80 column key (x128)
# 'keysym -4 1' CAPS (ASCII/DIN) key (x128)
# 'keysym -5 n' joyport keypad, key n (not supported in x128)
#
# Joystick direction values:
# 0 Fire
# 1 South/West
# 2 South
# 3 South/East
# 4 West
# 5 East
# 6 North/West
# 7 North
# 8 North/East
#
# Joyport keypad key layout:
# --------------------------
# | 0 | 1 | 2 | 3 | 4 |
# --------------------------
# | 5 | 6 | 7 | 8 | 9 |
# --------------------------
# | 10 | 11 | 12 | 13 | 14 |
# --------------------------
# | 15 | 16 | 17 | 18 | 19 |
# --------------------------
#
# When a bigger spaced key is used,
# it uses the upper left most key value.
# Positional Mapping, German Layout, VIC20, SDL, pc(105)-de keyboard
# note: For some reason SDL does not get keyboard events for "dead keys" at all,
# so a "nodeadkeys" layout must be used. CAUTION: apparently SDL generates
# some tables internally at startup - switching the host layout while
# the emulator is running produces unpredictable results (broken keycodes)
# VIC20 Keyboard matrix
#
# +-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0|Bit 1|Bit 2|Bit 3|Bit 4|Bit 5|Bit 6|Bit 7|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0| 1 ! |A_LFT| CTRL| R/S |SPACE| C= | Q | 2 " |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 1| 3 # | W | A | S_L | Z | S | E | 4 $ |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 2| 5 % | R | D | X | C | F | T | 6 & |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 3| 7 ' | Y | G | V | B | H | U | 8 ( |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 4| 9 ) | I | J | N | M | K | O | 0 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 5| + | P | L | , < | . > | : [ | @ | - |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 6|POUND| * | ; ] | / ? | S_R | = | A_UP| HOME|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 7| DEL |Retrn|C_L/R|C_U/D| F1 | F3 | F5 | F7 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# to convert from C64 to VIC20:
# change rows 7 -> 0, 0 -> 7
# change columns 7 -> 3, 3 -> 7
# VIC20 Keyboard layout:
#
# arrow 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - pound clr del f1/f2
# ctrl q w e r t y u i o p @ * ^ restore f3/f4
# r/s SL a s d f g h j k l :[ ;] = return f5/f6
# CBM LS z x c v b n m ,< .> /? RS u/d l/r f7/f8
# space
!CLEAR
!LSHIFT 1 3
!RSHIFT 6 4
!VSHIFT RSHIFT
!SHIFTL LSHIFT
!LCBM 0 5
!VCBM LCBM
!LCTRL 0 2
!VCTRL LCTRL
# keys that can't be mapped positionally are:
# (row0) pound (-> </>), clr/home (-> home)
# (row1) arrow up (-> end), restore (-> page up)
# (row2) run/stop (-> escape)
# (row3) commodore (-> control)
# extra keys are:
# clr/home (-> pos1)
# ins/del (-> delete)
# ins/del+shift (-> insert)
# arrow up (-> end)
# arrow up+shift (-> end+shift)
27 0 3 8 /* ESC -> Run/Stop */
94 0 1 8 /* ^ -> Left Arrow */
49 0 0 8 /* 1 -> 1 */
50 0 7 8 /* 2 -> 2 */
51 1 0 8 /* 3 -> 3 */
52 1 7 8 /* 4 -> 4 */
53 2 0 8 /* 5 -> 5 */
54 2 7 8 /* 6 -> 6 */
55 3 0 8 /* 7 -> 7 */
56 3 7 8 /* 8 -> 8 */
57 4 0 8 /* 9 -> 9 */
48 4 7 8 /* 0 -> 0 */
223 5 0 8 /* (de) sz -> Plus */
180 5 7 8 /* (de) ? -> Minus */
8 7 0 8 /* Backspace -> Del */
9 0 2 16392 /* TAB -> Ctrl */
113 0 6 8 /* Q -> Q */
119 1 1 8 /* W -> W */
101 1 6 8 /* E -> E */
114 2 1 8 /* R -> R */
116 2 6 8 /* T -> T */
122 3 1 8 /* Z -> Y */
117 3 6 8 /* U -> U */
105 4 1 8 /* I -> I */
111 4 6 8 /* O -> O */
112 5 1 8 /* P -> P */
252 5 6 8 /* (de) ue -> @ */
43 6 1 8 /* * -> * */
13 7 1 8 /* Return -> Return */
301 1 3 64 /* Caps Lock -> Shift Lock */
97 1 2 8 /* A -> A */
115 1 5 8 /* S -> S */
100 2 2 8 /* D -> D */
102 2 5 8 /* F -> F */
103 3 2 8 /* G -> G */
104 3 5 8 /* H -> H */
106 4 2 8 /* J -> J */
107 4 5 8 /* K -> K */
108 5 2 8 /* L -> L */
246 5 5 8 /* (de) oe -> : */
228 6 2 8 /* (de) ae -> ; */
35 6 5 8 /* # -> = */
304 1 3 2 /* Left Shift -> Left Shift */
60 6 0 8 /* (de) < > -> Pound */
121 1 4 8 /* Y -> Z */
120 2 3 8 /* X -> X */
99 2 4 8 /* C -> C */
118 3 3 8 /* V -> V */
98 3 4 8 /* B -> B */
110 4 3 8 /* N -> N */
109 4 4 8 /* M -> M */
44 5 3 8 /* , -> , */
46 5 4 8 /* . -> . */
45 6 3 8 /* - -> / */
303 6 4 4 /* Right Shift -> Right Shift */
306 0 5 8200 /* Left Ctrl -> CBM */
32 0 4 8 /* Space -> Space */
282 7 4 8 /* F1 -> F1 */
283 7 4 1 /* F2 -> F2 */
284 7 5 8 /* F3 -> F3 */
285 7 5 1 /* F4 -> F4 */
286 7 6 8 /* F5 -> F5 */
287 7 6 1 /* F6 -> F6 */
288 7 7 8 /* F7 -> F7 */
289 7 7 1 /* F8 -> F8 */
278 6 7 8 /* Home -> CLR/HOME */
273 7 3 1 /* Up -> CRSR UP */
276 7 2 1 /* Left -> CRSR LEFT */
275 7 2 8 /* Right -> CRSR RIGHT */
274 7 3 8 /* Down -> CRSR DOWN */
277 7 0 1 /* Ins -> Insert */
127 7 0 8 /* Del -> Delete */
279 6 6 8 /* End -> Up Arrow */
267 6 3 8 /* NumPad / -> / */
268 6 1 8 /* NumPad * -> * */
269 5 7 8 /* NumPad - -> - */
270 5 0 8 /* NumPad + -> + */
271 7 1 8 /* NP Return -> Return */
# Restore key mappings
280 -3 0 /* Page up -> Restore */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
263 -5 1 /* NumPad 7 -> keypad 7 */
264 -5 2 /* NumPad 8 -> keypad 8 */
265 -5 3 /* NumPad 9 -> keypad 9 */
267 -5 4 /* NumPad / -> keypad / */
302 -5 5 /* ScrollLock -> keypad x1 */
260 -5 6 /* NumPad 4 -> keypad 4 */
261 -5 7 /* NumPad 5 -> keypad 5 */
262 -5 8 /* NumPad 6 -> keypad 6 */
268 -5 9 /* NumPad * -> keypad * */
317 -5 10 /* SysReq -> keypad x2 */
257 -5 11 /* NumPad 1 -> keypad 1 */
258 -5 12 /* NumPad 2 -> keypad 2 */
259 -5 13 /* NumPad 3 -> keypad 3 */
269 -5 14 /* NumPad - -> keypad - */
316 -5 15 /* PrtScr -> keypad x3 */
256 -5 16 /* NumPad 0 -> keypad 0 */
266 -5 17 /* NumPad , -> keypad . */
271 -5 18 /* NumPad Enter -> keypad enter */
270 -5 19 /* NumPad + -> keypad + */
vice/data/VIC20/sdl_pos_uk.vkm
+233
View File
@@ -0,0 +1,233 @@
# VICE keyboard mapping file
#
# A Keyboard map is read in as patch to the current map.
#
# File format:
# - comment lines start with '#'
# - keyword lines start with '!keyword'
# - normal lines have 'keysym/scancode row column shiftflag'
#
# Keywords and their lines are:
# '!CLEAR' clear whole table
# '!INCLUDE filename' read file as mapping file
# '!LSHIFT row col' left shift keyboard row/column
# '!RSHIFT row col' right shift keyboard row/column
# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
# '!SHIFTL shiftkey' shift lock key (RSHIFT or LSHIFT)
# for emulated keyboards that have only one shift key, set both LSHIFT
# and RSHIFT to the same row/col and use RSHIFT for VSHIFT and SHIFTL.
# '!LCTRL row col' left control keyboard row/column
# '!VCTRL ctrlkey' virtual control key (LCTRL)
# '!LCBM row col' left CBM keyboard row/column
# '!VCBM cbmkey' virtual CBM key (LCBM)
# '!UNDEF keysym' remove keysym from table
#
# Shiftflag can have these values, flags can be ORed to combine them:
# 0x0000 0 key is not shifted for this keysym/scancode
# 0x0001 1 key is combined with shift for this keysym/scancode
# 0x0002 2 key is left shift on emulated machine
# 0x0004 4 key is right shift on emulated machine (use only this one
# for emulated keyboards that have only one shift key)
# 0x0008 8 key can be shifted or not with this keysym/scancode
# 0x0010 16 deshift key for this keysym/scancode
# 0x0020 32 another definition for this keysym/scancode follows
# 0x0040 64 key is shift-lock on emulated machine
# 0x0080 128 shift modifier required on host
# 0x0100 256 key is used for an alternative keyboard mapping, e.g. C64 mode in x128
# 0x0200 512 alt-r (alt-gr) modifier required on host
# 0x0400 1024 ctrl modifier required on host
# 0x0800 2048 key is combined with cbm for this keysym/scancode
# 0x1000 4096 key is combined with ctrl for this keysym/scancode
# 0x2000 8192 key is (left) cbm on emulated machine
# 0x4000 16384 key is (left) ctrl on emulated machine
#
# Negative row values:
# 'keysym -1 n' joystick keymap A, direction n
# 'keysym -2 n' joystick keymap B, direction n
# 'keysym -3 0' first RESTORE key
# 'keysym -3 1' second RESTORE key
# 'keysym -4 0' 40/80 column key (x128)
# 'keysym -4 1' CAPS (ASCII/DIN) key (x128)
# 'keysym -5 n' joyport keypad, key n (not supported in x128)
#
# Joystick direction values:
# 0 Fire
# 1 South/West
# 2 South
# 3 South/East
# 4 West
# 5 East
# 6 North/West
# 7 North
# 8 North/East
#
# Joyport keypad key layout:
# --------------------------
# | 0 | 1 | 2 | 3 | 4 |
# --------------------------
# | 5 | 6 | 7 | 8 | 9 |
# --------------------------
# | 10 | 11 | 12 | 13 | 14 |
# --------------------------
# | 15 | 16 | 17 | 18 | 19 |
# --------------------------
#
# When a bigger spaced key is used,
# it uses the upper left most key value.
# Positional Mapping, UK Layout, VIC20, SDL
# note: For some reason SDL does not get keyboard events for "dead keys" at all,
# so a "nodeadkeys" layout must be used. CAUTION: apparently SDL generates
# some tables internally at startup - switching the host layout while
# the emulator is running produces unpredictable results (broken keycodes)
# VIC20 Keyboard matrix
#
# +-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0|Bit 1|Bit 2|Bit 3|Bit 4|Bit 5|Bit 6|Bit 7|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0| 1 ! |A_LFT| CTRL| R/S |SPACE| C= | Q | 2 " |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 1| 3 # | W | A | S_L | Z | S | E | 4 $ |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 2| 5 % | R | D | X | C | F | T | 6 & |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 3| 7 ' | Y | G | V | B | H | U | 8 ( |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 4| 9 ) | I | J | N | M | K | O | 0 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 5| + | P | L | , < | . > | : [ | @ | - |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 6|POUND| * | ; ] | / ? | S_R | = | A_UP| HOME|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 7| DEL |Retrn|C_L/R|C_U/D| F1 | F3 | F5 | F7 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# to convert from C64 to VIC20:
# change rows 7 -> 0, 0 -> 7
# change columns 7 -> 3, 3 -> 7
# VIC20 Keyboard layout:
#
# arrow 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - pound clr del f1/f2
# ctrl q w e r t y u i o p @ * ^ restore f3/f4
# r/s SL a s d f g h j k l :[ ;] = return f5/f6
# CBM LS z x c v b n m ,< .> /? RS u/d l/r f7/f8
# space
!CLEAR
!LSHIFT 1 3
!RSHIFT 6 4
!VSHIFT RSHIFT
!SHIFTL LSHIFT
!LCBM 0 5
!VCBM LCBM
!LCTRL 0 2
!VCTRL LCTRL
27 0 3 8 /* ESC -> Run/Stop */
96 0 1 8 /* ` -> Left Arrow */
49 0 0 8 /* 1 -> 1 */
50 0 7 8 /* 2 -> 2 */
51 1 0 8 /* 3 -> 3 */
52 1 7 8 /* 4 -> 4 */
53 2 0 8 /* 5 -> 5 */
54 2 7 8 /* 6 -> 6 */
55 3 0 8 /* 7 -> 7 */
56 3 7 8 /* 8 -> 8 */
57 4 0 8 /* 9 -> 9 */
48 4 7 8 /* 0 -> 0 */
45 5 0 8 /* Minus -> Plus */
61 5 7 8 /* Equal -> Minus */
8 7 0 8 /* Backspace -> Del */
9 0 2 16392 /* TAB -> Ctrl */
113 0 6 8 /* Q -> Q */
119 1 1 8 /* W -> W */
101 1 6 8 /* E -> E */
114 2 1 8 /* R -> R */
116 2 6 8 /* T -> T */
121 3 1 8 /* Y -> Y */
117 3 6 8 /* U -> U */
105 4 1 8 /* I -> I */
111 4 6 8 /* O -> O */
112 5 1 8 /* P -> P */
91 5 6 8 /* [ -> @ */
93 6 1 8 /* ] -> * */
13 7 1 8 /* Return -> Return */
301 1 3 64 /* Caps Lock -> Shift Lock */
97 1 2 8 /* A -> A */
115 1 5 8 /* S -> S */
100 2 2 8 /* D -> D */
102 2 5 8 /* F -> F */
103 3 2 8 /* G -> G */
104 3 5 8 /* H -> H */
106 4 2 8 /* J -> J */
107 4 5 8 /* K -> K */
108 5 2 8 /* L -> L */
59 5 5 8 /* ; -> : */
39 6 2 8 /* ' -> ; */
35 6 5 8 /* # -> = */
304 1 3 2 /* Left Shift -> Left Shift */
92 6 0 8 /* \ -> Pound */
122 1 4 8 /* Z -> Z */
120 2 3 8 /* X -> X */
99 2 4 8 /* C -> C */
118 3 3 8 /* V -> V */
98 3 4 8 /* B -> B */
110 4 3 8 /* N -> N */
109 4 4 8 /* M -> M */
44 5 3 8 /* , -> , */
46 5 4 8 /* . -> . */
47 6 3 8 /* / -> / */
303 6 4 4 /* Right Shift -> Right Shift */
306 0 5 8200 /* Left Ctrl -> CBM */
32 0 4 8 /* Space -> Space */
282 7 4 8 /* F1 -> F1 */
283 7 4 1 /* F2 -> F2 */
284 7 5 8 /* F3 -> F3 */
285 7 5 1 /* F4 -> F4 */
286 7 6 8 /* F5 -> F5 */
287 7 6 1 /* F6 -> F6 */
288 7 7 8 /* F7 -> F7 */
289 7 7 1 /* F8 -> F8 */
278 6 7 8 /* Home -> CLR/HOME */
273 7 3 1 /* Up -> CRSR UP */
276 7 2 1 /* Left -> CRSR LEFT */
275 7 2 8 /* Right -> CRSR RIGHT */
274 7 3 8 /* Down -> CRSR DOWN */
277 7 0 1 /* Ins -> Ins */
127 7 0 8 /* Del -> Del */
279 6 6 8 /* End -> Up Arrow */
# Restore key mappings
280 -3 0 /* Page up -> Restore */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
263 -5 1 /* NumPad 7 -> keypad 7 */
264 -5 2 /* NumPad 8 -> keypad 8 */
265 -5 3 /* NumPad 9 -> keypad 9 */
267 -5 4 /* NumPad / -> keypad / */
302 -5 5 /* ScrollLock -> keypad x1 */
260 -5 6 /* NumPad 4 -> keypad 4 */
261 -5 7 /* NumPad 5 -> keypad 5 */
262 -5 8 /* NumPad 6 -> keypad 6 */
268 -5 9 /* NumPad * -> keypad * */
317 -5 10 /* SysReq -> keypad x2 */
257 -5 11 /* NumPad 1 -> keypad 1 */
258 -5 12 /* NumPad 2 -> keypad 2 */
259 -5 13 /* NumPad 3 -> keypad 3 */
269 -5 14 /* NumPad - -> keypad - */
316 -5 15 /* PrtScr -> keypad x3 */
256 -5 16 /* NumPad 0 -> keypad 0 */
266 -5 17 /* NumPad , -> keypad . */
271 -5 18 /* NumPad Enter -> keypad enter */
270 -5 19 /* NumPad + -> keypad + */
vice/data/VIC20/sdl_sym.vkm
+11 -5
View File
@@ -127,6 +127,8 @@
!VCTRL LCTRL
27 0 3 8 /* ESC -> Run/Stop */
96 0 1 129 /* ~ -> Arrow Left */
49 0 0 8 /* 1 -> 1 */
50 0 7 32 /* 2 -> 2 */
50 5 6 144 /* @ -> @ */
@@ -148,6 +150,7 @@
61 6 5 32 /* = -> = */
61 5 0 144 /* + -> + */
8 7 0 8 /* Backspace -> DEL */
9 0 5 8192 /* Tab -> CBM */
113 0 6 8 /* Q -> Q */
119 1 1 8 /* W -> W */
@@ -161,8 +164,10 @@
112 5 1 8 /* P -> P */
91 5 5 1 /* [ -> [ */
93 6 2 1 /* ] -> ] */
92 6 0 8 /* \ -> Pound */
13 7 1 8 /* Return -> Return */
306 0 2 16384 /* Left Ctrl -> Ctrl */
301 1 3 64 /* Caps Lock -> Shift Lock */
97 1 2 8 /* A -> A */
115 1 5 8 /* S -> S */
100 2 2 8 /* D -> D */
@@ -177,10 +182,8 @@
39 3 0 33 /* ' -> ' */
39 0 7 129 /* " -> " */
96 3 0 33 /* ` -> ` */
96 0 1 129 /* ~ -> Arrow Left */
92 6 0 8 /* \ -> Pound */
304 1 3 2 /* Left Shift -> Left Shift */
301 1 3 64 /* Caps Lock -> Shift Lock */
122 1 4 8 /* Z -> Z */
120 2 3 8 /* X -> X */
99 2 4 8 /* C -> C */
@@ -192,7 +195,10 @@
46 5 4 8 /* . -> . */
47 6 3 8 /* / -> / */
303 6 4 4 /* Right Shift -> Right Shift */
306 0 2 16384 /* Left Ctrl -> Ctrl */
32 0 4 8 /* Space -> Space */
282 7 4 8 /* F1 -> F1 */
283 7 4 1 /* F2 -> F2 */
284 7 5 8 /* F3 -> F3 */
@@ -212,7 +218,7 @@
281 6 6 8 /* Page down -> Arrow Up */
# Restore key mappings
280 -3 0
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
vice/data/VIC20/sdl_sym_uk.vkm
+246
View File
@@ -0,0 +1,246 @@
# VICE keyboard mapping file
#
# A Keyboard map is read in as patch to the current map.
#
# File format:
# - comment lines start with '#'
# - keyword lines start with '!keyword'
# - normal lines have 'keysym/scancode row column shiftflag'
#
# Keywords and their lines are:
# '!CLEAR' clear whole table
# '!INCLUDE filename' read file as mapping file
# '!LSHIFT row col' left shift keyboard row/column
# '!RSHIFT row col' right shift keyboard row/column
# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
# '!SHIFTL shiftkey' shift lock key (RSHIFT or LSHIFT)
# for emulated keyboards that have only one shift key, set both LSHIFT
# and RSHIFT to the same row/col and use RSHIFT for VSHIFT and SHIFTL.
# '!LCTRL row col' left control keyboard row/column
# '!VCTRL ctrlkey' virtual control key (LCTRL)
# '!LCBM row col' left CBM keyboard row/column
# '!VCBM cbmkey' virtual CBM key (LCBM)
# '!UNDEF keysym' remove keysym from table
#
# Shiftflag can have these values, flags can be ORed to combine them:
# 0x0000 0 key is not shifted for this keysym/scancode
# 0x0001 1 key is combined with shift for this keysym/scancode
# 0x0002 2 key is left shift on emulated machine
# 0x0004 4 key is right shift on emulated machine (use only this one
# for emulated keyboards that have only one shift key)
# 0x0008 8 key can be shifted or not with this keysym/scancode
# 0x0010 16 deshift key for this keysym/scancode
# 0x0020 32 another definition for this keysym/scancode follows
# 0x0040 64 key is shift-lock on emulated machine
# 0x0080 128 shift modifier required on host
# 0x0100 256 key is used for an alternative keyboard mapping, e.g. C64 mode in x128
# 0x0200 512 alt-r (alt-gr) modifier required on host
# 0x0400 1024 ctrl modifier required on host
# 0x0800 2048 key is combined with cbm for this keysym/scancode
# 0x1000 4096 key is combined with ctrl for this keysym/scancode
# 0x2000 8192 key is (left) cbm on emulated machine
# 0x4000 16384 key is (left) ctrl on emulated machine
#
# Negative row values:
# 'keysym -1 n' joystick keymap A, direction n
# 'keysym -2 n' joystick keymap B, direction n
# 'keysym -3 0' first RESTORE key
# 'keysym -3 1' second RESTORE key
# 'keysym -4 0' 40/80 column key (x128)
# 'keysym -4 1' CAPS (ASCII/DIN) key (x128)
# 'keysym -5 n' joyport keypad, key n (not supported in x128)
#
# Joystick direction values:
# 0 Fire
# 1 South/West
# 2 South
# 3 South/East
# 4 West
# 5 East
# 6 North/West
# 7 North
# 8 North/East
#
# Joyport keypad key layout:
# --------------------------
# | 0 | 1 | 2 | 3 | 4 |
# --------------------------
# | 5 | 6 | 7 | 8 | 9 |
# --------------------------
# | 10 | 11 | 12 | 13 | 14 |
# --------------------------
# | 15 | 16 | 17 | 18 | 19 |
# --------------------------
#
# When a bigger spaced key is used,
# it uses the upper left most key value.
# Symbolic Mapping, UK Layout, VIC20, SDL
# note: For some reason SDL does not get keyboard events for "dead keys" at all,
# so a "nodeadkeys" layout must be used. CAUTION: apparently SDL generates
# some tables internally at startup - switching the host layout while
# the emulator is running produces unpredictable results (broken keycodes)
# VIC20 Keyboard matrix
#
# +-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0|Bit 1|Bit 2|Bit 3|Bit 4|Bit 5|Bit 6|Bit 7|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 0| 1 ! |A_LFT| CTRL| R/S |SPACE| C= | Q | 2 " |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 1| 3 # | W | A | S_L | Z | S | E | 4 $ |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 2| 5 % | R | D | X | C | F | T | 6 & |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 3| 7 ' | Y | G | V | B | H | U | 8 ( |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 4| 9 ) | I | J | N | M | K | O | 0 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 5| + | P | L | , < | . > | : [ | @ | - |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 6|POUND| * | ; ] | / ? | S_R | = | A_UP| HOME|
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# |Bit 7| DEL |Retrn|C_L/R|C_U/D| F1 | F3 | F5 | F7 |
# +-----+-----+-----+-----+-----+-----+-----+-----+-----+
# to convert from C64 to VIC20:
# change rows 7 -> 0, 0 -> 7
# change columns 7 -> 3, 3 -> 7
# VIC20 Keyboard layout:
#
# arrow 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - pound clr del f1/f2
# ctrl q w e r t y u i o p @ * ^ restore f3/f4
# r/s SL a s d f g h j k l :[ ;] = return f5/f6
# CBM LS z x c v b n m ,< .> /? RS u/d l/r f7/f8
# space
!CLEAR
!LSHIFT 1 3
!RSHIFT 6 4
!VSHIFT RSHIFT
!SHIFTL LSHIFT
!LCBM 0 5
!VCBM LCBM
!LCTRL 0 2
!VCTRL LCTRL
27 0 3 8 /* ESC -> Run/Stop */
96 0 1 8 /* ¬ -> Arrow Left */
49 0 0 8 /* 1 -> 1 */
50 0 7 32 /* 2 -> 2 */
50 0 7 129 /* " -> " */
51 1 0 32 /* 3 -> 3 */
51 6 0 144 /* £ -> pound */
52 1 7 8 /* 4 -> 4 */
53 2 0 8 /* 5 -> 5 */
54 2 7 32 /* 6 -> 6 */
54 6 6 144 /* ^ -> Arrow up */
55 3 0 32 /* 7 -> 7 */
55 2 7 129 /* & -> & */
56 3 7 32 /* 8 -> 8 */
56 6 1 144 /* * -> * */
57 4 0 32 /* 9 -> 9 */
57 3 7 129 /* ( -> ( */
48 4 7 32 /* 0 -> 0 */
48 4 0 129 /* ) -> ) */
45 5 7 32 /* Minus -> Minus */
45 5 6 2192 /* _ -> _ */
61 6 5 32 /* = -> = */
61 5 0 144 /* + -> + */
8 7 0 8 /* Backspace -> DEL */
9 0 5 8192 /* Tab -> CBM */
113 0 6 8 /* Q -> Q */
119 1 1 8 /* W -> W */
101 1 6 8 /* E -> E */
114 2 1 8 /* R -> R */
116 2 6 8 /* T -> T */
121 3 1 8 /* Y -> Y */
117 3 6 8 /* U -> U */
105 4 1 8 /* I -> I */
111 4 6 8 /* O -> O */
112 5 1 8 /* P -> P */
91 5 5 1 /* [ -> [ */
93 6 2 1 /* ] -> ] */
13 7 1 8 /* Return -> Return */
301 1 3 64 /* Caps Lock -> Shift Lock */
97 1 2 8 /* A -> A */
115 1 5 8 /* S -> S */
100 2 2 8 /* D -> D */
102 2 5 8 /* F -> F */
103 3 2 8 /* G -> G */
104 3 5 8 /* H -> H */
106 4 2 8 /* J -> J */
107 4 5 8 /* K -> K */
108 5 2 8 /* L -> L */
59 6 2 32 /* ; -> ; */
59 5 5 144 /* : -> : */
39 3 0 33 /* ' -> ' */
39 5 6 144 /* @ -> @ */
35 1 0 1 /* # -> # */
304 1 3 2 /* Left Shift -> Left Shift */
92 6 6 8 /* | -> Arrow up */
122 1 4 8 /* Z -> Z */
120 2 3 8 /* X -> X */
99 2 4 8 /* C -> C */
118 3 3 8 /* V -> V */
98 3 4 8 /* B -> B */
110 4 3 8 /* N -> N */
109 4 4 8 /* M -> M */
44 5 3 8 /* , -> , */
46 5 4 8 /* . -> . */
47 6 3 8 /* / -> / */
303 6 4 4 /* Right Shift -> Right Shift */
306 0 2 16384 /* Left Ctrl -> Ctrl */
32 0 4 8 /* Space -> Space */
282 7 4 8 /* F1 -> F1 */
283 7 4 1 /* F2 -> F2 */
284 7 5 8 /* F3 -> F3 */
285 7 5 1 /* F4 -> F4 */
286 7 6 8 /* F5 -> F5 */
287 7 6 1 /* F6 -> F6 */
288 7 7 8 /* F7 -> F7 */
289 7 7 1 /* F8 -> F8 */
278 6 7 8 /* Home -> CLR/HOME */
273 7 3 1 /* Up -> CRSR UP */
276 7 2 1 /* Left -> CRSR LEFT */
275 7 2 8 /* Right -> CRSR RIGHT */
274 7 3 8 /* Down -> CRSR DOWN */
277 7 0 1 /* Insert -> INS */
127 7 0 8 /* Delete -> DEL */
279 0 1 8 /* End -> Left Arrow */
#281 /* Page down -> */
# Restore key mappings
280 -3 0 /* Page Up -> RESTORE */
# Joyport attached keypad key mappings
300 -5 0 /* NumLock -> keypad x0 */
263 -5 1 /* NumPad 7 -> keypad 7 */
264 -5 2 /* NumPad 8 -> keypad 8 */
265 -5 3 /* NumPad 9 -> keypad 9 */
267 -5 4 /* NumPad / -> keypad / */
302 -5 5 /* ScrollLock -> keypad x1 */
260 -5 6 /* NumPad 4 -> keypad 4 */
261 -5 7 /* NumPad 5 -> keypad 5 */
262 -5 8 /* NumPad 6 -> keypad 6 */
268 -5 9 /* NumPad * -> keypad * */
317 -5 10 /* SysReq -> keypad x2 */
257 -5 11 /* NumPad 1 -> keypad 1 */
258 -5 12 /* NumPad 2 -> keypad 2 */
259 -5 13 /* NumPad 3 -> keypad 3 */
269 -5 14 /* NumPad - -> keypad - */
316 -5 15 /* PrtScr -> keypad x3 */
256 -5 16 /* NumPad 0 -> keypad 0 */
266 -5 17 /* NumPad , -> keypad . */
271 -5 18 /* NumPad Enter -> keypad enter */
270 -5 19 /* NumPad + -> keypad + */
vice/data/common/Makefile.am
+9 -1
View File
@@ -73,7 +73,14 @@ icon_files = icon1024x1024.png \
logo_files = CBM_Logo.svg \
vice-logo-black.svg
font_files = C64_Pro_Mono-STYLE.ttf
font_files = C64_Pro_Mono-STYLE.ttf \
PetMe1282Y.ttf \
PetMe128.ttf \
PetMe2X.ttf \
PetMe2Y.ttf \
PetMe642Y.ttf \
PetMe64.ttf \
PetMe.ttf
common_DATA = $(icon_files) \
$(logo_files) \
@@ -82,6 +89,7 @@ common_DATA = $(icon_files) \
EXTRA_DIST = $(icon_files) \
$(logo_files) \
$(font_files) \
PetMe-FreeLicense.txt \
x64.rc \
x64sc.rc \
x64dtv.rc \
vice/data/common/Makefile.in
+12 -1
View File
@@ -359,6 +359,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -462,12 +464,21 @@ icon_files = icon1024x1024.png \
logo_files = CBM_Logo.svg \
vice-logo-black.svg
font_files = C64_Pro_Mono-STYLE.ttf
font_files = C64_Pro_Mono-STYLE.ttf \
PetMe1282Y.ttf \
PetMe128.ttf \
PetMe2X.ttf \
PetMe2Y.ttf \
PetMe642Y.ttf \
PetMe64.ttf \
PetMe.ttf
common_DATA = $(icon_files) $(logo_files) $(font_files) \
$(am__append_1)
EXTRA_DIST = $(icon_files) \
$(logo_files) \
$(font_files) \
PetMe-FreeLicense.txt \
x64.rc \
x64sc.rc \
x64dtv.rc \
vice/data/common/PetMe-FreeLicense.txt
+20
View File
@@ -0,0 +1,20 @@
KREATIVE SOFTWARE RELAY FONTS FREE USE LICENSE
version 1.2f
Permission is hereby granted, free of charge, to any person or entity (the "User") obtaining a copy of the included font files (the "Software") produced by Kreative Software, to utilize, display, embed, or redistribute the Software, subject to the following conditions:
1. The User may not sell copies of the Software for a fee.
1a. The User may give away copies of the Software free of charge provided this license and any documentation is included verbatim and credit is given to Kreative Korporation or Kreative Software.
2. The User may not modify, reverse-engineer, or create any derivative works of the Software.
3. Any Software carrying the following font names or variations thereof is not covered by this license and may not be used under the terms of this license: Jewel Hill, Miss Diode n Friends, This is Beckie's font!
3a. Any Software carrying a font name ending with the string "Pro CE" is not covered by this license and may not be used under the terms of this license.
4. This license becomes null and void if any of the above conditions are not met.
5. Kreative Software reserves the right to change this license at any time without notice.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE SOFTWARE OR FROM OTHER DEALINGS IN THE SOFTWARE.
vice/data/hotkeys/Makefile.in
+2
View File
@@ -358,6 +358,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/Makefile.in
+2
View File
@@ -418,6 +418,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/Release-Howto.txt
+25 -18
View File
@@ -10,8 +10,13 @@ $ svn log -r <rev of last release>:<current rev> > log.txt
you can look up the revision of the last release in the tags directory in the
repo: https://sourceforge.net/p/vice-emu/code/HEAD/tree/tags/
- update the html pages in doc/html (index.html, windows.html, macosx.html). use
the checklinks.sh script to check the links.
- update the html pages in doc/html
- use the checklinks.sh script to check all links.
- index.html ("news" update release date and new major.minor, "Download VICE"
update new major.minor)
- macosx.html (duplicate top paragraph and update for new major.minor)
- windows.html (duplicate "Binary distributions" top paragraph and update for
new major.minor)
$ cd doc/html
$ ./checklinks.sh
@@ -31,18 +36,9 @@ $ cd ..
vice.texi contains the author list twice, once under "@c
---vice-core-team---", and once under "@node Copyright"
- run src/buildtools/updatereadme.sh to update README and vicedate.h with the
current year.
- make sure to 'touch' vice.texi so that the current year will be put into all
needed files.
Everything up to this point can be prepared in advance. The following should be
done in one go when creating the actual release.
$ touch doc/vice.texi
$ ./src/buildtools/genvicedate_h.sh
- after changing any of the above, make sure to run "make" so the changes will
propagate to various files, and then commit the changed files.
$ make all
$ svn commit -m "preparing release - no more committing until after the release is done!"
- ANNOUNCE A CODE FREEZE ;)
@@ -64,24 +60,34 @@ $ svn commit -m "preparing release - no more committing until after the release
For massive changes we can decide to bump MAJOR and set MINOR and BUILD to 0,
for example when merging the 'vice-4' branch somewhere in the future.
- propagate the updated version into the documentation:
- run src/buildtools/updatereadme.sh to update README with the current year.
- run ./src/buildtools/genvicedate_h.sh to update vicedate.h with the current
year.
- make sure to 'touch' vice.texi so that the current year will be put into all
needed files.
- after changing any of the above, make sure to run "make" so the changes will
propagate to various files, and then commit the changed files.
$ touch doc/vice.texi
$ ./src/buildtools/updatereadme.sh
$ ./src/buildtools/genvicedate_h.sh
$ make all
This will update the user-visible version in the binary/docs (README, index.html
etc), so it should happen only immediately before the release.
while at it, also check the following:
- are the "banners" on various sourceforge pages (tickets) still up to date?
- are the "readmes" in the files areas still up to date?
Make sure everything is fine, and commit the release
$ svn commit -m "this is the 3.8.0 release - merry xmas"
while at it, also check the following:
- are the "banners" on various sourceforge pages (tickets) still up to date?
- are the "readmes" in the files areas still up to date?
****************************************
Tarball verification using Github
****************************************
@@ -141,6 +147,7 @@ $ svn commit -m "this is the 3.8.0 release - merry xmas"
Now fix your stuff, commit to svn, and if you are ready push the tag again:
$ git pull
$ git tag $RELEASE
$ git push origin $RELEASE
vice/doc/building/Linux-GTK3-Howto.txt
+6 -2
View File
@@ -7,8 +7,9 @@ earlier, though you may be able to manually download and compile GTK3.22 for
your platform (untested).
Tested on: Linux Mint 19, 20
Ubuntu 17.10.1, 18.04, 19.04, 20.04.3-LTS
Debian 9.0-9.8, 10.0, 10.3, 10.4, 10.5, 10.6, 11.0, 11.1, 11.2
Ubuntu 17.10.1, 18.04, 19.04, 20.04.3-LTS 22.04 22.10 23.04 23.10
Debian 9.0-9.8, 10.0, 10.3, 10.4, 10.5, 10.6, 11.0, 11.1, 11.2 11.3
11.4 11.5 11.6 11.7 12.0
--------------------------------------------------------------------------------
1. adhoc build from SVN
@@ -40,6 +41,9 @@ $ sudo apt-get install libpulse-dev # for Pulse Audio sound support
$ sudo apt-get install libasound2-dev # for ALSA sound support
$ sudo apt-get install libglew-dev # for OpenGL hardware scaling support
$ sudo apt-get install libcurl4-openssl-dev # for WiC64, >= 7.71.0 is required
$ sudo apt-get install libevdev-dev # for Linux evdev joystick driver,
# can be omitted if `--without-evdev`
# was passed to configure
If you plan on building the PDF documentation, you will also need to install
whatever package includes "epsf.tex". It was recently in "texlive-plain-generic".
vice/doc/building/Makefile.in
+2
View File
@@ -359,6 +359,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/building/Windows-MinGW-GTK3-Howto.txt
+4 -2
View File
@@ -207,12 +207,14 @@ now we can build/install extra libraries:
We need some tools for libieee1284 to build:
# This assumes compiling for x86_64:
$ pacman -S xmlto mingw-w64-x86_64-docbook-{xml,xsl}
$ pacman -S libtool xmlto mingw-w64-x86_64-docbook-{xml,xsl}
$ export XML_CATALOG_FILES="/mingw64/etc/xml/catalog"
$ mkdir ~/work && cd ~/work
$ git clone https://github.com/twaugh/libieee1284 .
$ ./bootstrap && ./configure --without-python && make -s && make -s install
$ ./bootstrap
$ ./configure --without-python
$ make CFLAGS="-Wno-incompatible-pointer-types" -s && make -s install
$ cd .. && rm -rf work
reconfigure with --enable-parsid --enable-libieee1284
vice/doc/html/Makefile.in
+2
View File
@@ -335,6 +335,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/html/index.html
+8 -10
View File
@@ -57,7 +57,7 @@ An extra emulator is provided for C64 expanded with the CMD SuperCPU.
<h1><a NAME="news"></a>News</h1>
<p>
<img SRC="images/new.gif" ALT="[NEW]">
(24 December 2023) Version 3.8 released<br>
(24 December 2024) Version 3.9 released<br>
</p>
<ul>
@@ -147,7 +147,7 @@ Occasionally we might upload unofficial test builds
<ul>
<li>
Tarball:
<a href="https://sourceforge.net/projects/vice-emu/files/releases/vice-3.8.tar.gz/download">vice-3.8.tar.gz</a>
<a href="https://sourceforge.net/projects/vice-emu/files/releases/vice-3.9.tar.gz/download">vice-3.9.tar.gz</a>
</li>
</ul>
@@ -158,10 +158,8 @@ Tarball:
<h4>Windows</h4>
<ul>
<li>Download latest <a href="https://github.com/VICE-Team/svn-mirror/releases">ad hoc build</a> (via github - use this when reporting bugs, please)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/GTK3VICE-3.8-win64.zip/download">VICE 3.8</a> (64bit GTK3)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/GTK3VICE-3.8-win32.zip/download">VICE 3.8</a> (32bit GTK3)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/SDL2VICE-3.8-win64.zip/download">VICE 3.8</a> (64bit SDL2)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/SDL2VICE-3.8-win32.zip/download">VICE 3.8</a> (32bit SDL2)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/GTK3VICE-3.9-win64.zip/download">VICE 3.9</a> (64bit GTK3)</li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/SDL2VICE-3.9-win64.zip/download">VICE 3.9</a> (64bit SDL2)</li>
</ul>
<ul>
@@ -174,14 +172,14 @@ Older binaries for Windows systems can be found <a href="windows.html">here</a>.
<h4>Apple Silicon Mac (macOS 12.0+)</h4>
<ul>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-gtk3-3.8.dmg/download">VICE 3.8 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-sdl2-3.8.dmg/download">VICE 3.8 (SDL2)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-gtk3-3.9.dmg/download">VICE 3.9 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-sdl2-3.9.dmg/download">VICE 3.9 (SDL2)</a></li>
</ul>
<h4>Intel Silicon Mac (macOS 12.0+)</h4>
<ul>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-gtk3-3.8.dmg/download">VICE 3.8 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-sdl2-3.8.dmg/download">VICE 3.8 (SDL2)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-gtk3-3.9.dmg/download">VICE 3.9 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-sdl2-3.9.dmg/download">VICE 3.9 (SDL2)</a></li>
</ul>
<ul>
vice/doc/html/macosx.html
+14
View File
@@ -45,6 +45,20 @@
<p>We recommend the GTK3 user interface over SDL2.</p>
<h3>VICE 3.9</h3>
<h4>Apple Silicon Mac (macOS 12.0+)</h4>
<ul>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-gtk3-3.9.dmg/download">VICE 3.9 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-arm64-sdl2-3.9.dmg/download">VICE 3.9 (SDL2)</a></li>
</ul>
<h4>Intel Silicon Mac (macOS 12.0+)</h4>
<ul>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-gtk3-3.9.dmg/download">VICE 3.9 (GTK3)</a></li>
<li>Download <a href="https://sourceforge.net/projects/vice-emu/files/releases/binaries/macosx/vice-x86-64-sdl2-3.9.dmg/download">VICE 3.9 (SDL2)</a></li>
</ul>
<h3>VICE 3.8</h3>
<h4>Apple Silicon Mac (macOS 12.0+)</h4>
vice/doc/html/windows.html
+15 -3
View File
@@ -53,8 +53,7 @@ Occasionally we might upload unofficial test builds
<h3>Nightly builds</h3>
<p>
Non official nightly builds for Windows provided by Retroplay can be found
<a href="https://tinyurl.com/tjzkr5x">here</a>.<br><br>
We are currently not providing additional nightly builds - please use the ad hoc build from github.<br><br>
We want to thank the <a href="http://vice.pokefinder.org/">pokefinder</a> team
for keeping up with the Commodore.
</p>
@@ -62,7 +61,20 @@ for keeping up with the Commodore.
<h3>Binary distributions</h3>
The only binary distribution that we are providing for VICE 3.8 is an adhoc build on the date of release.
The only binary distribution that we are providing for VICE 3.9 is an adhoc build on the date of release.
<ul>
<li>64bit GTK3:
<a href="http://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/GTK3VICE-3.9-win64.zip/download">GTK3VICE-3.9-win64.zip</a>
</li>
<li>64bit SDL2:
<a href="http://sourceforge.net/projects/vice-emu/files/releases/binaries/windows/SDL2VICE-3.9-win64.zip/download">SDL2VICE-3.9-win64.zip</a>
</li>
</ul>
<p>
<h3>Old (VICE 3.8) GTK3 binary distribution</h3>
<ul>
<li>64bit GTK3:
vice/doc/readmes/Makefile.in
+2
View File
@@ -360,6 +360,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/vice.texi
+764 -112
View File
File diff suppressed because it is too large. Load diff
vice/doc/vim/Makefile.in
+2
View File
@@ -387,6 +387,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/vim/ftdetect/Makefile.in
+2
View File
@@ -328,6 +328,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/doc/vim/syntax/Makefile.in
+2
View File
@@ -328,6 +328,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
vice/src/6510core.c
+81 -13
View File
@@ -45,6 +45,11 @@
#define CPU_STR "Main CPU"
#endif
#ifndef CPU_LOG_ID
#define CPU_LOG_ID LOG_DEFAULT
#warning "CPU_LOG_ID not defined, using LOG_DEFAULT by default"
#endif
#include "traps.h"
#ifndef DRIVE_CPU
@@ -484,7 +489,7 @@ do { \
interrupt_ack_reset(CPU_INT_STATUS); \
bank_start = bank_limit = 0; /* prevent caching */ \
LOCAL_SET_INTERRUPT(1); \
cpu_is_jammed = 0; \
CPU_IS_JAMMED = 0; \
DMA_ON_RESET; \
addr = LOAD_ADDR(0xfffc); \
CHECK_PROFILE_INTERRUPT(addr, 0xfffc); \
@@ -493,23 +498,20 @@ do { \
} \
if (ik & (IK_MONITOR | IK_DMA)) { \
if (ik & IK_MONITOR) { \
if (monitor_force_import(CALLER)) { \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER]) { \
EXPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_STEP)) { \
EXPORT_REGISTERS(); \
monitor_check_icount((uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_BREAK)) { \
EXPORT_REGISTERS(); \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
monitor_startup(CALLER); \
IMPORT_REGISTERS(); \
} \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_WATCH)) { \
EXPORT_REGISTERS(); \
monitor_check_watchpoints(LAST_OPCODE_ADDR, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
@@ -841,10 +843,41 @@ FIXME: perhaps we really have to add some randomness to (some) bits
#define ANE_MAGIC 0xef
#define ANE_RDY_MAGIC 0xee
#ifndef ANE_LOG_LEVEL
#define ANE_LOG_LEVEL 0
#warning "ANE_LOG_LEVEL not defined, disabling by default"
#endif
#if 1
#define ANE_LOGGING(rdy) \
do { \
unsigned int result = ((reg_a_read | (rdy ? ANE_RDY_MAGIC : ANE_MAGIC)) & reg_x_read & p1); \
unsigned int unstablebits = ((reg_a_read ^ 0xff) & (p1 & reg_x_read)); \
if ((ANE_LOG_LEVEL == 2) || ((ANE_LOG_LEVEL == 1) && (unstablebits != 0))) { \
if (unstablebits == 0) { \
log_warning(CPU_LOG_ID, "$%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x%s", \
reg_pc, p1, reg_a_read, reg_x_read, result, rdy ? " (RDY cycle)" : ""); \
} else { \
log_warning(CPU_LOG_ID, "$%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
reg_pc, p1, reg_a_read, reg_x_read, result, \
unstablebits & 0x80 ? '*' : '.', unstablebits & 0x40 ? '*' : '.', \
unstablebits & 0x20 ? '*' : '.', unstablebits & 0x10 ? '*' : '.', \
unstablebits & 0x08 ? '*' : '.', unstablebits & 0x04 ? '*' : '.', \
unstablebits & 0x02 ? '*' : '.', unstablebits & 0x01 ? '*' : '.', \
rdy ? " (RDY cycle)" : "" \
); \
} \
} \
} while (0)
#else
#define ANE_LOGGING(rdy)
#endif
#ifndef ANE
#define ANE(value, pc_inc) \
do { \
uint8_t tmp = ((reg_a_read | ANE_MAGIC) & reg_x_read & ((uint8_t)(value))); \
ANE_LOGGING(0); \
reg_a_write(tmp); \
LOCAL_SET_NZ(tmp); \
INC_PC(pc_inc); \
@@ -1203,7 +1236,7 @@ FIXME: perhaps we really have to add some randomness to (some) bits
uint32_t trap_result; \
EXPORT_REGISTERS(); \
if (!ROM_TRAP_ALLOWED() || (trap_result = ROM_TRAP_HANDLER()) == (uint32_t)-1) { \
cpu_is_jammed = 1; \
CPU_IS_JAMMED = 1; \
REWIND_FETCH_OPCODE(CLK); \
JAM(); \
} else { \
@@ -1348,10 +1381,41 @@ FIXME: perhaps we really have to add some randomness to (some) bits
#define LXA_MAGIC 0xee /* needs to be 0xee for wizball */
#define LXA_RDY_MAGIC 0xee
#ifndef LXA_LOG_LEVEL
#define LXA_LOG_LEVEL 0
#warning "LXA_LOG_LEVEL not defined, disabling by default"
#endif
#if 1
#define LXA_LOGGING(rdy) \
do { \
unsigned int result = (reg_a_read | (rdy ? LXA_RDY_MAGIC : LXA_MAGIC)) & p1; \
unsigned int unstablebits = (reg_a_read ^ 0xff) & p1; \
if ((LXA_LOG_LEVEL == 2) || ((LXA_LOG_LEVEL == 1) && (unstablebits != 0))) { \
if (unstablebits == 0) { \
log_warning(CPU_LOG_ID, "$%04x LAX #$%02x ; A=$%02x -> A=X=$%02x%s", \
reg_pc, p1, reg_a_read, result, rdy ? " (RDY cycle)" : ""); \
} else { \
log_warning(CPU_LOG_ID, "$%04x LAX #$%02x ; A=$%02x -> A=X=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
reg_pc, p1, reg_a_read, result, \
unstablebits & 0x80 ? '*' : '.', unstablebits & 0x40 ? '*' : '.', \
unstablebits & 0x20 ? '*' : '.', unstablebits & 0x10 ? '*' : '.', \
unstablebits & 0x08 ? '*' : '.', unstablebits & 0x04 ? '*' : '.', \
unstablebits & 0x02 ? '*' : '.', unstablebits & 0x01 ? '*' : '.', \
rdy ? " (RDY cycle)" : "" \
); \
} \
} \
} while (0)
#else
#define LXA_LOGGING(rdy)
#endif
#ifndef LXA
#define LXA(value, pc_inc) \
do { \
uint8_t tmp = ((reg_a_read | LXA_MAGIC) & ((uint8_t)(value))); \
LXA_LOGGING(0); \
reg_x_write(tmp); \
reg_a_write(tmp); \
LOCAL_SET_NZ(tmp); \
@@ -2205,7 +2269,11 @@ static const uint8_t rewind_fetch_tab[] = {
/* Here, the CPU is emulated. */
{
#ifndef CPU_IS_JAMMED
static int cpu_is_jammed = 0;
#define CPU_IS_JAMMED cpu_is_jammed
#warning "CPU_IS_JAMMED not defined, using default (internal)"
#endif
unsigned int tmpa; /* needed for some of the opcode macros */
#if !defined(DRIVE_CPU)
CLOCK profiling_clock_start;
@@ -2226,11 +2294,11 @@ static const uint8_t rewind_fetch_tab[] = {
/* HACK: when the CPU is jammed, no interrupts are served, the only way
to recover is reset. so we clear the interrupt flags and force
acknowledging them here in this case. */
if (cpu_is_jammed) {
if (CPU_IS_JAMMED) {
interrupt_ack_irq(CPU_INT_STATUS);
CPU_INT_STATUS->global_pending_int &= ~(IK_IRQ | IK_NMI);
if (CPU_INT_STATUS->global_pending_int & IK_RESET) {
cpu_is_jammed = 0;
CPU_IS_JAMMED = 0;
}
}
@@ -2304,7 +2372,7 @@ static const uint8_t rewind_fetch_tab[] = {
/* If reg_pc >= bank_limit then JSR (0x20) hasn't load p2 yet.
The earlier LOAD(reg_pc+2) hack can break stealing badly.
The fixing is now handled in JSR(). */
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, p2 >> 8, reg_a_read, reg_x_read, reg_y_read, reg_sp, LOCAL_STATUS(), origin);
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, p2 >> 8, reg_a_read, reg_x_read, reg_y_read, reg_sp, LOCAL_STATUS(), ORIGIN_MEMSPACE);
#ifndef DRIVE_CPU
memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
#endif
@@ -2376,7 +2444,7 @@ trap_skipped:
case 0x32: /* JAM */
case 0x42: /* JAM */
#endif
cpu_is_jammed = 1;
CPU_IS_JAMMED = 1;
REWIND_FETCH_OPCODE(CLK);
JAM();
break;
vice/src/6510dtvcore.c
+45 -32
View File
@@ -43,6 +43,11 @@
#define CPU_STR "Main CPU"
#endif
#ifndef CPU_LOG_ID
#define CPU_LOG_ID LOG_DEFAULT
#warning "CPU_LOG_ID not defined, using LOG_DEFAULT by default"
#endif
#include "traps.h"
#include "profiler.h"
@@ -412,7 +417,7 @@
addr |= (LOAD(0xfffd) << 8); \
bank_start = bank_limit = 0; /* prevent caching */ \
LOCAL_SET_INTERRUPT(1); \
cpu_is_jammed = 0; \
CPU_IS_JAMMED = 0; \
CHECK_PROFILE_INTERRUPT(addr, 0xfffc); \
JUMP(addr); \
DMA_ON_RESET; \
@@ -420,23 +425,20 @@
} \
if (ik & (IK_MONITOR | IK_DMA)) { \
if (ik & IK_MONITOR) { \
if (monitor_force_import(CALLER)) { \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER]) { \
EXPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_STEP)) { \
EXPORT_REGISTERS(); \
monitor_check_icount((uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_BREAK)) { \
EXPORT_REGISTERS(); \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
monitor_startup(CALLER); \
IMPORT_REGISTERS(); \
} \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_WATCH)) { \
EXPORT_REGISTERS(); \
monitor_check_watchpoints(LAST_OPCODE_ADDR, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
@@ -817,22 +819,26 @@ FIXME: perhaps we really have to add some randomness to (some) bits
*/
#define ANE_MAGIC 0xef
#define ANE_RDY_MAGIC 0xee
#define ANE_RDY_MAGIC (0xee & ANE_MAGIC)
#ifndef ANE_LOG_LEVEL
#define ANE_LOG_LEVEL 0
#warning "ANE_LOG_LEVEL not defined, disabling by default"
#endif
/* FIXME: perhaps we should make the log level a user setting */
#if 1
static int ane_log_level = 1; /* 0: none, 1: unstable only 2: all */
/* static int ane_log_level = 1; */ /* 0: none, 1: unstable only 2: all */
#define ANE_LOGGING(rdy) \
do { \
unsigned int result = ((reg_a_read | (rdy ? ANE_RDY_MAGIC : ANE_MAGIC)) & reg_x & p1); \
unsigned int unstablebits = ((reg_a_read ^ 0xff) & (p1 & reg_x)); \
if ((ane_log_level == 2) || ((ane_log_level == 1) && (unstablebits != 0))) { \
if ((ANE_LOG_LEVEL == 2) || ((ANE_LOG_LEVEL == 1) && (unstablebits != 0))) { \
if (unstablebits == 0) { \
log_warning(LOG_DEFAULT, "%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x%s", \
log_warning(CPU_LOG_ID, "$%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x%s", \
reg_pc, p1, reg_a_read, reg_x, result, rdy ? " (RDY cycle)" : ""); \
} else { \
log_warning(LOG_DEFAULT, "%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
log_warning(CPU_LOG_ID, "$%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
reg_pc, p1, reg_a_read, reg_x, result, \
unstablebits & 0x80 ? '*' : '.', unstablebits & 0x40 ? '*' : '.', \
unstablebits & 0x20 ? '*' : '.', unstablebits & 0x10 ? '*' : '.', \
@@ -860,7 +866,7 @@ static int ane_log_level = 1; /* 0: none, 1: unstable only 2: all */
ANE_LOGGING(0); \
reg_a_write = (uint8_t)((reg_a_read | ANE_MAGIC) & reg_x & p1); \
} \
LOCAL_SET_NZ(reg_a_read); \
LOCAL_SET_NZ(reg_a_write); \
INC_PC(2); \
/* Pretend to be NOP #$nn to not trigger the special case \
when cycles are stolen after the second fetch */ \
@@ -1010,7 +1016,7 @@ static int ane_log_level = 1; /* 0: none, 1: unstable only 2: all */
uint32_t trap_result; \
EXPORT_REGISTERS(); \
if (!ROM_TRAP_ALLOWED() || (trap_result = ROM_TRAP_HANDLER()) == (uint32_t)-1) { \
cpu_is_jammed = 1; \
CPU_IS_JAMMED = 1; \
REWIND_FETCH_OPCODE(CLK); \
JAM(); \
} else { \
@@ -1266,20 +1272,24 @@ FIXME: perhaps we really have to add some randomness to (some) bits
#define LXA_MAGIC 0xee /* needs to be 0xee for wizball */
#define LXA_RDY_MAGIC 0xee
/* FIXME: perhaps we should make the log level a user setting */
#ifndef LXA_LOG_LEVEL
#define LXA_LOG_LEVEL 0
#warning "LXA_LOG_LEVEL not defined, disabling by default"
#endif
#if 1
static int lxa_log_level = 1; /* 0: none, 1: unstable only 2: all */
/* static int lxa_log_level = 1; */ /* 0: none, 1: unstable only 2: all */
#define LXA_LOGGING(rdy) \
do { \
unsigned int result = (reg_a_read | (rdy ? LXA_RDY_MAGIC : LXA_MAGIC)) & p1; \
unsigned int unstablebits = (reg_a_read ^ 0xff) & p1; \
if ((lxa_log_level == 2) || ((lxa_log_level == 1) && (unstablebits != 0))) { \
if ((LXA_LOG_LEVEL == 2) || ((LXA_LOG_LEVEL == 1) && (unstablebits != 0))) { \
if (unstablebits == 0) { \
log_warning(LOG_DEFAULT, "%04x LAX #$%02x ; A=$%02x -> A=X=$%02x%s", \
log_warning(CPU_LOG_ID, "$%04x LAX #$%02x ; A=$%02x -> A=X=$%02x%s", \
reg_pc, p1, reg_a_read, result, rdy ? " (RDY cycle)" : ""); \
} else { \
log_warning(LOG_DEFAULT, "%04x LAX #$%02x ; A=$%02x -> A=X=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
log_warning(CPU_LOG_ID, "$%04x LAX #$%02x ; A=$%02x -> A=X=$%02x (unstable bits: %c%c%c%c%c%c%c%c)%s", \
reg_pc, p1, reg_a_read, result, \
unstablebits & 0x80 ? '*' : '.', unstablebits & 0x40 ? '*' : '.', \
unstablebits & 0x20 ? '*' : '.', unstablebits & 0x10 ? '*' : '.', \
@@ -1307,7 +1317,7 @@ static int lxa_log_level = 1; /* 0: none, 1: unstable only 2: all */
LXA_LOGGING(0); \
reg_a_write = reg_x = (uint8_t)((reg_a_read | LXA_MAGIC) & p1); \
} \
LOCAL_SET_NZ(reg_a_read); \
LOCAL_SET_NZ(reg_a_write); \
INC_PC(2); \
/* Pretend to be NOP #$nn to not trigger the special case \
when cycles are stolen after the second fetch */ \
@@ -1690,7 +1700,11 @@ static const uint8_t fetch_tab[] = {
/* Here, the CPU is emulated. */
{
#ifndef CPU_IS_JAMMED
static int cpu_is_jammed = 0;
#define CPU_IS_JAMMED cpu_is_jammed
#warning "CPU_IS_JAMMED not defined, using default (internal)"
#endif
#if !defined(DRIVE_CPU)
CLOCK profiling_clock_start;
@@ -1708,20 +1722,20 @@ static const uint8_t fetch_tab[] = {
/* HACK: when the CPU is jammed, no interrupts are served, the only way
to recover is reset. so we clear the interrupt flags and force
acknowledging them here in this case. */
if (cpu_is_jammed) {
if (CPU_IS_JAMMED) {
interrupt_ack_irq(CPU_INT_STATUS);
CPU_INT_STATUS->global_pending_int &= ~(IK_IRQ | IK_NMI);
if (CPU_INT_STATUS->global_pending_int & IK_RESET) {
cpu_is_jammed = 0;
CPU_IS_JAMMED = 0;
}
}
{
enum cpu_int pending_interrupt;
if (!(CPU_INT_STATUS->global_pending_int & IK_IRQ)
&& (CPU_INT_STATUS->global_pending_int & IK_IRQPEND)
&& CPU_INT_STATUS->irq_pending_clk <= CLK) {
if (!(CPU_INT_STATUS->global_pending_int & IK_IRQ) &&
(CPU_INT_STATUS->global_pending_int & IK_IRQPEND) &&
(CPU_INT_STATUS->irq_pending_clk <= CLK)) {
interrupt_ack_irq(CPU_INT_STATUS);
}
@@ -1730,10 +1744,9 @@ static const uint8_t fetch_tab[] = {
#if !defined(DRIVE_CPU)
profiling_clock_start = CLK;
#endif
DO_INTERRUPT(pending_interrupt);
if (!(CPU_INT_STATUS->global_pending_int & IK_IRQ)
&& CPU_INT_STATUS->global_pending_int & IK_IRQPEND) {
if (!(CPU_INT_STATUS->global_pending_int & IK_IRQ) &&
CPU_INT_STATUS->global_pending_int & IK_IRQPEND) {
CPU_INT_STATUS->global_pending_int &= ~IK_IRQPEND;
}
while (CLK >= alarm_context_next_pending_clk(ALARM_CONTEXT)) {
@@ -1768,7 +1781,7 @@ static const uint8_t fetch_tab[] = {
/* If reg_pc >= bank_limit then JSR (0x20) hasn't load p2 yet.
The earlier LOAD(reg_pc+2) hack can break stealing badly on x64sc.
The fixing is now handled in JSR(). */
monitor_cpuhistory_store(debug_clk, reg_pc, p0, p1, p2 >> 8, reg_a_read, reg_x, reg_y, reg_sp, LOCAL_STATUS(), 0);
monitor_cpuhistory_store(debug_clk, reg_pc, p0, p1, p2 >> 8, reg_a_read, reg_x, reg_y, reg_sp, LOCAL_STATUS(), ORIGIN_MEMSPACE);
memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
#endif
@@ -1822,7 +1835,7 @@ trap_skipped:
case 0x32: /* JAM */
case 0x42: /* JAM */
#endif
cpu_is_jammed = 1;
CPU_IS_JAMMED = 1;
REWIND_FETCH_OPCODE(CLK);
JAM();
break;
vice/src/65816core.c
+7 -10
View File
@@ -351,28 +351,25 @@
if (ik & (IK_TRAP | IK_MONITOR | IK_DMA)) { \
if (ik & IK_TRAP) { \
EXPORT_REGISTERS(); \
interrupt_do_trap(CPU_INT_STATUS, (uint16_t)reg_pc); \
interrupt_do_trap(CPU_INT_STATUS, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
interrupt65816 &= ~IK_TRAP; \
} \
if (ik & IK_MONITOR) { \
if (monitor_force_import(CALLER)) { \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER]) { \
EXPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_STEP)) { \
monitor_check_icount((uint16_t)reg_pc); \
EXPORT_REGISTERS(); \
monitor_check_icount((uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_BREAK)) { \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
EXPORT_REGISTERS(); \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
monitor_startup(CALLER); \
IMPORT_REGISTERS(); \
} \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_WATCH)) { \
EXPORT_REGISTERS(); \
monitor_check_watchpoints(LAST_OPCODE_ADDR, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
vice/src/65c02core.c
+10 -13
View File
@@ -353,7 +353,7 @@
if (ik & (IK_TRAP | IK_RESET)) { \
if (ik & IK_TRAP) { \
EXPORT_REGISTERS(); \
interrupt_do_trap(CPU_INT_STATUS, (uint16_t)reg_pc); \
interrupt_do_trap(CPU_INT_STATUS, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
if (CPU_INT_STATUS->global_pending_int & IK_RESET) { \
ik |= IK_RESET; \
@@ -370,24 +370,21 @@
} \
if (ik & (IK_MONITOR | IK_DMA)) { \
if (ik & IK_MONITOR) { \
if (monitor_force_import(CALLER)) { \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER]) { \
EXPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_STEP)) { \
monitor_check_icount((uint16_t)reg_pc); \
EXPORT_REGISTERS(); \
monitor_check_icount((uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_BREAK)) { \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
EXPORT_REGISTERS(); \
if (monitor_check_breakpoints(CALLER, (uint16_t)reg_pc)) { \
monitor_startup(CALLER); \
IMPORT_REGISTERS(); \
} \
IMPORT_REGISTERS(); \
} \
if (monitor_mask[CALLER] & (MI_WATCH)) { \
monitor_check_watchpoints(LAST_OPCODE_ADDR, (uint16_t)reg_pc); \
EXPORT_REGISTERS(); \
monitor_check_watchpoints(LAST_OPCODE_ADDR, (uint16_t)reg_pc); \
IMPORT_REGISTERS(); \
} \
} \
@@ -1660,9 +1657,9 @@
}
#endif
if (p0 == 0x20) {
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, LOAD(reg_pc + 2), reg_a, reg_x, reg_y, reg_sp, LOCAL_STATUS(), origin);
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, LOAD(reg_pc + 2), reg_a, reg_x, reg_y, reg_sp, LOCAL_STATUS(), ORIGIN_MEMSPACE);
} else {
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, p2 >> 8, reg_a, reg_x, reg_y, reg_sp, LOCAL_STATUS(), origin);
monitor_cpuhistory_store(history_clk, reg_pc, p0, p1, p2 >> 8, reg_a, reg_x, reg_y, reg_sp, LOCAL_STATUS(), ORIGIN_MEMSPACE);
}
#ifndef DRIVE_CPU
memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
vice/src/Makefile.am
+96 -16
View File
@@ -676,7 +676,13 @@ vsid_SOURCES = $(base_sources) $(midi_sources)
vsid_LDADD = $(vsid_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(VSID_RES)
vsid_DEPENDENCIES = $(vsid_libs)
vsid_LDFLAGS = @vsid_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
vsid_LDFLAGS = @vsid_LDFLAGS@ -Wl,-map -Wl,vsid.map
else
vsid_LDFLAGS = @vsid_LDFLAGS@ -Wl,-Map=vsid.map
endif
endif
.PHONY: vsid-all vsid-program
vsid-all:
@@ -727,7 +733,13 @@ x64_libs = \
x64_SOURCES = $(base_sources) $(midi_sources)
x64_LDADD = $(x64_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X64_RES)
x64_DEPENDENCIES = $(x64_libs)
x64_LDFLAGS = @x64_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
x64_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64.map
else
x64_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64.map
endif
endif
.PHONY: x64-all x64-program
x64-all:
@@ -778,7 +790,13 @@ x64sc_libs = \
x64sc_SOURCES = $(base_sources) $(midi_sources)
x64sc_LDADD = $(x64sc_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X64SC_RES)
x64sc_DEPENDENCIES = $(x64sc_libs)
x64sc_LDFLAGS = @x64_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
x64sc_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64sc.map
else
x64sc_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64sc.map
endif
endif
.PHONY: x64sc-all x64sc-program
x64sc-all:
@@ -813,7 +831,6 @@ x64dtv_libs = \
$(p64_lib) \
$(iecbus_lib) \
$(parallel_lib) \
$(diag_lib) \
$(vdrive_lib) \
$(sid_dtv_lib) \
$(monitor_lib) \
@@ -824,19 +841,26 @@ x64dtv_libs = \
$(common_libs) \
$(imagecontents_lib) \
$(resid_dtv_libs) \
$(userport_lib) \
$(c64dtvstubs_lib) \
$(diag_lib) \
$(joyport_lib) \
$(joystickdrv_lib) \
$(rtc_lib) \
$(hvsc_lib) \
$(hotkeys_lib) \
$(zmbv_lib)\
$(userport_lib)
$(zmbv_lib)
x64dtv_SOURCES = $(base_sources) $(ps2mouse_sources)
x64dtv_LDADD = $(x64dtv_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X64DTV_RES)
x64dtv_DEPENDENCIES = $(x64dtv_libs)
x64dtv_LDFLAGS = @x64_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
x64dtv_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64dtv.map
else
x64dtv_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64dtv.map
endif
endif
.PHONY: x64dtv-all x64dtv-program
x64dtv-all:
@@ -887,7 +911,13 @@ xscpu64_libs = \
xscpu64_SOURCES = $(base_sources) $(midi_sources)
xscpu64_LDADD = $(xscpu64_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XSCPU64_RES)
xscpu64_DEPENDENCIES = $(xscpu64_libs)
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@ -Wl,-map -Wl,xscpu64.map
else
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@ -Wl,-Map=xscpu64.map
endif
endif
.PHONY: xscpu64-all xscpu64-program
xscpu64-all:
@@ -942,7 +972,13 @@ x128_libs = \
x128_SOURCES = $(base_sources) $(midi_sources)
x128_LDADD = $(x128_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X128_RES)
x128_DEPENDENCIES = $(x128_libs)
x128_LDFLAGS = @x128_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
x128_LDFLAGS = @x128_LDFLAGS@ -Wl,-map -Wl,x128.map
else
x128_LDFLAGS = @x128_LDFLAGS@ -Wl,-Map=x128.map
endif
endif
.PHONY: x128-all x128-program
x128-all:
@@ -991,7 +1027,13 @@ xvic_libs = \
xvic_SOURCES = $(base_sources) $(midi_sources)
xvic_LDADD = $(xvic_libs) $(emu_extlibs) $(mascuerade_lib) @TFE_LIBS@ @NETPLAY_LIBS@ $(XVIC_RES)
xvic_DEPENDENCIES = $(xvic_libs)
xvic_LDFLAGS = @xvic_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xvic_LDFLAGS = @xvic_LDFLAGS@ -Wl,-map -Wl,xvic.map
else
xvic_LDFLAGS = @xvic_LDFLAGS@ -Wl,-Map=xvic.map
endif
endif
.PHONY: xvic-all xvic-program
xvic-all:
@@ -1039,7 +1081,13 @@ xpet_libs = \
xpet_SOURCES = $(base_sources)
xpet_LDADD = $(xpet_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XPET_RES)
xpet_DEPENDENCIES = $(xpet_libs)
xpet_LDFLAGS = @xpet_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xpet_LDFLAGS = @xpet_LDFLAGS@ -Wl,-map -Wl,xpet.map
else
xpet_LDFLAGS = @xpet_LDFLAGS@ -Wl,-Map=xpet.map
endif
endif
.PHONY: xpet-all xpet-program
xpet-all:
@@ -1059,6 +1107,7 @@ xplus4_libs = \
$(plus4_lib) \
$(plus4cart_lib) \
$(diag_lib) \
$(userport_lib) \
$(driveiec_lib) \
$(driveiecieee_lib) \
$(driveiecplus4exp_lib) \
@@ -1077,7 +1126,6 @@ xplus4_libs = \
$(rtc_lib) \
$(video_lib) \
$(common_libs) \
$(userport_lib) \
$(imagecontents_lib) \
$(joyport_lib) \
$(joystickdrv_lib) \
@@ -1085,12 +1133,23 @@ xplus4_libs = \
$(hvsc_lib) \
$(hotkeys_lib) \
$(zmbv_lib) \
$(plus4stubs_lib)
$(plus4stubs_lib) \
\
$(plus4_lib)
# NOTE: ^^^ link a second time against plus4_lib to solve a nasty problem with
# unresolved symbols
xplus4_SOURCES = $(base_sources)
xplus4_LDADD = $(xplus4_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XPLUS4_RES)
xplus4_DEPENDENCIES = $(xplus4_libs)
xplus4_LDFLAGS = @xplus4_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xplus4_LDFLAGS = @xplus4_LDFLAGS@ -Wl,-map -Wl,xplus4.map
else
xplus4_LDFLAGS = @xplus4_LDFLAGS@ -Wl,-Map=xplus4.map
endif
endif
.PHONY: xplus4-all xplus4-program
xplus4-all:
@@ -1139,7 +1198,13 @@ xcbm2_libs = \
xcbm2_SOURCES = $(base_sources)
xcbm2_LDADD = $(xcbm2_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XCBM2_RES)
xcbm2_DEPENDENCIES = $(xcbm2_libs)
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-map -Wl,xcbm2.map
else
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-Map=xcbm2.map
endif
endif
.PHONY: xcbm2-all xcbm2-program
xcbm2-all:
@@ -1188,7 +1253,13 @@ xcbm5x0_libs = \
xcbm5x0_SOURCES = $(base_sources)
xcbm5x0_LDADD = $(xcbm5x0_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XCBM5x0_RES)
xcbm5x0_DEPENDENCIES = $(xcbm5x0_libs)
xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@
if HAVE_DEBUG
if MACOS_COMPILE
xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-map -Wl,xcbm5x0.map
else
xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-Map=xcbm5x0.map
endif
endif
.PHONY: xcbm5x0-all xcbm5x0-program
xcbm5x0-all:
@@ -1240,8 +1311,17 @@ c1541_LDADD = \
if WINDOWS_COMPILE
c1541_LDFLAGS = -mconsole
else
c1541_LDFLAGS =
endif
if HAVE_DEBUG
if MACOS_COMPILE
c1541_LDFLAGS = @c1541_LDFLAGS@ -Wl,-map -Wl,c1541.map
else
c1541_LDFLAGS = @c1541_LDFLAGS@ -Wl,-Map=c1541.map
endif
endif
.PHONY: c1541-all c1541-program
c1541-all:
vice/src/Makefile.in
+50 -20
View File
@@ -194,12 +194,12 @@ am__DEPENDENCIES_8 = $(archdep_lib) $(c64dtv_lib) $(c64c64dtv_lib) \
$(datasette_lib) $(driveiec_lib) $(driveiecieee_lib) \
$(driveiecc64exp_lib) $(driveieee_lib) $(drive_lib) \
$(drivetcbm_lib) $(p64_lib) $(iecbus_lib) $(parallel_lib) \
$(diag_lib) $(vdrive_lib) $(sid_dtv_lib) $(monitor_lib) \
$(driver_libs) $(viciidtv_lib) $(raster_lib) $(video_lib) \
$(vdrive_lib) $(sid_dtv_lib) $(monitor_lib) $(driver_libs) \
$(viciidtv_lib) $(raster_lib) $(video_lib) \
$(am__DEPENDENCIES_2) $(imagecontents_lib) \
$(am__DEPENDENCIES_3) $(c64dtvstubs_lib) $(joyport_lib) \
$(rtc_lib) $(hvsc_lib) $(hotkeys_lib) $(zmbv_lib) \
$(userport_lib)
$(am__DEPENDENCIES_3) $(userport_lib) $(c64dtvstubs_lib) \
$(diag_lib) $(joyport_lib) $(rtc_lib) $(hvsc_lib) \
$(hotkeys_lib) $(zmbv_lib)
x64dtv_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(x64dtv_LDFLAGS) \
$(LDFLAGS) -o $@
am_x64sc_OBJECTS = $(am__objects_1) $(am__objects_2)
@@ -257,14 +257,15 @@ xpet_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xpet_LDFLAGS) $(LDFLAGS) \
am_xplus4_OBJECTS = $(am__objects_1)
xplus4_OBJECTS = $(am_xplus4_OBJECTS)
am__DEPENDENCIES_13 = $(archdep_lib) $(tapeport_lib) $(datasette_lib) \
$(plus4_lib) $(plus4cart_lib) $(diag_lib) $(driveiec_lib) \
$(driveiecieee_lib) $(driveiecplus4exp_lib) $(drivetcbm_lib) \
$(drive_lib) $(driveieee_lib) $(parallel_lib) $(driveieee_lib) \
$(p64_lib) $(iecbus_lib) $(vdrive_lib) $(monitor_lib) \
$(sid_lib) $(driver_libs) $(raster_lib) $(rtc_lib) \
$(video_lib) $(am__DEPENDENCIES_2) $(userport_lib) \
$(plus4_lib) $(plus4cart_lib) $(diag_lib) $(userport_lib) \
$(driveiec_lib) $(driveiecieee_lib) $(driveiecplus4exp_lib) \
$(drivetcbm_lib) $(drive_lib) $(driveieee_lib) $(parallel_lib) \
$(driveieee_lib) $(p64_lib) $(iecbus_lib) $(vdrive_lib) \
$(monitor_lib) $(sid_lib) $(driver_libs) $(raster_lib) \
$(rtc_lib) $(video_lib) $(am__DEPENDENCIES_2) \
$(imagecontents_lib) $(joyport_lib) $(am__DEPENDENCIES_3) \
$(hvsc_lib) $(hotkeys_lib) $(zmbv_lib) $(plus4stubs_lib)
$(hvsc_lib) $(hotkeys_lib) $(zmbv_lib) $(plus4stubs_lib) \
$(plus4_lib)
xplus4_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xplus4_LDFLAGS) \
$(LDFLAGS) -o $@
am_xscpu64_OBJECTS = $(am__objects_1) $(am__objects_2)
@@ -629,6 +630,8 @@ install_sh = @install_sh@
libcurl_CFLAGS = @libcurl_CFLAGS@
libcurl_LIBS = @libcurl_LIBS@
libdir = @libdir@
libevdev_CFLAGS = @libevdev_CFLAGS@
libevdev_LIBS = @libevdev_LIBS@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -651,13 +654,29 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@vsid_LDFLAGS = @vsid_LDFLAGS@ -Wl,-Map=vsid.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@vsid_LDFLAGS = @vsid_LDFLAGS@ -Wl,-map -Wl,vsid.map
vsid_LDFLAGS = @vsid_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@x128_LDFLAGS = @x128_LDFLAGS@ -Wl,-Map=x128.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@x128_LDFLAGS = @x128_LDFLAGS@ -Wl,-map -Wl,x128.map
x128_LDFLAGS = @x128_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@x64_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@x64_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64.map
x64_LDFLAGS = @x64_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-Map=xcbm2.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-map -Wl,xcbm2.map
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xpet_LDFLAGS = @xpet_LDFLAGS@ -Wl,-Map=xpet.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xpet_LDFLAGS = @xpet_LDFLAGS@ -Wl,-map -Wl,xpet.map
xpet_LDFLAGS = @xpet_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xplus4_LDFLAGS = @xplus4_LDFLAGS@ -Wl,-Map=xplus4.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xplus4_LDFLAGS = @xplus4_LDFLAGS@ -Wl,-map -Wl,xplus4.map
xplus4_LDFLAGS = @xplus4_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xscpu64_LDFLAGS = @xscpu64_LDFLAGS@ -Wl,-Map=xscpu64.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xscpu64_LDFLAGS = @xscpu64_LDFLAGS@ -Wl,-map -Wl,xscpu64.map
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xvic_LDFLAGS = @xvic_LDFLAGS@ -Wl,-Map=xvic.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xvic_LDFLAGS = @xvic_LDFLAGS@ -Wl,-map -Wl,xvic.map
xvic_LDFLAGS = @xvic_LDFLAGS@
# We have to override the automake default, because we need to use
@@ -1330,7 +1349,8 @@ x64sc_libs = \
x64sc_SOURCES = $(base_sources) $(midi_sources)
x64sc_LDADD = $(x64sc_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X64SC_RES)
x64sc_DEPENDENCIES = $(x64sc_libs)
x64sc_LDFLAGS = @x64_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@x64sc_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64sc.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@x64sc_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64sc.map
# x64dtv
x64dtv_libs = \
@@ -1347,7 +1367,6 @@ x64dtv_libs = \
$(p64_lib) \
$(iecbus_lib) \
$(parallel_lib) \
$(diag_lib) \
$(vdrive_lib) \
$(sid_dtv_lib) \
$(monitor_lib) \
@@ -1358,19 +1377,21 @@ x64dtv_libs = \
$(common_libs) \
$(imagecontents_lib) \
$(resid_dtv_libs) \
$(userport_lib) \
$(c64dtvstubs_lib) \
$(diag_lib) \
$(joyport_lib) \
$(joystickdrv_lib) \
$(rtc_lib) \
$(hvsc_lib) \
$(hotkeys_lib) \
$(zmbv_lib)\
$(userport_lib)
$(zmbv_lib)
x64dtv_SOURCES = $(base_sources) $(ps2mouse_sources)
x64dtv_LDADD = $(x64dtv_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(X64DTV_RES)
x64dtv_DEPENDENCIES = $(x64dtv_libs)
x64dtv_LDFLAGS = @x64_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@x64dtv_LDFLAGS = @x64_LDFLAGS@ -Wl,-Map=x64dtv.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@x64dtv_LDFLAGS = @x64_LDFLAGS@ -Wl,-map -Wl,x64dtv.map
# xscpu64
xscpu64_libs = \
@@ -1539,6 +1560,7 @@ xplus4_libs = \
$(plus4_lib) \
$(plus4cart_lib) \
$(diag_lib) \
$(userport_lib) \
$(driveiec_lib) \
$(driveiecieee_lib) \
$(driveiecplus4exp_lib) \
@@ -1557,7 +1579,6 @@ xplus4_libs = \
$(rtc_lib) \
$(video_lib) \
$(common_libs) \
$(userport_lib) \
$(imagecontents_lib) \
$(joyport_lib) \
$(joystickdrv_lib) \
@@ -1565,8 +1586,13 @@ xplus4_libs = \
$(hvsc_lib) \
$(hotkeys_lib) \
$(zmbv_lib) \
$(plus4stubs_lib)
$(plus4stubs_lib) \
\
$(plus4_lib)
# NOTE: ^^^ link a second time against plus4_lib to solve a nasty problem with
# unresolved symbols
xplus4_SOURCES = $(base_sources)
xplus4_LDADD = $(xplus4_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XPLUS4_RES)
xplus4_DEPENDENCIES = $(xplus4_libs)
@@ -1646,7 +1672,8 @@ xcbm5x0_libs = \
xcbm5x0_SOURCES = $(base_sources)
xcbm5x0_LDADD = $(xcbm5x0_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(XCBM5x0_RES)
xcbm5x0_DEPENDENCIES = $(xcbm5x0_libs)
xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-Map=xcbm5x0.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@xcbm5x0_LDFLAGS = @xcbm2_LDFLAGS@ -Wl,-map -Wl,xcbm5x0.map
# c1541
c1541_SOURCES = \
@@ -1686,6 +1713,9 @@ c1541_LDADD = \
@SDL_EXTRA_LIBS@ \
@ZLIB_LIBS@ @DYNLIB_LIBS@
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_FALSE@c1541_LDFLAGS = @c1541_LDFLAGS@ -Wl,-Map=c1541.map
@HAVE_DEBUG_TRUE@@MACOS_COMPILE_TRUE@c1541_LDFLAGS = @c1541_LDFLAGS@ -Wl,-map -Wl,c1541.map
@WINDOWS_COMPILE_FALSE@c1541_LDFLAGS =
@WINDOWS_COMPILE_TRUE@c1541_LDFLAGS = -mconsole
# distclean
vice/src/aciacore.c
+2 -2
View File
@@ -175,7 +175,7 @@ static void acia_preinit(void)
acia.ticks = 21111;
acia.fd = -1;
acia.in_tx = ACIA_TX_STATE_NO_TRANSMIT;
acia.log = LOG_ERR;
acia.log = LOG_DEFAULT;
acia.irq_type = IK_NONE;
acia.mode = ACIA_MODE_NORMAL;
}
@@ -668,7 +668,7 @@ void myacia_init(void)
acia.alarm_tx = alarm_new(mycpu_alarm_context, MYACIA, int_acia_tx, NULL);
acia.alarm_rx = alarm_new(mycpu_alarm_context, MYACIA, int_acia_rx, NULL);
if (acia.log == LOG_ERR) {
if (acia.log == LOG_DEFAULT) {
acia.log = log_open(MYACIA);
}
}
Loaded 100 of 965 files, more files were not shown because too many files have changed in this diff. Show more