vice-emu-commit Mailing List for VICE (Page 1067)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
vice-emu-commit — Commit notifications for the source server
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
| 2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
| 2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
| 2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
| 2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
| 2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
| 2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
| 2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
| 2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
| 2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
| 2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
| 2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
| 2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
| 2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
| 2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
| 2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
| 2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(28) |
Nov
(7) |
Dec
|
|
From: <bla...@us...> - 2008-06-04 01:59:55
|
Revision: 18836
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18836&view=rev
Author: blackystardust
Date: 2008-06-03 18:59:57 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Added some more warning fixes and beos fixes
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/amigaos/make-bindist.sh
branches/marco/ports/vice/src/arch/beos/archdep.c
branches/marco/ports/vice/src/arch/beos/blockdev.c
branches/marco/ports/vice/src/arch/beos/console.c
branches/marco/ports/vice/src/arch/beos/joy.cc
branches/marco/ports/vice/src/arch/beos/kbd.c
branches/marco/ports/vice/src/arch/beos/kbd.h
branches/marco/ports/vice/src/arch/beos/make-bindist.sh
branches/marco/ports/vice/src/arch/beos/ui_device.cc
branches/marco/ports/vice/src/arch/beos/ui_ram.cc
branches/marco/ports/vice/src/arch/beos/ui_sid.cc
branches/marco/ports/vice/src/arch/beos/ui_sound.cc
branches/marco/ports/vice/src/arch/beos/ui_vicii.cc
branches/marco/ports/vice/src/arch/beos/ui_video.cc
branches/marco/ports/vice/src/arch/beos/uimon.c
branches/marco/ports/vice/src/arch/beos/vicewindow.cc
branches/marco/ports/vice/src/arch/msdos/make-bindist.sh
branches/marco/ports/vice/src/arch/unix/coproc.c
branches/marco/ports/vice/src/arch/unix/gp2x/make-bindist.sh
branches/marco/ports/vice/src/arch/unix/gui/c128ui.c
branches/marco/ports/vice/src/arch/unix/gui/c64ui.c
branches/marco/ports/vice/src/arch/unix/gui/cbm2ui.c
branches/marco/ports/vice/src/arch/unix/gui/uivicii.c
branches/marco/ports/vice/src/arch/unix/gui/uivicii.h
branches/marco/ports/vice/src/arch/unix/mousedrv.c
branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh
branches/marco/ports/vice/src/arch/unix/rs232.c
branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
branches/marco/ports/vice/src/arch/unix/signals.c
branches/marco/ports/vice/src/arch/unix/vsyncarch.c
branches/marco/ports/vice/src/arch/unix/x11/qnxshm.c
branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c
branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
branches/marco/ports/vice/src/initcmdline.c
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/sounddrv/soundbeos.cc
branches/marco/ports/vice/src/video.h
Modified: branches/marco/ports/vice/src/arch/amigaos/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/amigaos/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -157,6 +157,7 @@
rm `find VICE-$AMIGAFLAVOR -name "win_*.vkm"`
rm `find VICE-$AMIGAFLAVOR -name "x11_*.vkm"`
rm `find VICE-$AMIGAFLAVOR -name "RO*.vkm"`
+rm `find VICE-$AMIGAFLAVOR -name "*.vsc"`
rm VICE-$AMIGAFLAVOR/html/texi2html
if test x"$ZIPKIND" = "xzip"; then
tar cf VICE-$AMIGAFLAVOR.tar VICE-$AMIGAFLAVOR VICE-$AMIGAFLAVOR.info
Modified: branches/marco/ports/vice/src/arch/beos/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/archdep.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/archdep.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -216,7 +216,12 @@
stdout_redir = *pstdout_redir;
}
+#ifdef WORDS_BIGENDIAN
+ child_pid = -1;
+#else
child_pid = vfork();
+#endif
+
if (child_pid < 0) {
log_error(LOG_DEFAULT, "vfork() failed: %s.", strerror(errno));
return -1;
Modified: branches/marco/ports/vice/src/arch/beos/blockdev.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/blockdev.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/blockdev.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -37,9 +37,6 @@
/*static log_t blockdev_log = LOG_DEFAULT;*/
-static int device;
-
-
int blockdev_open(const char *name, unsigned int *read_only)
{
return -1;
@@ -77,4 +74,3 @@
{
return 0;
}
-
Modified: branches/marco/ports/vice/src/arch/beos/console.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/console.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/console.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -53,15 +53,24 @@
#else
char *readline(const char *prompt)
{
- char *p = (char*)lib_malloc(1024);
+ char *p, *v;
console_out(NULL, "%s", prompt);
-
fflush(stdout);
- fgets(p, 1024, stdin);
- /* Remove trailing newlines. */
+ p = (char*)lib_malloc(1024);
+ rv = fgets(p, 1024, stdin);
+ /*
+ fgets returns p on success, or null on EOF.
+ If BeVICE is started from Tracker, it will
+ always get an EOF from stdin.
+ */
+
+ if (!rv)
+ lib_free(p);
+ else
{
+ /* Remove trailing newlines. */
int len;
for (len = strlen(p);
@@ -71,7 +80,7 @@
p[len - 1] = '\0';
}
- return p;
+ return rv;
}
#endif
Modified: branches/marco/ports/vice/src/arch/beos/joy.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/joy.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/joy.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -55,9 +55,6 @@
#endif
/* ------------------------------------------------------------------------ */
-/* flag for display state of joysticks in statusbar */
-static int joystickdisplay;
-
/* objects to access hardware devices */
static BJoystick *bjoystick[2];
@@ -98,7 +95,7 @@
if (joy_dev >= NUM_OF_SOFTDEVICES && joy_dev < NUM_OF_SOFTDEVICES+hardware_joystick_count) {
/* it's a hardware-stick; close the device if necessary */
- int device_num = hardware_joystick[joy_dev-NUM_OF_SOFTDEVICES].device_num;
+ device_num = hardware_joystick[joy_dev-NUM_OF_SOFTDEVICES].device_num;
used_by = device_used_by[device_num];
device_used_by[device_num] &= ~(1<<dev_index);
if (!device_used_by[device_num] && used_by) {
Modified: branches/marco/ports/vice/src/arch/beos/kbd.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/kbd.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/kbd.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -54,11 +54,13 @@
/* ------------------------------------------------------------------------ */
+#ifndef COMMON_KBD
/* 40/80 column key. */
static key_ctrl_column4080_func_t key_ctrl_column4080_func = NULL;
/* CAPS key. */
static key_ctrl_caps_func_t key_ctrl_caps_func = NULL;
+#endif
struct _convmap {
/* Conversion map. */
Modified: branches/marco/ports/vice/src/arch/beos/kbd.h
===================================================================
--- branches/marco/ports/vice/src/arch/beos/kbd.h 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/kbd.h 2008-06-04 01:59:57 UTC (rev 18836)
@@ -92,5 +92,9 @@
extern int kbd_handle_keyup(int kcode);
extern const char *kbd_code_to_string(int kcode);
+#ifdef COMMON_KBD
+void kbd_initialize_numpad_joykeys(int* joykeys);
#endif
+#endif
+
Modified: branches/marco/ports/vice/src/arch/beos/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/beos/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -56,7 +56,11 @@
rm `find BeVICE-$VICEVERSION.$BEOSCPU -name "osx*.vkm"`
rm `find BeVICE-$VICEVERSION.$BEOSCPU -name "win_*.vkm"`
rm `find BeVICE-$VICEVERSION.$BEOSCPU -name "x11_*.vkm"`
-rm BeVICE-$VICEVERSION.$BEOSCPU/html/texi2html
+rm `find BeVICE-$VICEVERSION.$BEOSCPU -name "*.vsc"`
+if [ -e BeVICE-$VICEVERSION.$BEOSCPU/html/texi2html ]
+then
+ rm BeVICE-$VICEVERSION.$BEOSCPU/html/texi2html
+fi
if test x"$ZIPKIND" = "xzip"; then
if test x"$ZIP" = "x"; then
zip -r -9 -q BeVICE-$VICEVERSION.$BEOSCPU.zip BeVICE-$VICEVERSION.$BEOSCPU
Modified: branches/marco/ports/vice/src/arch/beos/ui_device.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_device.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_device.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -79,7 +79,7 @@
BMessage *msg;
BBox *box;
const char *disk_image, *dir;
- int res_value,i;
+ int i;
BView::SetViewColor(220,220,220,0);
Modified: branches/marco/ports/vice/src/arch/beos/ui_ram.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_ram.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_ram.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -68,7 +68,6 @@
BBox *box;
BMessage *msg;
BRadioButton *radiobutton;
- BCheckBox *checkbox;
BListItem *item;
char str[128];
int i;
Modified: branches/marco/ports/vice/src/arch/beos/ui_sid.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_sid.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_sid.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -93,7 +93,6 @@
int res_value;
int adr, ladr, hi, index = -1;
int *hadr;
- BListItem *item;
int cursel = addresslistview->CurrentSelection();
resources_get_int("SidStereoAddressStart", &res_value);
@@ -257,7 +256,7 @@
}
void SidWindow::MessageReceived(BMessage *msg) {
- int32 index, val;
+ int32 val;
resource_value_t dummy;
BListItem *item;
Modified: branches/marco/ports/vice/src/arch/beos/ui_sound.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_sound.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_sound.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -96,7 +96,6 @@
BView *background;
BRect r;
BBox *box;
- BCheckBox *checkbox;
BMessage *msg;
BRadioButton *radiobutton;
char str[128];
Modified: branches/marco/ports/vice/src/arch/beos/ui_vicii.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_vicii.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_vicii.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -37,17 +37,6 @@
#include "vsync.h"
}
-static char *palette_name[] = {
- "default",
- "c64s",
- "ccs64",
- "frodo",
- "godot",
- "pc64",
- NULL
-};
-
-
class ViciiWindow : public BWindow {
public:
ViciiWindow();
@@ -64,7 +53,6 @@
B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
{
- BMessage *msg;
BCheckBox *checkbox;
BRect r;
BBox *box;
Modified: branches/marco/ports/vice/src/arch/beos/ui_video.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_video.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/ui_video.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -115,7 +115,6 @@
B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
{
BMessage *msg;
- BSlider *slider;
BCheckBox *checkbox;
BRect r;
BBox *box;
@@ -248,7 +247,6 @@
void VideoWindow::MessageReceived(BMessage *msg) {
int32 index, val;
- resource_value_t dummy;
BMessage *msr;
BListItem *item;
Modified: branches/marco/ports/vice/src/arch/beos/uimon.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/uimon.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/uimon.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -29,6 +29,7 @@
#include "console.h"
#include "lib.h"
#include "monitor.h"
+#include "mon_util.h"
#include "uimon.h"
#include <stdarg.h>
@@ -75,7 +76,16 @@
char *uimon_get_in( char **ppchCommandLine, const char *prompt )
{
- return console_in(console_log, prompt);
+ char *p;
+
+ p = console_in(console_log, prompt);
+ if (!p)
+ {
+ ui_error("BeVICE must be started from a Terminal to use the Monitor.");
+ mon_set_command(console_log, "x", NULL);
+ }
+
+ return p;
}
void uimon_notify_change( void )
@@ -86,4 +96,3 @@
int count)
{
}
-
Modified: branches/marco/ports/vice/src/arch/beos/vicewindow.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/vicewindow.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/beos/vicewindow.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -176,10 +176,6 @@
B_TITLED_WINDOW,
B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS) {
- BMenu *menu, *submenu;
- BMenuItem *item;
- BRect r;
-
/* create the menubar; key events reserved for the emu */
menubar = menu_create(machine_class);
AddChild(menubar);
Modified: branches/marco/ports/vice/src/arch/msdos/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/msdos/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -48,6 +48,7 @@
rm `find dosvice -name "win_*.vkm"`
rm `find dosvice -name "x11_*.vkm"`
rm `find dosvice -name "RO*.vkm"`
+rm `find dosvice -name "*.vsc"`
rm dosvice/html/texi2html
if test x"$ZIPKIND" = "xzip"; then
if test x"$ZIP" = "x"; then
Modified: branches/marco/ports/vice/src/arch/unix/coproc.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/coproc.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/coproc.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -61,6 +61,10 @@
#include <errno.h>
#include <signal.h>
+#ifdef OPENSERVER6_COMPILE
+#include <sys/signal.h>
+#endif
+
#include "coproc.h"
#include "log.h"
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -41,6 +41,7 @@
rm `find vice-gp2x-$VICEVERSION -name "os2*.vkm"`
rm `find vice-gp2x-$VICEVERSION -name "win_*.vkm"`
rm `find vice-gp2x-$VICEVERSION -name "RO*.vkm"`
+rn `find vice-gp2x-$VICEVERSION -name "*.vsc"`
if test x"$ZIPKIND" = "xzip"; then
if test x"$ZIP" = "x"; then
zip -r -9 -q vice-gp2x-$VICEVERSION.zip vice-gp2x-$VICEVERSION
Modified: branches/marco/ports/vice/src/arch/unix/gui/c128ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/c128ui.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gui/c128ui.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -67,7 +67,7 @@
UI_MENU_DEFINE_RADIO(MachineVideoStandard)
-ui_menu_entry_t set_video_standard_submenu[] = {
+static ui_menu_entry_t set_video_standard_c128_submenu[] = {
{ N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
(ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
{ N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
@@ -546,6 +546,10 @@
int c128ui_init(void)
{
+ memcpy(set_video_standard_submenu,
+ set_video_standard_c128_submenu,
+ sizeof(set_video_standard_c128_submenu));
+
ui_set_application_icon(c128_icon_data);
c128ui_dynamic_menu_create();
ui_set_left_menu(c128_left_menu);
Modified: branches/marco/ports/vice/src/arch/unix/gui/c64ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/c64ui.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gui/c64ui.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -70,7 +70,7 @@
UI_MENU_DEFINE_RADIO(MachineVideoStandard)
-ui_menu_entry_t set_video_standard_submenu[] = {
+static ui_menu_entry_t set_video_standard_c64_submenu[] = {
{ N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
(ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
{ N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
@@ -536,6 +536,10 @@
int c64ui_init(void)
{
+ memcpy(set_video_standard_submenu,
+ set_video_standard_c64_submenu,
+ sizeof(set_video_standard_c64_submenu));
+
ui_set_application_icon(c64_icon_data);
c64ui_dynamic_menu_create();
@@ -554,4 +558,3 @@
{
c64ui_dynamic_menu_shutdown();
}
-
Modified: branches/marco/ports/vice/src/arch/unix/gui/cbm2ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/cbm2ui.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gui/cbm2ui.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -60,7 +60,7 @@
UI_MENU_DEFINE_RADIO(MachineVideoStandard)
-ui_menu_entry_t set_video_standard_submenu[] = {
+static ui_menu_entry_t set_video_standard_cbm2_submenu[] = {
{ N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
(ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
{ N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
@@ -535,6 +535,10 @@
int cbm2ui_init(void)
{
+ memcpy(set_video_standard_submenu,
+ set_video_standard_cbm2_submenu,
+ sizeof(set_video_standard_cbm2_submenu));
+
ui_set_application_icon(cbm2_icon_data);
cbm2ui_dynamic_menu_create();
ui_set_left_menu(cbm2_left_menu);
Modified: branches/marco/ports/vice/src/arch/unix/gui/uivicii.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/uivicii.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gui/uivicii.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -39,7 +39,13 @@
#include "vicii.h"
#include "openGL_sync.h"
-extern struct ui_menu_entry_s set_video_standard_submenu[];
+/* array for the actual data to be copied into */
+struct ui_menu_entry_s set_video_standard_submenu[4] = {
+ { NULL },
+ { NULL },
+ { NULL },
+ { NULL }
+};
#include "uifullscreen-menu.h"
UI_FULLSCREEN(VICII)
Modified: branches/marco/ports/vice/src/arch/unix/gui/uivicii.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/uivicii.h 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/gui/uivicii.h 2008-06-04 01:59:57 UTC (rev 18836)
@@ -30,9 +30,9 @@
#include "uimenu.h"
extern struct ui_menu_entry_s vicii_submenu[];
+extern struct ui_menu_entry_s set_video_standard_submenu[];
extern void uivicii_menu_create(void);
extern void uivicii_menu_shutdown(void);
#endif
-
Modified: branches/marco/ports/vice/src/arch/unix/mousedrv.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/mousedrv.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/mousedrv.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -39,7 +39,7 @@
#ifndef MACOSX_COCOA
int mouse_x, mouse_y;
-int mouse_accelx, mouse_accely;
+int mouse_accelx = 2, mouse_accely = 2;
void mousedrv_mouse_changed(void)
@@ -69,12 +69,10 @@
void mouse_button(int bnumber, int state)
{
- if (bnumber == 1)
+ if (bnumber == 0)
mouse_button_left(state);
-/*
if (bnumber == 2)
mouse_button_right(state);
-*/
}
BYTE mousedrv_get_x(void)
Modified: branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -75,6 +75,7 @@
rm `find VICE-$VICEVERSION -name "osx*.vkm"`
rm `find VICE-$VICEVERSION -name "win_*.vkm"`
rm `find VICE-$VICEVERSION -name "RO*.vkm"`
+rm `find VICE-$VICEVERSION -name "*.vsc"`
mkdir -p VICE-$VICEVERSION/opt/man/man1
mv /opt/man/man1/c1541.1 VICE-$VICEVERSION/opt/man/man1
mv /opt/man/man1/petcat.1 VICE-$VICEVERSION/opt/man/man1
Modified: branches/marco/ports/vice/src/arch/unix/rs232.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/rs232.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/rs232.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -75,13 +75,6 @@
#define MAXRS232 4
-#ifdef OPENSERVER6_COMPILE
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#endif
-
#ifdef __NeXT__
int cfsetispeed(struct termios *t, int speed)
{
Modified: branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh 2008-06-04 01:59:57 UTC (rev 18836)
@@ -52,20 +52,22 @@
rm -f -r VICE-$VICEVERSION
mkdir VICE-$VICEVERSION
mkdir -p VICE-$VICEVERSION/usr/local
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/de/LC_MESSAGES
-mv /usr/local/lib/locale/de/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/de/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/fr/LC_MESSAGES
-mv /usr/local/lib/locale/fr/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/fr/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/it/LC_MESSAGES
-mv /usr/local/lib/locale/it/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/it/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/sv/LC_MESSAGES
-mv /usr/local/lib/locale/sv/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/sv/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/pl/LC_MESSAGES
-mv /usr/local/lib/locale/pl/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/pl/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/nl/LC_MESSAGES
-mv /usr/local/lib/locale/nl/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/nl/LC_MESSAGES
-mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/hu/LC_MESSAGES
-mv /usr/local/lib/locale/hu/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/hu/LC_MESSAGES
+if test x"$SYSTEM" != "xsco5" -a x"$SYSTEM" != "xsco6" -a x"$SYSTEM" != "xsco7"; then
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/de/LC_MESSAGES
+ mv /usr/local/lib/locale/de/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/de/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/fr/LC_MESSAGES
+ mv /usr/local/lib/locale/fr/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/fr/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/it/LC_MESSAGES
+ mv /usr/local/lib/locale/it/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/it/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/sv/LC_MESSAGES
+ mv /usr/local/lib/locale/sv/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/sv/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/pl/LC_MESSAGES
+ mv /usr/local/lib/locale/pl/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/pl/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/nl/LC_MESSAGES
+ mv /usr/local/lib/locale/nl/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/nl/LC_MESSAGES
+ mkdir -p VICE-$VICEVERSION/usr/local/lib/locale/hu/LC_MESSAGES
+ mv /usr/local/lib/locale/hu/LC_MESSAGES/vice.* VICE-$VICEVERSION/usr/local/lib/locale/hu/LC_MESSAGES
+fi
mkdir VICE-$VICEVERSION/usr/local/bin
mv /usr/local/bin/vsid VICE-$VICEVERSION/usr/local/bin
mv /usr/local/bin/x64 VICE-$VICEVERSION/usr/local/bin
@@ -94,6 +96,7 @@
rm `find VICE-$VICEVERSION -name "osx*.vkm"`
rm `find VICE-$VICEVERSION -name "win_*.vkm"`
rm `find VICE-$VICEVERSION -name "RO*.vkm"`
+rm `find VICE-$VICEVERSION -name "*.vsc"`
mkdir -p VICE-$VICEVERSION$MANDIR/man1
mv $MANDIR/man1/c1541.1 VICE-$VICEVERSION$MANDIR/man1
mv $MANDIR/man1/petcat.1 VICE-$VICEVERSION$MANDIR/man1
Modified: branches/marco/ports/vice/src/arch/unix/signals.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/signals.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/signals.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <unistd.h>
+#ifdef OPENSERVER6_COMPILE
+#include <sys/signal.h>
+#endif
+
#include "log.h"
#include "monitor.h"
#include "signals.h"
Modified: branches/marco/ports/vice/src/arch/unix/vsyncarch.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/vsyncarch.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/vsyncarch.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -38,13 +38,6 @@
#include <sys/time.h>
#include <unistd.h>
-#ifdef OPENSERVER6_COMPILE
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#endif
-
/* hook to ui event dispatcher */
static void_hook_t ui_dispatch_hook;
Modified: branches/marco/ports/vice/src/arch/unix/x11/qnxshm.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/qnxshm.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/x11/qnxshm.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -7,7 +7,11 @@
#if defined(__QNX__) && !defined(__QNXNTO__)
#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "qnxshm.h"
+
int shmget(key_t key, size_t size, int flags)
{
return -1;
Modified: branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <string.h>
-#ifdef __minix
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -86,8 +86,14 @@
#define abs(a) ((a) < 0 ? -(a) : (a))
#endif
+#ifndef max
#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef min
#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
#define XtStrlen(s) ((s) ? strlen(s) : 0)
#define StrCopy(s) ((char*)strcpy((char *)XtMalloc((strlen(s)+1)*\
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/MultiList.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/MultiList.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -87,8 +87,14 @@
#define abs(a) ((a) < 0 ? -(a) : (a))
#endif
+#ifndef max
#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef min
#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
#define XtStrlen(s) ((s) ? strlen(s) : 0)
#define TypeAlloc(t,n) (t *)lib_malloc(sizeof(t) * n)
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -118,51 +118,6 @@
/* ------------------------------------------------------------------------- */
-void ui_check_mouse_cursor()
-{
-#ifdef HAVE_FULLSCREEN
- int window_doublesize;
- if (fullscreen_is_enabled)
- return;
-#endif
- if (_mouse_enabled) {
-#ifdef HAVE_FULLSCREEN
- if (fullscreen_is_enabled) {
- if (resources_get_int("FullscreenDoubleSize",
- &window_doublesize) < 0)
- return;
- } else
-#endif
-
- if (ui_cached_video_canvas->videoconfig->doublesizex)
- mouse_accelx = 2;
- else
- mouse_accelx = 4;
-
- if (ui_cached_video_canvas->videoconfig->doublesizey)
- mouse_accely = 2;
- else
- mouse_accely = 4;
-
- XDefineCursor(display,XtWindow(canvas), blankCursor);
- cursor_is_blank = 1;
-
- XGrabKeyboard(display, XtWindow(canvas),
- 1, GrabModeAsync,
- GrabModeAsync, CurrentTime);
- XGrabPointer(display, XtWindow(canvas), 1,
- PointerMotionMask | ButtonPressMask |
- ButtonReleaseMask,
- GrabModeAsync, GrabModeAsync,
- XtWindow(canvas),
- None, CurrentTime);
- } else if (cursor_is_blank) {
- XUndefineCursor(display,XtWindow(canvas));
- XUngrabPointer(display, CurrentTime);
- XUngrabKeyboard(display, CurrentTime);
- }
-}
-
void ui_restore_mouse(void)
{
#ifdef HAVE_FULLSCREEN
@@ -199,6 +154,8 @@
static void mouse_handler1351(Widget w, XtPointer client_data, XEvent *report,
Boolean *ctd)
{
+ if (!_mouse_enabled) return;
+
switch(report->type) {
case MotionNotify:
mouse_move(report->xmotion.x,report->xmotion.y);
@@ -219,6 +176,7 @@
/* Translations for the left and right menus. */
static XtTranslations left_menu_translations, right_menu_translations;
+static XtTranslations left_menu_disabled_translations, right_menu_disabled_translations;
static XtTranslations drive8_menu_translations = NULL, drive9_menu_translations = NULL;
/* Application context. */
@@ -282,6 +240,62 @@
/* ------------------------------------------------------------------------- */
+void ui_check_mouse_cursor()
+{
+ int i;
+#ifdef HAVE_FULLSCREEN
+ int window_doublesize;
+ if (fullscreen_is_enabled)
+ return;
+#endif
+ if (_mouse_enabled) {
+ for (i = 0; i < num_app_shells; i++) {
+ XtOverrideTranslations(app_shells[i].canvas, left_menu_disabled_translations);
+ XtOverrideTranslations(app_shells[i].canvas, right_menu_disabled_translations);
+ }
+#ifdef HAVE_FULLSCREEN
+ if (fullscreen_is_enabled) {
+ if (resources_get_int("FullscreenDoubleSize",
+ &window_doublesize) < 0)
+ return;
+ } else
+#endif
+
+ if (ui_cached_video_canvas->videoconfig->doublesizex)
+ mouse_accelx = 2;
+ else
+ mouse_accelx = 4;
+
+ if (ui_cached_video_canvas->videoconfig->doublesizey)
+ mouse_accely = 2;
+ else
+ mouse_accely = 4;
+
+ XDefineCursor(display,XtWindow(canvas), blankCursor);
+ cursor_is_blank = 1;
+
+ XGrabKeyboard(display, XtWindow(canvas),
+ 1, GrabModeAsync,
+ GrabModeAsync, CurrentTime);
+ XGrabPointer(display, XtWindow(canvas), 1,
+ PointerMotionMask | ButtonPressMask |
+ ButtonReleaseMask,
+ GrabModeAsync, GrabModeAsync,
+ XtWindow(canvas),
+ None, CurrentTime);
+ } else if (cursor_is_blank) {
+ XUndefineCursor(display,XtWindow(canvas));
+ XUngrabPointer(display, CurrentTime);
+ XUngrabKeyboard(display, CurrentTime);
+ for (i = 0; i < num_app_shells; i++) {
+ XtOverrideTranslations(app_shells[i].canvas, left_menu_translations);
+ XtOverrideTranslations(app_shells[i].canvas, right_menu_translations);
+ }
+ }
+}
+
+/* ------------------------------------------------------------------------- */
+
static int alloc_colormap(void);
static Widget build_file_selector(Widget parent, ui_button_t *button_return);
static Widget build_error_dialog(Widget parent, ui_button_t *button_return,
@@ -952,6 +966,16 @@
left_menu_translations = XtParseTranslationTable(translation_table);
lib_free(translation_table);
+ translation_table =
+ util_concat("<Btn1Down>: \n",
+ "@Num_Lock<Btn1Down>: \n",
+ "Lock <Btn1Down>: \n"
+ "@Scroll_Lock <Btn1Down>: \n",
+ NULL);
+
+ left_menu_disabled_translations = XtParseTranslationTable(translation_table);
+ lib_free(translation_table);
+
for (i = 0; i < num_app_shells; i++)
XtOverrideTranslations(app_shells[i].canvas, left_menu_translations);
@@ -977,6 +1001,16 @@
right_menu_translations = XtParseTranslationTable(translation_table);
lib_free(translation_table);
+ translation_table =
+ util_concat("<Btn3Down>: \n",
+ "@Num_Lock<Btn3Down>: \n",
+ "Lock <Btn3Down>: \n"
+ "@Scroll_Lock <Btn3Down>: \n",
+ NULL);
+
+ right_menu_disabled_translations = XtParseTranslationTable(translation_table);
+ lib_free(translation_table);
+
for (i = 0; i < num_app_shells; i++)
XtOverrideTranslations(app_shells[i].canvas, right_menu_translations);
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -844,7 +844,7 @@
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
#ifdef FEATURE_CPUMEMHISTORY
NULL,
-#endi
+#endif
NULL }
};
Modified: branches/marco/ports/vice/src/initcmdline.c
===================================================================
--- branches/marco/ports/vice/src/initcmdline.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/initcmdline.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -91,7 +91,7 @@
return 0;
}
-#ifndef __OS2__
+#if !defined(__OS2__) && !defined(__BEOS__)
static int cmdline_console(const char *param, void *extra_param)
{
console_mode = 1;
Modified: branches/marco/ports/vice/src/network.c
===================================================================
--- branches/marco/ports/vice/src/network.c 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/network.c 2008-06-04 01:59:57 UTC (rev 18836)
@@ -42,6 +42,9 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
#ifdef AMIGA_SUPPORT
#ifndef AMIGA_OS4
@@ -108,13 +111,6 @@
extern ssize_t send(int socket, const void *buffer, size_t length, int flags);
#endif
-#ifdef OPENSERVER6_COMPILE
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#endif
-
typedef unsigned int SOCKET;
typedef struct timeval TIMEVAL;
Modified: branches/marco/ports/vice/src/sounddrv/soundbeos.cc
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundbeos.cc 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/sounddrv/soundbeos.cc 2008-06-04 01:59:57 UTC (rev 18836)
@@ -50,9 +50,6 @@
/* the next position to write */
static size_t write_position;
-/* Buffer size (bytes). */
-static unsigned int buffer_len;
-
/* Size of fragment (bytes). */
static unsigned int fragment_size;
@@ -99,7 +96,7 @@
static int beos_write(SWORD *pbuf, size_t nr)
{
- int i,j,count;
+ int i,count;
SWORD *p;
count = nr / fragment_size;
Modified: branches/marco/ports/vice/src/video.h
===================================================================
--- branches/marco/ports/vice/src/video.h 2008-06-03 19:23:49 UTC (rev 18835)
+++ branches/marco/ports/vice/src/video.h 2008-06-04 01:59:57 UTC (rev 18836)
@@ -134,7 +134,7 @@
int doublescan; /* Doublescan enabled? */
int hwscale; /* Hardware scaling enabled? */
int scale2x; /* Scale2x enabled? */
- unsigned int external_palette; /* Use an external palette? */
+ int external_palette; /* Use an external palette? */
char *external_palette_name; /* Name of the external palette. */
int double_buffer; /* Double buffering enabled? */
struct video_cbm_palette_s *cbm_palette; /* Internal palette. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-06-03 19:23:47
|
Revision: 18835
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18835&view=rev
Author: cnvogelg
Date: 2008-06-03 12:23:49 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
chris/cocoa-port: merged trunk [18808]:[18831] (1.22.17)
Modified Paths:
--------------
branches/chris/cocoa-port/vice/ChangeLog
branches/chris/cocoa-port/vice/build/qnx4/build.sh
branches/chris/cocoa-port/vice/configure.in
branches/chris/cocoa-port/vice/po/de.po
branches/chris/cocoa-port/vice/po/fr.po
branches/chris/cocoa-port/vice/po/hu.po
branches/chris/cocoa-port/vice/po/intl2po.c
branches/chris/cocoa-port/vice/po/it.po
branches/chris/cocoa-port/vice/po/nl.po
branches/chris/cocoa-port/vice/po/pl.po
branches/chris/cocoa-port/vice/po/sv.po
branches/chris/cocoa-port/vice/src/6510core.c
branches/chris/cocoa-port/vice/src/ChangeLog
branches/chris/cocoa-port/vice/src/arch/unix/archdep.c
branches/chris/cocoa-port/vice/src/arch/unix/gui/uitfe.c
branches/chris/cocoa-port/vice/src/arch/unix/tfearch.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/renderxv.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/widgets/TextField.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/x11video.c
branches/chris/cocoa-port/vice/src/c1541.c
branches/chris/cocoa-port/vice/src/c64/c64mem.c
branches/chris/cocoa-port/vice/src/c64/patchrom.c
branches/chris/cocoa-port/vice/src/gfxoutput.h
branches/chris/cocoa-port/vice/src/gfxoutputdrv/bmpdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/ffmpegdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/gifdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/iffdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/jpegdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/pcxdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/pngdrv.c
branches/chris/cocoa-port/vice/src/gfxoutputdrv/ppmdrv.c
branches/chris/cocoa-port/vice/src/maincpu.c
branches/chris/cocoa-port/vice/src/monitor/mon_assemble6502.c
branches/chris/cocoa-port/vice/src/monitor/mon_assemblez80.c
branches/chris/cocoa-port/vice/src/monitor/mon_command.c
branches/chris/cocoa-port/vice/src/monitor/mon_lex.c
branches/chris/cocoa-port/vice/src/monitor/mon_lex.l
branches/chris/cocoa-port/vice/src/monitor/mon_parse.c
branches/chris/cocoa-port/vice/src/monitor/mon_parse.h
branches/chris/cocoa-port/vice/src/monitor/mon_parse.y
branches/chris/cocoa-port/vice/src/monitor/monitor.c
branches/chris/cocoa-port/vice/src/monitor/montypes.h
branches/chris/cocoa-port/vice/src/monitor.h
branches/chris/cocoa-port/vice/src/network.c
branches/chris/cocoa-port/vice/src/resources.c
branches/chris/cocoa-port/vice/src/screenshot.c
branches/chris/cocoa-port/vice/src/screenshot.h
branches/chris/cocoa-port/vice/src/sound.c
branches/chris/cocoa-port/vice/src/sounddrv/soundhpux.c
branches/chris/cocoa-port/vice/src/sounddrv/soundsun.c
branches/chris/cocoa-port/vice/src/util.c
branches/chris/cocoa-port/vice/src/version.h
branches/chris/cocoa-port/vice/src/video/video-resources.c
branches/chris/cocoa-port/vice/src/zfile.c
Modified: branches/chris/cocoa-port/vice/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/ChangeLog 2008-06-03 19:12:32 UTC (rev 18834)
+++ branches/chris/cocoa-port/vice/ChangeLog 2008-06-03 19:23:49 UTC (rev 18835)
@@ -1,3 +1,34 @@
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.17.
+
+ * configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
+ if it exists. This adds support for libnet 1.1 for TFE/RR-net
+ emulation.
+
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
+ * configure.in: Changed bash'ism (if [...]) to more general code
+ (if test ...).
+
+2008-05-25 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.16.
+
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * configure.in: honor OBJCFLAGS if available. added Carbon lib
+ for Cocoa linking.
+
+ * build/Makefile.am, build/macosx/build-vice-release.sh: added
+ build-vice-release script
+
+ * Makefile.am: make bindist on Macs need the bash
+
+ * data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
+ data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
+ maps
+
2008-05-19 Spiro Trikaliotis <spi...@gm...>
* autogen.sh: Removed "bash-ism" from script (compare with "=="
Modified: branches/chris/cocoa-port/vice/build/qnx4/build.sh
===================================================================
--- branches/chris/cocoa-port/vice/build/qnx4/build.sh 2008-06-03 19:12:32 UTC (rev 18834)
+++ branches/chris/cocoa-port/vice/build/qnx4/build.sh 2008-06-03 19:23:49 UTC (rev 18835)
@@ -12,7 +12,9 @@
mv src/plus4/Makefile.in src/plus4/Makefile.in.orig
sed s/"-rm -f libplus4.a"/"-rm -f -r libplus4.a;cp plus4mem.o ..\/;mv plus4mem.c plus4mem2.c;echo >plus4mem.c;$\(CC\) -c -o plus4mem.o plus4mem.c;mv plus4mem2.c plus4mem.c"/ <src/plus4/Makefile.in.orig >src/plus4/Makefile.in
+mv src/monitor/Makefile.in src/monitor/Makefile.in.orig
+sed s/"-rm -f libmonitor.a"/"-rm -f -r libmonitor.a;cp monitor.o ..\/;mv monitor.c monitor2.c;echo >monitor.c;$\(CC\) -c -o monitor.o monitor.c;mv monitor2.c monitor.c"/ <src/monitor/Makefile.in.orig >src/monitor/Makefile.in
mv src/Makefile.in src/Makefile.in.orig
-sed s/"@XPLUS4_WINRES@"/"plus4mem.o"/ <src/Makefile.in.orig >src/Makefile.in
+sed -e s/"@X128_WINRES@"/"monitor.o"/ -e s/"@X64_WINRES@"/"monitor.o"/ -e s/"@XVIC_WINRES@"/"monitor.o"/ -e s/"@XPET_WINRES@"/"monitor.o"/ -e s/"@XPLUS4_WINRES@"/"plus4mem.o monitor.o"/ -e s/"@XCBM2_WINRES@"/"monitor.o"/ <src/Makefile.in.orig >src/Makefile.in
./configure -v --prefix=/usr/local cross_compiling=yes ac_cv_c_bigendian=no
make
Modified: branches/chris/cocoa-port/vice/configure.in
===================================================================
--- branches/chris/cocoa-port/vice/configure.in 2008-06-03 19:12:32 UTC (rev 18834)
+++ branches/chris/cocoa-port/vice/configure.in 2008-06-03 19:23:49 UTC (rev 18835)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=15
+VICE_VERSION_BUILD=17
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
@@ -64,8 +64,8 @@
AC_ARG_WITH(oss, [ --without-oss do not use the OSS sound system])
AC_ARG_ENABLE(sdl, [ --with-sdl use sdl sound system])
AC_ARG_WITH(resid, [ --without-resid do not use the reSID engine])
-AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
-AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
+AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
+AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
AC_ARG_ENABLE(fullscreen, [ --enable-fullscreen enable XFree86 fullscreen detection], [ echo checking for XFree86 fullscreen requested...], [enable_fullscreen="no"; echo no explicit checking for XFree86 fullscreen requested, disabling fullscreen...])
AC_ARG_ENABLE(gnomeui,[ --enable-gnomeui enables gnome ui support])
AC_ARG_ENABLE(nls,[ --disable-nls disables national language support])
@@ -76,8 +76,13 @@
AC_ARG_ENABLE(parsid,[ --enable-parsid enables ParSID support])
AC_ARG_WITH(picasso96, [ --with-picasso96 use Amiga P96 grafix system instead of cgx])
AC_ARG_ENABLE(bundle, [ --disable-bundle do not use application bundles on Macs])
-AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_ENABLE(memmap, [ --enable-memmap enable the mem map feature])
+if test x"$enable_memmap" = "xyes"; then
+ AC_DEFINE(FEATURE_CPUMEMHISTORY,,[Use the memmap feature.])
+fi
+
if test x"$enable_gnomeui" = "xyes" ; then
AC_DEFINE(USE_GNOMEUI,,[Use GNOME UI.])
fi
@@ -102,7 +107,7 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-if [ "x${OBJCFLAGS}" = x ]; then
+if test -z "x${OBJCFLAGS}"; then
OBJCFLAGS="${CFLAGS}"
fi
OBJCDEPMODE="depmode=${CC}"
@@ -119,6 +124,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
+ CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
fi
if test x"$host_os" = "xcygwin32" -o x"$host_os" = "xcygwin"; then
@@ -1113,6 +1119,15 @@
dnl /usr/lib/libpcap.a
dnl /usr/lib/libnet.a
AC_CHECK_LIB(pcap, pcap_open_live,[
+ AC_CHECK_LIB(net, libnet_init,[
+ AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
+ AC_DEFINE(VICE_USE_LIBNET_1_1,,[Support for The Final Ethernet])
+ TFE_LIBS="-lpcap `libnet-config --libs`"
+ CFLAGS="$CFLAGS `libnet-config --defines`"
+ ],,$LIBS)],,$LIBS)
+ dnl /usr/lib/libpcap.a
+ dnl /usr/lib/libnet.a
+ AC_CHECK_LIB(pcap, pcap_open_live,[
AC_CHECK_LIB(net, libnet_write_link_layer,[
AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
TFE_LIBS="-lpcap `libnet-config --libs`"
Modified: branches/chris/cocoa-port/vice/po/de.po
===================================================================
--- branches/chris/cocoa-port/vice/po/de.po 2008-06-03 19:12:32 UTC (rev 18834)
+++ branches/chris/cocoa-port/vice/po/de.po 2008-06-03 19:23:49 UTC (rev 18835)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 19:29+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2008-01-02 16:46+0100\n"
"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
"Language-Team: de <de...@li...>\n"
@@ -19,11 +19,11 @@
msgid "<percent>"
msgstr "<prozent>"
-#: src/vsync.c:147 src/translate.c.po.c:4605
+#: src/vsync.c:147 src/translate.c.po.c:4615
msgid "Limit emulation speed to specified value"
msgstr "Emulationsgeschwindigkeit auf Wert beschr\xE4nken."
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -31,15 +31,15 @@
msgid "<value>"
msgstr "<Wert>"
-#: src/vsync.c:149 src/translate.c.po.c:4615
+#: src/vsync.c:149 src/translate.c.po.c:4625
msgid "Update every <value> frames (`0' for automatic)"
msgstr "Jedes <Wert> Bild aktualisieren (`0' f\xFCr Automatik)"
-#: src/vsync.c:151 src/translate.c.po.c:4625
+#: src/vsync.c:151 src/translate.c.po.c:4635
msgid "Enable warp mode"
msgstr "Warp Mode aktivieren"
-#: src/vsync.c:153 src/translate.c.po.c:4635
+#: src/vsync.c:153 src/translate.c.po.c:4645
msgid "Disable warp mode"
msgstr "Warp Mode deaktivieren"
@@ -56,23 +56,23 @@
msgid "Cannot load snapshot file."
msgstr "Kann Snapshot Datei nicht laden."
-#: src/sound.c:271 src/translate.c.po.c:4455
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Sound Wiedergaben einschalten"
-#: src/sound.c:273 src/translate.c.po.c:4465
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Sound Wiedergaben ausschalten"
-#: src/sound.c:275 src/translate.c.po.c:4475
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Setze Sound Sample Rate zu <Wert> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4485
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "Setze Source Buffer Gr\xF6\xDFe zu <Wert> msek"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -85,13 +85,13 @@
#: src/c64/c64-cmdline-options.c:91 src/c64/c64-cmdline-options.c:93
#: src/c64/c64-cmdline-options.c:95 src/c64/c64-cmdline-options.c:112
#: src/c64/c64-cmdline-options.c:114 src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:235 src/c64/cart/c64cart.c:238
-#: src/c64/cart/c64cart.c:241 src/c64/cart/c64cart.c:244
-#: src/c64/cart/c64cart.c:247 src/c64/cart/c64cart.c:250
-#: src/c64/cart/c64cart.c:253 src/c64/cart/c64cart.c:256
-#: src/c64/cart/c64cart.c:259 src/c64/cart/c64cart.c:262
-#: src/c64/cart/c64cart.c:265 src/c64/cart/c64cart.c:268
-#: src/c64/cart/c64cart.c:271 src/c64/cart/c64cart.c:274
+#: src/c64/cart/c64cart.c:236 src/c64/cart/c64cart.c:239
+#: src/c64/cart/c64cart.c:242 src/c64/cart/c64cart.c:245
+#: src/c64/cart/c64cart.c:248 src/c64/cart/c64cart.c:251
+#: src/c64/cart/c64cart.c:254 src/c64/cart/c64cart.c:257
+#: src/c64/cart/c64cart.c:260 src/c64/cart/c64cart.c:263
+#: src/c64/cart/c64cart.c:266 src/c64/cart/c64cart.c:269
+#: src/c64/cart/c64cart.c:272 src/c64/cart/c64cart.c:275
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
@@ -142,120 +142,120 @@
#: src/rs232drv/rs232drv.c:105 src/rs232drv/rs232drv.c:107
#: src/vic20/vic20-cmdline-options.c:209 src/vic20/vic20-cmdline-options.c:211
#: src/vic20/vic20-cmdline-options.c:213 src/vic20/vic20-cmdline-options.c:228
-#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:211
-#: src/vic20/vic20cartridge.c:213 src/vic20/vic20cartridge.c:215
-#: src/vic20/vic20cartridge.c:217 src/vic20/vic20cartridge.c:219
+#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:212
+#: src/vic20/vic20cartridge.c:214 src/vic20/vic20cartridge.c:216
+#: src/vic20/vic20cartridge.c:218 src/vic20/vic20cartridge.c:220
#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:654
msgid "<name>"
msgstr "<Name>"
-#: src/sound.c:279 src/translate.c.po.c:4495
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sound Treiber spezifieren"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4505
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<Argumente>"
-#: src/sound.c:281 src/translate.c.po.c:4515
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Initialisierungsparameter des Sound Treibers spezifizieren"
-#: src/sound.c:283 src/translate.c.po.c:4525
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sound Treiber f\xFCr Aufnahme spezifizieren"
-#: src/sound.c:285 src/translate.c.po.c:4535
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr "Initialisierungsparameter f\xFCr Aufnahme Sound Treiber spezifieren"
-#: src/sound.c:287 src/translate.c.po.c:4545
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<Sync>"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
"Setze Sound Geschwindigkeit Anpassung (0: flexibel, 1: anpassend, 2: exakt)"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "Schreiben auf Sound Ger\xE4t ist fehlgeschlagen."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Kann SID Engine nicht \xF6ffnen"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Kann SID Engine nicht initialisieren"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "Initialisierung von Ger\xE4t `%s' fehlgeschlagen."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "Sound Ger\xE4t unterst\xFCtzt keine Stereo Ausgabe"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "Ger\xE4t '%s' konnte nicht gefunden werden oder ist nicht unterst\xFCtzt."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Aufnahmeger\xE4t %s existiert nicht!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr "Aufnahmeger\xE4t mu\xDF unteschiedlich vom Abspielger\xE4t sein"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr "Warnung! Aufnahmeger\xE4t %s scheint ein Echtzeitger\xE4t zu sein!"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "Initialisierung von Ger\xE4t `%s' fehlgeschlagen."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr "Aufnahmeger\xE4t unterst\xFCtzt derzeitige Soundeinstellungen nicht"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Sound Puffer \xDCberlauf (Zyklus basiert)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Sound Puffer \xDCberlauf."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "Entleerung nicht m\xF6glich."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "Fragmentierungsproblem."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Puffer geleert"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "Ablauf zu langsam."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "Schreiben auf Sound Ger\xE4t ist fehlgeschlagen."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "Speichern auf Sound Ger\xE4t ist fehlgeschlagen."
@@ -385,72 +385,72 @@
msgstr ""
"Wiedergabe Fehler: %s ist unterschiedlich von Zeile %d in Datei debug%06d"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr "Kann zwischen IPV4/IPV6 nicht wechseln, solange netplay aktiv ist."
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr "Teste optimale Framerate..."
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr "Benutze %d Frameverz\xF6gerung."
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
msgid "Cannot load snapshot file for transfer"
msgstr "Kann Snapshot Datei f\xFCr Transfer nicht laden"
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
msgid "Sending snapshot to client..."
msgstr "Sende Snapshot zu Client..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
msgid "Cannot send snapshot to client"
msgstr "Kann Snapshot Datei nicht senden"
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, c-format
msgid "Cannot create snapshot file %s"
msgstr "Kann Snapshot Datei `%s' nicht erzeugen"
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, c-format
msgid "Cannot open snapshot file %s"
msgstr "Kann Snapshot Datei `%s' nicht \xF6ffnen."
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr "Server wartet auf Client..."
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
msgid "Cannot create snapshot file. Select different history directory!"
msgstr "Kann Snapshot Datei nicht erzeugen. Verwende ein anderes Verzeichnis!"
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, c-format
msgid "Cannot resolve %s"
msgstr "Kann %s nicht aufl\xF6sen"
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr "Kann zu %s nicht verbinden (Kein Server aktiv auf Port %d)."
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
msgid "Receiving snapshot from server..."
msgstr "Empfange Snapshot von Server..."
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr "Entfernter Rechner getrennt."
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr "Entfernter Rechner angehaltedn..."
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr "Netzwerksynchronisationsproblem - Trenne Verbindung."
@@ -722,75 +722,75 @@
msgid "Specify name of symbolic German keymap file"
msgstr "Name von symbolischer Keymap Datei definieren"
-#: src/c64/cart/c64cart.c:229 src/translate.c.po.c:1422
+#: src/c64/cart/c64cart.c:230 src/translate.c.po.c:1422
msgid "Reset machine if a cartridge is attached or detached"
msgstr ""
"Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt wird"
-#: src/c64/cart/c64cart.c:232 src/translate.c.po.c:1432
+#: src/c64/cart/c64cart.c:233 src/translate.c.po.c:1432
msgid "Do not reset machine if a cartridge is attached or detached"
msgstr ""
"Kein Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt "
"wird"
-#: src/c64/cart/c64cart.c:235 src/arch/win32/res.rc.po.c:4998
+#: src/c64/cart/c64cart.c:236 src/arch/win32/res.rc.po.c:4998
#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2333
msgid "Attach CRT cartridge image"
msgstr "CRT Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:238 src/translate.c.po.c:1452
+#: src/c64/cart/c64cart.c:239 src/translate.c.po.c:1452
msgid "Attach generic 8KB cartridge image"
msgstr "Generisches 8K Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:241 src/translate.c.po.c:1462
+#: src/c64/cart/c64cart.c:242 src/translate.c.po.c:1462
msgid "Attach generic 16KB cartridge image"
msgstr "Generisches 16K Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:244 src/translate.c.po.c:1482
+#: src/c64/cart/c64cart.c:245 src/translate.c.po.c:1482
msgid "Attach raw 32KB Action Replay cartridge image"
msgstr "32K Action Replay Image einlegen"
-#: src/c64/cart/c64cart.c:247 src/translate.c.po.c:1472
+#: src/c64/cart/c64cart.c:248 src/translate.c.po.c:1472
msgid "Attach raw 16KB Action Replay III cartridge image"
msgstr "16KB Action Replay Image III (raw) einlegen"
-#: src/c64/cart/c64cart.c:250 src/translate.c.po.c:1492
+#: src/c64/cart/c64cart.c:251 src/translate.c.po.c:1492
msgid "Attach raw 64KB Retro Replay cartridge image"
msgstr "64K Retro Replay Image einlegen"
-#: src/c64/cart/c64cart.c:253 src/translate.c.po.c:1502
+#: src/c64/cart/c64cart.c:254 src/translate.c.po.c:1502
msgid "Attach raw 64KB IDE64 cartridge image"
msgstr "64KB IDE64 Image einlegen"
-#: src/c64/cart/c64cart.c:256 src/translate.c.po.c:1512
+#: src/c64/cart/c64cart.c:257 src/translate.c.po.c:1512
msgid "Attach raw 32KB Atomic Power cartridge image"
msgstr "32KB Atomic Power Image einlegen"
-#: src/c64/cart/c64cart.c:259 src/translate.c.po.c:1522
+#: src/c64/cart/c64cart.c:260 src/translate.c.po.c:1522
msgid "Attach raw 8KB Epyx fastload cartridge image"
msgstr "8KB Epyx Fastload Image einlegen"
-#: src/c64/cart/c64cart.c:262 src/translate.c.po.c:1532
+#: src/c64/cart/c64cart.c:263 src/translate.c.po.c:1532
msgid "Attach raw 32KB Super Snapshot cartridge image"
msgstr "32KB Super Snapshot (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:265 src/translate.c.po.c:1542
+#: src/c64/cart/c64cart.c:266 src/translate.c.po.c:1542
msgid "Attach raw 64KB Super Snapshot cartridge image"
msgstr "64KB Super Snapshot (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:268 src/translate.c.po.c:1552
+#: src/c64/cart/c64cart.c:269 src/translate.c.po.c:1552
msgid "Attach CBM IEEE488 cartridge image"
msgstr "CBM IEEE488 Erweiterungsmodul einlegen"
-#: src/c64/cart/c64cart.c:271 src/translate.c.po.c:1562
+#: src/c64/cart/c64cart.c:272 src/translate.c.po.c:1562
msgid "Attach raw 16KB Westermann learning cartridge image"
msgstr "16KB Westermann learning (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:274 src/translate.c.po.c:4775
+#: src/c64/cart/c64cart.c:275 src/translate.c.po.c:4785
msgid "Attach raw Structured Basic cartridge image"
msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:277 src/translate.c.po.c:1572
+#: src/c64/cart/c64cart.c:278 src/translate.c.po.c:1572
msgid "Enable expert cartridge"
msgstr "Expert Cartridge aktivieren"
@@ -818,15 +818,15 @@
msgid "Do not autodetect geometry of formatted images"
msgstr "Geometrie von formatierten Image Dateien nicht automatisch erkennen"
-#: src/c64/c64_256k.c:206 src/translate.c.po.c:4735
+#: src/c64/c64_256k.c:206 src/translate.c.po.c:4745
msgid "Enable the 256K RAM expansion"
msgstr "256K RAM Erweiterung aktivieren"
-#: src/c64/c64_256k.c:208 src/translate.c.po.c:4745
+#: src/c64/c64_256k.c:208 src/translate.c.po.c:4755
msgid "Disable the 256K RAM expansion"
msgstr "256K RAM Erweiterung deaktivieren"
-#: src/c64/c64_256k.c:210 src/translate.c.po.c:4755
+#: src/c64/c64_256k.c:210 src/translate.c.po.c:4765
msgid "Specify name of 256K image"
msgstr "Name der 256K Image Datei definieren"
@@ -835,7 +835,7 @@
msgid "<base address>"
msgstr "<Basis Adresse>"
-#: src/c64/c64_256k.c:212 src/translate.c.po.c:4765
+#: src/c64/c64_256k.c:212 src/translate.c.po.c:4775
msgid "Base address of the 256K expansion"
msgstr "Basis Adresse f\xFCr 256K RAM Erweiterung"
@@ -847,15 +847,15 @@
"Digimax kann mit ReSID nicht benutzt werden\n"
"Bitte SID Engine auf FastSID setzen"
-#: src/c64/digimax.c:137 src/translate.c.po.c:4825
+#: src/c64/digimax.c:137 src/translate.c.po.c:4835
msgid "Enable the digimax cartridge"
msgstr "Digimax Cartridge aktivieren"
-#: src/c64/digimax.c:139 src/translate.c.po.c:4835
+#: src/c64/digimax.c:139 src/translate.c.po.c:4845
msgid "Disable the digimax cartridge"
msgstr "Digimax Cartridge deaktivieren"
-#: src/c64/digimax.c:141 src/translate.c.po.c:4845
+#: src/c64/digimax.c:141 src/translate.c.po.c:4855
msgid "Base address of the digimax cartridge"
msgstr "Basis Adresse f\xFCr Digimax Erweiterung"
@@ -908,31 +908,31 @@
msgid "Save the MMC64 bios when changed"
msgstr "MMC64 BIOS speichern bei \xC4nderung"
-#: src/c64/plus256k.c:171 src/translate.c.po.c:4665
+#: src/c64/plus256k.c:171 src/translate.c.po.c:4675
msgid "Enable the PLUS256K RAM expansion"
msgstr "PLUS256K RAM Erweiterung aktivieren"
-#: src/c64/plus256k.c:173 src/translate.c.po.c:4675
+#: src/c64/plus256k.c:173 src/translate.c.po.c:4685
msgid "Disable the PLUS256K RAM expansion"
msgstr "PLUS256K RAM Erweiterung deaktivieren"
-#: src/c64/plus256k.c:175 src/translate.c.po.c:4685
+#: src/c64/plus256k.c:175 src/translate.c.po.c:4695
msgid "Specify name of PLUS256K image"
msgstr "Name der PLUS256K Image Datei definieren"
-#: src/c64/plus60k.c:245 src/translate.c.po.c:4695
+#: src/c64/plus60k.c:245 src/translate.c.po.c:4705
msgid "Enable the PLUS60K RAM expansion"
msgstr "PLUS60K RAM Erweiterung aktivieren"
-#: src/c64/plus60k.c:247 src/translate.c.po.c:4705
+#: src/c64/plus60k.c:247 src/translate.c.po.c:4715
msgid "Disable the PLUS60K RAM expansion"
msgstr "PLUS60K RAM Erweiterung deaktivieren"
-#: src/c64/plus60k.c:249 src/translate.c.po.c:4715
+#: src/c64/plus60k.c:249 src/translate.c.po.c:4725
msgid "Specify name of PLUS60K image"
msgstr "Name der PLUS60K Image Datei definieren"
-#: src/c64/plus60k.c:251 src/translate.c.po.c:4725
+#: src/c64/plus60k.c:251 src/translate.c.po.c:4735
msgid "Base address of the PLUS60K expansion"
msgstr "Basis Adresse f\xFCr PLUS60K Erweiterung"
@@ -1285,7 +1285,7 @@
msgid "Specify name of 1551 DOS ROM image"
msgstr "Name der 1551 DOS ROM Datei definieren"
-#: src/fliplist.c:121 src/translate.c.po.c:4194
+#: src/fliplist.c:121 src/translate.c.po.c:4204
msgid "Specify name of the flip list file image"
msgstr "Namen f\xFCr Fliplist Datei definieren"
@@ -1327,87 +1327,87 @@
msgstr "ffmpegdrv: \xD6ffnen von %s fehlgeschlagen"
#: src/initcmdline.c:155 src/initcmdline.c:157 src/initcmdline.c:159
-#: src/translate.c.po.c:4203
+#: src/translate.c.po.c:4213
msgid "Show a list of the available options and exit normally"
msgstr "Liste von verf\xFCgbaren Optionen zeigen und beenden"
-#: src/initcmdline.c:162 src/translate.c.po.c:4214
+#: src/initcmdline.c:162 src/translate.c.po.c:4224
msgid "Console mode (for music playback)"
msgstr "Konsolenmodus (f\xFCr Musikwiedergabe)"
-#: src/initcmdline.c:164 src/translate.c.po.c:4224
+#: src/initcmdline.c:164 src/translate.c.po.c:4234
msgid "Allow production of core dumps"
msgstr "Core Dumps erm\xF6glichen"
-#: src/initcmdline.c:166 src/translate.c.po.c:4234
+#: src/initcmdline.c:166 src/translate.c.po.c:4244
msgid "Do not produce core dumps"
msgstr "Core Dumps verhindern"
-#: src/initcmdline.c:169 src/translate.c.po.c:4244
+#: src/initcmdline.c:169 src/translate.c.po.c:4254
msgid "Don't call exception handler"
msgstr "Ausnahmebehandlung vermeiden"
-#: src/initcmdline.c:171 src/translate.c.po.c:4254
+#: src/initcmdline.c:171 src/translate.c.po.c:4264
msgid "Call exception handler (default)"
msgstr "Ausnahmebehandlung aktivieren (Default)"
-#: src/initcmdline.c:206 src/translate.c.po.c:4265
+#: src/initcmdline.c:206 src/translate.c.po.c:4275
msgid "Restore default (factory) settings"
msgstr "Wiederherstellen Standard Einstellungen"
-#: src/initcmdline.c:208 src/translate.c.po.c:4275
+#: src/initcmdline.c:208 src/translate.c.po.c:4285
msgid "Attach and autostart tape/disk image <name>"
msgstr "Einlegen und Autostart Disk/Band Image Datei <Name>"
-#: src/initcmdline.c:210 src/translate.c.po.c:4285
+#: src/initcmdline.c:210 src/translate.c.po.c:4295
msgid "Attach and autoload tape/disk image <name>"
msgstr "Einlegen und Autoload Disk/Band Image Datei <Name>"
-#: src/initcmdline.c:212 src/translate.c.po.c:4295
+#: src/initcmdline.c:212 src/translate.c.po.c:4305
msgid "Attach <name> as a tape image"
msgstr "Image Datei <Name> einlegen"
-#: src/initcmdline.c:214 src/translate.c.po.c:4305
+#: src/initcmdline.c:214 src/translate.c.po.c:4315
msgid "Attach <name> as a disk image in drive #8"
msgstr "Image Datei <Name> im Laufwerk #8 einlegen"
-#: src/initcmdline.c:216 src/translate.c.po.c:4315
+#: src/initcmdline.c:216 src/translate.c.po.c:4325
msgid "Attach <name> as a disk image in drive #9"
msgstr "Image Datei <Name> im Laufwerk #9 einlegen"
-#: src/initcmdline.c:218 src/translate.c.po.c:4325
+#: src/initcmdline.c:218 src/translate.c.po.c:4335
msgid "Attach <name> as a disk image in drive #10"
msgstr "Image Datei <Name> im Laufwerk #10 einlegen"
-#: src/initcmdline.c:220 src/translate.c.po.c:4335
+#: src/initcmdline.c:220 src/translate.c.po.c:4345
msgid "Attach <name> as a disk image in drive #11"
msgstr "Image Datei <Name> im Laufwerk #11 einlegen"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4345
+#: src/kbdbuf.c:136 src/translate.c.po.c:4355
msgid "<string>"
msgstr "<String>"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4355
+#: src/kbdbuf.c:136 src/translate.c.po.c:4365
msgid "Put the specified string into the keyboard buffer"
msgstr "Definierte Eingabe in Tastaturpuffer bereitstellen"
-#: src/log.c:110 src/translate.c.po.c:4365
+#: src/log.c:110 src/translate.c.po.c:4375
msgid "Specify log file name"
msgstr "Logdateiname definieren"
-#: src/mouse.c:358 src/translate.c.po.c:4375
+#: src/mouse.c:358 src/translate.c.po.c:4385
msgid "Enable mouse grab"
msgstr "Maus aktivieren"
-#: src/mouse.c:360 src/translate.c.po.c:4385
+#: src/mouse.c:360 src/translate.c.po.c:4395
msgid "Disable mouse grab"
msgstr "Maus deaktivieren"
-#: src/mouse.c:362 src/translate.c.po.c:4395
+#: src/mouse.c:362 src/translate.c.po.c:4405
msgid "Select the joystick port the mouse is attached to"
msgstr "Joystickport f\xFCr Maus ausw\xE4hlen"
-#: src/mouse.c:364 src/translate.c.po.c:4405
+#: src/mouse.c:364 src/translate.c.po.c:4415
msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
msgstr "Maus typ w\xE4hlen (0 = 1351, 1 = NEOS, 2 = Amiga)"
@@ -1531,19 +1531,19 @@
msgid "Specify size of RAM installed in kb (16/32/64)"
msgstr "Gr\xF6\xDFe des emulierten RAM Speichers in kb (16/32/64) spezifizieren"
-#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4785
+#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4795
msgid "Enable the CSORY 256K RAM expansion"
msgstr "CSORY 256K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4795
+#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4805
msgid "Enable the HANNES 256K RAM expansion"
msgstr "HANNES 256K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4805
+#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4815
msgid "Enable the HANNES 1024K RAM expansion"
msgstr "HANNES 1024K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4815
+#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4825
msgid "Enable the HANNES 4096K RAM expansion"
msgstr "HANNES 4096K RAM Erweiterung aktivieren"
@@ -1624,19 +1624,19 @@
msgid "Specify printer text output device for userport printer"
msgstr "IEC Userport Drucker Ger\xE4t f\xFCr Textausgabe definieren"
-#: src/ram.c:101 src/translate.c.po.c:4415
+#: src/ram.c:101 src/translate.c.po.c:4425
msgid "Set the value for the very first RAM address after powerup"
msgstr "Wert f\xFCr erstes Byte im RAM nach Kaltstart setzen"
-#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4425
+#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4435
msgid "<num of bytes>"
msgstr "<Anzahl an Bytes>"
-#: src/ram.c:104 src/translate.c.po.c:4435
+#: src/ram.c:104 src/translate.c.po.c:4445
msgid "Length of memory block initialized with the same value"
msgstr "L\xE4nge des Speicherblocks der mit dem gleichen Wert initialisiert ist"
-#: src/ram.c:107 src/translate.c.po.c:4445
+#: src/ram.c:107 src/translate.c.po.c:4455
msgid "Length of memory block initialized with the same pattern"
msgstr "L\xE4nge des Speicherblocks der mit dem gleichen Muster initialisiert ist"
@@ -1858,19 +1858,19 @@
msgid "Do not emulate SID filters"
msgstr "SID Filter Emulation deaktivieren"
-#: src/sysfile.c:127 src/translate.c.po.c:4565
+#: src/sysfile.c:127 src/translate.c.po.c:4575
msgid "<path>"
msgstr "<Pfad>"
-#: src/sysfile.c:127 src/translate.c.po.c:4575
+#: src/sysfile.c:127 src/translate.c.po.c:4585
msgid "Define search path to locate system files"
msgstr "Suchpfad f\xFCr Systemdateien definieren"
-#: src/traps.c:123 src/translate.c.po.c:4585
+#: src/traps.c:123 src/translate.c.po.c:4595
msgid "Enable general mechanisms for fast disk/tape emulation"
msgstr "Allgemeine Mechanismen f\xFCr schnelle Disk/Band Emulation aktivieren"
-#: src/traps.c:126 src/translate.c.po.c:4595
+#: src/traps.c:126 src/translate.c.po.c:4605
msgid "Disable general mechanisms for fast disk/tape emulation"
msgstr "Allgemeine Mechanismen f\xFCr schnelle Disk/Band Emulation deaktivieren"
@@ -1902,23 +1902,23 @@
msgid "Disable VIC-1112 IEEE488 interface"
msgstr "VIC-1112 IEEE488 Schnittstelle deaktivieren"
-#: src/vic20/vic20cartridge.c:211 src/translate.c.po.c:3558
+#: src/vic20/vic20cartridge.c:212 src/translate.c.po.c:3558
msgid "Specify 4/8/16K extension ROM name at $2000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $2000 definieren"
-#: src/vic20/vic20cartridge.c:213 src/translate.c.po.c:3568
+#: src/vic20/vic20cartridge.c:214 src/translate.c.po.c:3568
msgid "Specify 4/8/16K extension ROM name at $4000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $4000 definieren"
-#: src/vic20/vic20cartridge.c:215 src/translate.c.po.c:3578
+#: src/vic20/vic20cartridge.c:216 src/translate.c.po.c:3578
msgid "Specify 4/8/16K extension ROM name at $6000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $6000 definieren"
-#: src/vic20/vic20cartridge.c:217 src/translate.c.po.c:3588
+#: src/vic20/vic20cartridge.c:218 src/translate.c.po.c:3588
msgid "Specify 4/8K extension ROM name at $A000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $A000 definieren"
-#: src/vic20/vic20cartridge.c:219 src/translate.c.po.c:3598
+#: src/vic20/vic20cartridge.c:220 src/translate.c.po.c:3598
msgid "Specify 4K extension ROM name at $B000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $B000 definieren"
@@ -2182,13 +2182,13 @@
#: src/arch/unix/gui/c128ui.c:71 src/arch/unix/gui/c64ui.c:74
#: src/arch/unix/gui/cbm2ui.c:64 src/arch/unix/gui/uited.c:56
-#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:286
+#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:290
msgid "*PAL-G"
msgstr "*PAL-G"
#: src/arch/unix/gui/c128ui.c:73 src/arch/unix/gui/c64ui.c:76
#: src/arch/unix/gui/cbm2ui.c:66 src/arch/unix/gui/uited.c:58
-#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:288
+#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:292
msgid "*NTSC-M"
msgstr "*NTSC-M"
@@ -2196,21 +2196,21 @@
#: src/arch/unix/gui/c64ui.c:225 src/arch/unix/gui/c64ui.c:250
#: src/arch/unix/gui/cbm2ui.c:293 src/arch/unix/gui/cbm2ui.c:318
#: src/arch/unix/gui/petui.c:119 src/arch/unix/gui/plus4ui.c:106
-#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:198
+#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:202
msgid "SID engine"
msgstr "SID Engine"
#: src/arch/unix/gui/c128ui.c:157 src/arch/unix/gui/c128ui.c:183
#: src/arch/unix/gui/c64ui.c:228 src/arch/unix/gui/c64ui.c:254
#: src/arch/unix/gui/cbm2ui.c:296 src/arch/unix/gui/cbm2ui.c:322
-#: src/arch/unix/gui/vsidui.c:201
+#: src/arch/unix/gui/vsidui.c:205
msgid "*Second SID"
msgstr "*Zweiter SID"
#: src/arch/unix/gui/c128ui.c:159 src/arch/unix/gui/c128ui.c:185
#: src/arch/unix/gui/c64ui.c:230 src/arch/unix/gui/c64ui.c:256
#: src/arch/unix/gui/cbm2ui.c:298 src/arch/unix/gui/cbm2ui.c:324
-#: src/arch/unix/gui/vsidui.c:203
+#: src/arch/unix/gui/vsidui.c:207
msgid "*Second SID base address"
msgstr "*Zweiter SID Chip, Basisadresse auf $DE00"
@@ -2218,7 +2218,7 @@
#: src/arch/unix/gui/c64ui.c:233 src/arch/unix/gui/c64ui.c:258
#: src/arch/unix/gui/cbm2ui.c:301 src/arch/unix/gui/cbm2ui.c:327
#: src/arch/unix/gui/petui.c:123 src/arch/unix/gui/plus4ui.c:110
-#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:206
+#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:210
msgid "*Emulate filters"
msgstr "*Filter Emulation"
@@ -2226,17 +2226,17 @@
#: src/arch/unix/gui/c64ui.c:235 src/arch/unix/gui/c64ui.c:260
#: src/arch/unix/gui/cbm2ui.c:303 src/arch/unix/gui/cbm2ui.c:329
#: src/arch/unix/gui/petui.c:121 src/arch/unix/gui/plus4ui.c:108
-#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:208
+#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:212
msgid "Chip model"
msgstr "Chip Modell"
#: src/arch/unix/gui/c128ui.c:168 src/arch/unix/gui/c64ui.c:239
-#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:212
+#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:216
msgid "reSID sampling method"
msgstr "reSID Sampling Methode"
#: src/arch/unix/gui/c128ui.c:170 src/arch/unix/gui/c64ui.c:241
-#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:214
+#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:218
msgid "reSID resampling passband..."
msgstr "reSID resampling Passband"
@@ -2412,7 +2412,7 @@
msgstr "VDC Einstellungen"
#: src/arch/unix/gui/c128ui.c:380 src/arch/unix/gui/c64ui.c:366
-#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:336
+#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:340
#: src/arch/win32/ressid.rc.po.c:59
msgid "SID settings"
msgstr "SID Einstellungen"
@@ -2434,7 +2434,7 @@
#: src/arch/unix/gui/c128ui.c:510 src/arch/unix/gui/c64ui.c:494
#: src/arch/unix/gui/cbm2ui.c:505 src/arch/unix/gui/petui.c:487
#: src/arch/unix/gui/plus4ui.c:314 src/arch/unix/gui/vic20ui.c:603
-#: src/arch/unix/gui/vsidui.c:393 src/arch/amigaos/intl.c.po.c:96
+#: src/arch/unix/gui/vsidui.c:397 src/arch/amigaos/intl.c.po.c:96
msgid "File"
msgstr "Datei"
@@ -2455,7 +2455,7 @@
#: src/arch/unix/gui/c128ui.c:516 src/arch/unix/gui/c64ui.c:500
#: src/arch/unix/gui/cbm2ui.c:511 src/arch/unix/gui/petui.c:493
#: src/arch/unix/gui/plus4ui.c:320 src/arch/unix/gui/vic20ui.c:609
-#: src/arch/unix/gui/vsidui.c:395 src/arch/unix/x11/gnome/uinetplay.c:66
+#: src/arch/unix/gui/vsidui.c:399 src/arch/unix/x11/gnome/uinetplay.c:66
#: src/arch/win32/res.rc.po.c:4434 src/arch/amigaos/intl.c.po.c:1221
msgid "Settings"
msgstr "Einstellungen"
@@ -2468,7 +2468,7 @@
msgid "RJHelp"
msgstr "RJHilfe"
-#: src/arch/unix/gui/c64ui.c:78 src/arch/unix/gui/vsidui.c:290
+#: src/arch/unix/gui/c64ui.c:78 src/arch/unix/gui/vsidui.c:294
msgid "*Old NTSC-M"
msgstr "*NTSC-M alt"
@@ -3265,7 +3265,7 @@
msgstr "\xDCber VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:171
+#: src/arch/unix/x11/gnome/uipalcontrol.c:173
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4964,7 +4964,7 @@
msgid "Oversample"
msgstr "Oversample"
-#: src/arch/unix/gui/uisound.c:154 src/arch/unix/gui/vsidui.c:326
+#: src/arch/unix/gui/uisound.c:154 src/arch/unix/gui/vsidui.c:330
msgid "Sound settings"
msgstr "Sound Einstellungen"
@@ -4990,7 +4990,7 @@
msgstr "PAL Emulation"
#: src/arch/unix/gui/uited.c:116 src/arch/unix/gui/uivic.c:111
-#: src/arch/unix/gui/uivicii.c:138 src/arch/unix/gui/vsidui.c:338
+#: src/arch/unix/gui/uivicii.c:138 src/arch/unix/gui/vsidui.c:342
#: src/arch/amigaos/intl.c.po.c:1149
msgid "Video standard"
msgstr "Video Standard"
@@ -5009,7 +5009,8 @@
msgstr "*Ethernet aktivieren"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*RR-NET kompatibler Modus"
#: src/arch/unix/gui/uitfe.c:52
@@ -5192,37 +5193,37 @@
msgid "VIC settings"
msgstr "VIC Einstellungen"
-#: src/arch/unix/gui/vsidui.c:229
+#: src/arch/unix/gui/vsidui.c:233
msgid "Tunes"
msgstr "Tunes"
-#: src/arch/unix/gui/vsidui.c:239
+#: src/arch/unix/gui/vsidui.c:243
msgid "Load PSID file"
msgstr "PSID Datei laden"
-#: src/arch/unix/gui/vsidui.c:247
+#: src/arch/unix/gui/vsidui.c:251
#, c-format
msgid "`%s' is not a valid PSID file."
msgstr "`%s' ist keine g\xFCltige PSID Datei."
-#: src/arch/unix/gui/vsidui.c:274
+#: src/arch/unix/gui/vsidui.c:278
msgid "Load PSID file..."
msgstr "PSID Datei laden..."
-#: src/arch/unix/gui/vsidui.c:334
+#: src/arch/unix/gui/vsidui.c:338
msgid "*Override PSID settings"
msgstr "*PSID Einstellungen ignorieren"
-#: src/arch/unix/gui/vsidui.c:413
+#: src/arch/unix/gui/vsidui.c:417
msgid "*Default Tune"
msgstr "*Default Tune"
-#: src/arch/unix/gui/vsidui.c:436
+#: src/arch/unix/gui/vsidui.c:440
#, c-format
msgid "*Tune %d"
msgstr "*Tune %d"
-#: src/arch/unix/gui/vsidui.c:464
+#: src/arch/unix/gui/vsidui.c:468
msgid "VSID: The SID Emulator"
msgstr "VSID: DER SID Emulator"
@@ -5358,15 +5359,15 @@
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:127
+#: src/arch/unix/x11/gnome/uipalcontrol.c:129
msgid "PAL Settings"
msgstr "PAL Einstellungen"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:180
+#: src/arch/unix/x11/gnome/uipalcontrol.c:182
msgid "Fast Emulation"
msgstr "Schnelle Emulation"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:187
+#: src/arch/unix/x11/gnome/uipalcontrol.c:189
msgid "Exact Emulation"
msgstr "Exakte Emulation"
@@ -5561,7 +5562,7 @@
"Modell: %s\n"
"IRQ: %s"
-#: src/arch/unix/x11/gnome/uifileentry.c:52
+#: src/arch/unix/x11/gnome/uifileentry.c:53
#: src/arch/unix/x11/gnome/x11ui.c:2496
msgid "all files"
msgstr "Alle Dateien (*.*)"
@@ -5971,96 +5972,96 @@
msgid "VICE Error!"
msgstr "VICE Fehler!"
-#: src/arch/unix/x11/xaw/x11video.c:218
+#: src/arch/unix/x11/xaw/x11video.c:223
msgid "Call `XSync()' after updating the emulation window"
msgstr "`XSync()' nach jeder Aktualisierung des Emulator Fensters aufrufen"
-#: src/arch/unix/x11/xaw/x11video.c:221
+#: src/arch/unix/x11/xaw/x11video.c:226
msgid "Do not call `XSync()' after updating the emulation window"
msgstr ""
"`XSync()' nicht nach jeder Aktualisierung des Emulator Fensters aufrufen"
-#: src/arch/unix/x11/xaw/x11video.c:224
+#: src/arch/unix/x11/xaw/x11video.c:229
msgid "Use shared memory"
msgstr "Benutze Shared Memory !"
-#: src/arch/unix/x11/xaw/x11video.c:227
+#: src/arch/unix/x11/xaw/x11video.c:232
msgid "Never use shared memory (slower)"
msgstr "Shared Memory nicht benutzen (langsamer)"
-#: src/arch/unix/x11/xaw/x11video.c:230
+#: src/arch/unix/x11/xaw/x11video.c:235
msgid "Request YUV FOURCC format"
msgstr "YUV FOURCC Format"
-#: src/arch/unix/x11/xaw/x11video.c:232
+#: src/arch/unix/x11/xaw/x11video.c:237
msgid "Set aspect ratio (0.8 - 1.2)"
msgstr "Seitenverh\xE4ltnis (0.8 - 1.2)"
-#: src/arch/unix/x11/xaw/x11video.c:311
+#: src/arch/unix/x11/xaw/x11video.c:316
msgid "The MITSHM extension is not supported on this display."
msgstr ""
"Die MITSHM X Server Erweiterung ist auf diesem Display nicht unterst\xFCtzt."
-#: src/arch/unix/x11/xaw/x11video.c:315
+#: src/arch/unix/x11/xaw/x11video.c:320
#, c-format
msgid "MITSHM extensions version %d.%d detected."
msgstr "MITSHM X Server Eweiterung in Version %d.%d erkannt."
-#: src/arch/unix/x11/xaw/x11video.c:383
+#: src/arch/unix/x11/xaw/x11video.c:388
msgid "Cannot release shared memory!"
msgstr "Kann Shared Memory nicht freigeben!"
-#: src/arch/unix/x11/xaw/x11video.c:512
+#: src/arch/unix/x11/xaw/x11video.c:517
#, c-format
msgid "Successfully initialized using XVideo (%dx%d %.4s)."
msgstr "XVideo erfolgreich initialisiert (%dx%d %.4s)."
-#: src/arch/unix/x11/xaw/x11video.c:532
+#: src/arch/unix/x11/xaw/x11video.c:537
msgid ""
"Cannot allocate XImage with XShm; falling back to non MITSHM extension mode."
msgstr "Kann XImage with XShm nicht allokieren; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:545
+#: src/arch/unix/x11/xaw/x11video.c:550
msgid "Cannot get shared memory; falling back to non MITSHM extension mode."
msgstr "Kann Shared Memory nicht allokieren; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:556
+#: src/arch/unix/x11/xaw/x11video.c:561
msgid ""
"Cannot get shared memory address; falling back to non MITSHM extension mode."
msgstr ""
"Kann Shared Memory Adresse nicht feststellen; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:571 src/arch/unix/x11/xaw/x11video.c:588
+#: src/arch/unix/x11/xaw/x11video.c:576 src/arch/unix/x11/xaw/x11video.c:593
msgid "Cannot attach shared memory; falling back to non MITSHM extension mode."
msgstr ""
"Cannot attach shared memory; falling back to non MITSHM extension mode."
-#: src/arch/unix/x11/xaw/x11video.c:595
+#: src/arch/unix/x11/xaw/x11video.c:600
msgid "MITSHM initialization succeed.\n"
msgstr "MITSHM erfolgreich initialisiert.\n"
-#: src/arch/unix/x11/xaw/x11video.c:616
+#: src/arch/unix/x11/xaw/x11video.c:621
#, c-format
msgid "Successfully initialized%s shared memory."
msgstr "Video erfolgreich%s Shared Memory initialisiert."
-#: src/arch/unix/x11/xaw/x11video.c:617
+#: src/arch/unix/x11/xaw/x11video.c:622
msgid ", using"
msgstr ", mit"
-#: src/arch/unix/x11/xaw/x11video.c:617
+#: src/arch/unix/x11/xaw/x11video.c:622
msgid " without"
msgstr " ohne"
-#: src/arch/unix/x11/xaw/x11video.c:620
+#: src/arch/unix/x11/xaw/x11video.c:625
msgid "Performance will be poor."
msgstr "Performance wird nicht optimal sein."
-#: src/arch/unix/x11/xaw/x11video.c:623
+#: src/arch/unix/x11/xaw/x11video.c:628
msgid "Successfully initialized without shared memory."
msgstr "Video erfolgreich ohne Shared Memory initialisiert."
-#: src/arch/unix/x11/xaw/x11video.c:693
+#: src/arch/unix/x11/xaw/x11video.c:698
#, fuzzy
msgid "HW scaling not available"
msgstr "Welche Kommandozeilen Parameter sind verf\xFCgber?"
@@ -9883,11 +9884,15 @@
msgid "Execute monitor commands from file"
msgstr ""
-#: src/translate.c.po.c:4645
+#: src/translate.c.po.c:4194
+msgid "Set an initial breakpoint for the monitor"
+msgstr ""
+
+#: src/translate.c.po.c:4655
msgid "<iso language code>"
msgstr "<iso Sprachcode>"
-#: src/translate.c.po.c:4655
+#: src/translate.c.po.c:4665
msgid "Specify the iso code of the language"
msgstr "Iso Sprachcode spezifizieren"
Modified: branches/chris/cocoa-port/vice/po/fr.po
===================================================================
--- branches/chris/cocoa-port/vice/po/fr.po 2008-06-03 19:12:32 UTC (rev 18834)
+++ branches/chris/cocoa-port/vice/po/fr.po 2008-06-03 19:23:49 UTC (rev 18835)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 19:29+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
"Language-Team: fr <fr...@li...>\n"
@@ -24,11 +24,11 @@
msgid "<percent>"
msgstr "<pourcent>"
-#: src/vsync.c:147 src/translate.c.po.c:4605
+#: src/vsync.c:147 src/translate.c.po.c:4615
msgid "Limit emulation speed to specified value"
msgstr "Limiter la vitesse d'\xE9mulation \xE0 une valeur specifi\xE9e"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -36,15 +36,15 @@
msgid "<value>"
msgstr "<valeur>"
-#: src/vsync.c:149 src/translate.c.po.c:4615
+#: src/vsync.c:149 src/translate.c.po.c:4625
msgid "Update every <value> frames (`0' for automatic)"
msgstr "Mise \xE0 jour toutes les <valeur> images (`0' pour auto.)"
-#: src/vsync.c:151 src/translate.c.po.c:4625
+#: src/vsync.c:151 src/translate.c.po.c:4635
msgid "Enable warp mode"
msgstr "Activer mode turbo"
-#: src/vsync.c:153 src/translate.c.po.c:4635
+#: src/vsync.c:153 src/translate.c.po.c:4645
msgid "Disable warp mode"
msgstr "D\xE9sactiver mode turbo"
@@ -60,23 +60,23 @@
msgid "Cannot load snapshot file."
msgstr "Impossible de charger la sauvegarde."
-#: src/sound.c:271 src/translate.c.po.c:4455
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Activer le son"
-#: src/sound.c:273 src/translate.c.po.c:4465
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "D\xE9sactiver le son"
-#: src/sound.c:275 src/translate.c.po.c:4475
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "R\xE9gler le taux d'\xE9chantillonage \xE0 <valeur> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4485
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "R\xE9gler la taille du tampon \xE0 <valeur> ms"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -89,13 +89,13 @@
#: src/c64/c64-cmdline-options.c:91 src/c64/c64-cmdline-options.c:93
#: src/c64/c64-cmdline-options.c:95 src/c64/c64-cmdline-options.c:112
#: src/c64/c64-cmdline-options.c:114 src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:235 src/c64/cart/c64cart.c:238
-#: src/c64/cart/c64cart.c:241 src/c64/cart/c64cart.c:244
-#: src/c64/cart/c64cart.c:247 src/c64/cart/c64cart.c:250
-#: src/c64/cart/c64cart.c:253 src/c64/cart/c64cart.c:256
-#: src/c64/cart/c64cart.c:259 src/c64/cart/c64cart.c:262
-#: src/c64/cart/c64cart.c:265 src/c64/cart/c64cart.c:268
-#: src/c64/cart/c64cart.c:271 src/c64/cart/c64cart.c:274
+#: src/c64/cart/c64cart.c:236 src/c64/cart/c64cart.c:239
+#: src/c64/cart/c64cart.c:242 src/c64/cart/c64cart.c:245
+#: src/c64/cart/c64cart.c:248 src/c64/cart/c64cart.c:251
+#: src/c64/cart/c64cart.c:254 src/c64/cart/c64cart.c:257
+#: src/c64/cart/c64cart.c:260 src/c64/cart/c64cart.c:263
+#: src/c64/cart/c64cart.c:266 src/c64/cart/c64cart.c:269
+#: src/c64/cart/c64cart.c:272 src/c64/cart/c64cart.c:275
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
@@ -146,125 +146,125 @@
#: src/rs232drv/rs232drv.c:105 src/rs232drv/rs232drv.c:107
#: src/vic20/vic20-cmdline-options.c:209 src/vic20/vic20-cmdline-options.c:211
#: src/vic20/vic20-cmdline-options.c:213 src/vic20/vic20-cmdline-options.c:228
-#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:211
-#: src/vic20/vic20cartridge.c:213 src/vic20/vic20cartridge.c:215
-#: src/vic20/vic20cartridge.c:217 src/vic20/vic20cartridge.c:219
+#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:212
+#: src/vic20/vic20cartridge.c:214 src/vic20/vic20cartridge.c:216
+#: src/vic20/vic20cartridge.c:218 src/vic20/vic20cartridge.c:220
#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:654
msgid "<name>"
msgstr "<nom>"
-#: src/sound.c:279 src/translate.c.po.c:4495
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sp\xE9cifier le pilote son"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4505
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<args>"
-#: src/sound.c:281 src/translate.c.po.c:4515
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote son"
-#: src/sound.c:283 src/translate.c.po.c:4525
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sp\xE9cifier le pilote d'enregistrement son"
-#: src/sound.c:285 src/translate.c.po.c:4535
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
"Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote d'enregistrement son"
-#: src/sound.c:287 src/translate.c.po.c:4545
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr "R\xE9gler l'ajustement son (0: flexible, 1: ajust\xE9 2: exact"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "impossible d'\xE9crire sur le p\xE9riph\xE9rique son."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Erreur d'ouverture de l'engin SID"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Erreur d'initialisation de l'engin SID"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "erreur d'initialisation du p\xE9riph\xE9rique `%s'."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "le p\xE9riph\xE9rique son n'est pas st\xE9r\xE9o"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "p\xE9riph\xE9rique '%s' non trouv\xE9 ou non support\xE9."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Le p\xE9riph\xE9rique d'enregistrement %s n'existe pas!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr ""
"Le p\xE9riph\xE9rique d'enregistrement doit \xEAtre diff\xE9rent du p\xE9riph\xE9rique de "
"lecture"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr ""
"Attention! Le p\xE9riph\xE9rique d'enregistrement %s semble \xEAtre un p\xE9riph\xE9rique "
"temps r\xE9el"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "\xC9chec de l'initialisation du p\xE9riph\xE9rique `%s'."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr ""
"Le p\xE9riph\xE9rique d'enregistrement ne supporte pas les param\xE8tres son actuels"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Erreur de d\xE9passement de limite du tampon son (bas\xE9 sur les cycles)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Erreur de d\xE9passement de limite du tampon son."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "impossible de vider."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "probl\xE8mes de fragments."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Tampon vide"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "ex\xE9cution trop lente."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "erreur d'\xE9criture sur le p\xE9riph\xE9rique son."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "erreur d'enregistrement sur le p\xE9riph\xE9rique son."
@@ -396,77 +396,77 @@
msgstr ""
"Erreur de lecture: %s est diff\xE9rente de la ...
[truncated message content] |
|
From: <cnv...@us...> - 2008-06-03 19:12:40
|
Revision: 18834
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18834&view=rev
Author: cnvogelg
Date: 2008-06-03 12:12:32 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
chris/cocoa-port: merged trunk [18785]:[18807]
Modified Paths:
--------------
branches/chris/cocoa-port/vice/ChangeLog
branches/chris/cocoa-port/vice/Makefile.am
branches/chris/cocoa-port/vice/autogen.sh
branches/chris/cocoa-port/vice/src/ChangeLog
branches/chris/cocoa-port/vice/src/arch/amigaos/catweaselmkiii.c
branches/chris/cocoa-port/vice/src/arch/amigaos/intl.c
branches/chris/cocoa-port/vice/src/arch/amigaos/joyai.c
branches/chris/cocoa-port/vice/src/arch/amigaos/mui/mui.h
branches/chris/cocoa-port/vice/src/arch/amigaos/mui/uisnapshot.c
branches/chris/cocoa-port/vice/src/arch/amigaos/mui/uivideoc128.c
branches/chris/cocoa-port/vice/src/arch/amigaos/screen-shot.c
branches/chris/cocoa-port/vice/src/arch/amigaos/video.c
branches/chris/cocoa-port/vice/src/arch/msdos/cbm2ui.c
branches/chris/cocoa-port/vice/src/arch/msdos/console.c
branches/chris/cocoa-port/vice/src/arch/msdos/joy.c
branches/chris/cocoa-port/vice/src/arch/msdos/petui.c
branches/chris/cocoa-port/vice/src/arch/msdos/plus4ui.c
branches/chris/cocoa-port/vice/src/arch/msdos/ui.c
branches/chris/cocoa-port/vice/src/arch/msdos/uijoystick.c
branches/chris/cocoa-port/vice/src/arch/msdos/uinetplay.c
branches/chris/cocoa-port/vice/src/arch/msdos/uiperipherial.c
branches/chris/cocoa-port/vice/src/arch/msdos/video.c
branches/chris/cocoa-port/vice/src/arch/os2/archdep.c
branches/chris/cocoa-port/vice/src/arch/os2/blockdev.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/dlg-cmdopt.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/dlg-drive.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/dlg-fileio.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/dlg-joystick.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/dlg-monitor.c
branches/chris/cocoa-port/vice/src/arch/os2/dialogs/menubar.c
branches/chris/cocoa-port/vice/src/arch/os2/fullscr.c
branches/chris/cocoa-port/vice/src/arch/os2/kbd/parse.c
branches/chris/cocoa-port/vice/src/arch/os2/ui.c
branches/chris/cocoa-port/vice/src/arch/os2/uimon.c
branches/chris/cocoa-port/vice/src/arch/os2/video.c
branches/chris/cocoa-port/vice/src/arch/os2/vsidui.c
branches/chris/cocoa-port/vice/src/arch/riscos/spritedrv.c
branches/chris/cocoa-port/vice/src/arch/riscos/ui.c
branches/chris/cocoa-port/vice/src/arch/riscos/video.c
branches/chris/cocoa-port/vice/src/arch/riscos/videoarch.h
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/audio_gp2x.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/c128ui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/c64ui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/cbm2ui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/input_gp2x.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/input_gp2x.h
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/minimal.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/petui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/plus4ui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/prefs_gp2x.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/uiarch.h
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/vic20ui.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/video.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
branches/chris/cocoa-port/vice/src/arch/unix/gp2x/vsidui.c
branches/chris/cocoa-port/vice/src/arch/unix/gui/vsidui.c
branches/chris/cocoa-port/vice/src/arch/unix/joy.h
branches/chris/cocoa-port/vice/src/arch/unix/readline/complete.c
branches/chris/cocoa-port/vice/src/arch/unix/readline/editline.c
branches/chris/cocoa-port/vice/src/arch/unix/readline/editline.h
branches/chris/cocoa-port/vice/src/arch/unix/readline/editline2.c
branches/chris/cocoa-port/vice/src/arch/unix/readline/sysunix.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uicolor.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/x11video.c
branches/chris/cocoa-port/vice/src/arch/win32/intl.c
branches/chris/cocoa-port/vice/src/arch/win32/signals.c
branches/chris/cocoa-port/vice/src/arch/win32/ui.c
branches/chris/cocoa-port/vice/src/arch/win32/watcom/c64.tgt
branches/chris/cocoa-port/vice/src/arch/win32/watcom/monitor.tgt
branches/chris/cocoa-port/vice/src/arch/win32/watcom/plus4.tgt
branches/chris/cocoa-port/vice/src/arch/win32/watcom/vic20.tgt
branches/chris/cocoa-port/vice/src/c64/c64io.c
branches/chris/cocoa-port/vice/src/c64/cart/c64cart.c
branches/chris/cocoa-port/vice/src/c64/mmc64.c
branches/chris/cocoa-port/vice/src/cartconv.c
branches/chris/cocoa-port/vice/src/crtc/crtc.c
branches/chris/cocoa-port/vice/src/drive/rotation.c
branches/chris/cocoa-port/vice/src/fsdevice/fsdevice-close.c
branches/chris/cocoa-port/vice/src/joystick.c
branches/chris/cocoa-port/vice/src/keyboard.c
branches/chris/cocoa-port/vice/src/monitor/mon_command.c
branches/chris/cocoa-port/vice/src/monitor/mon_file.c
branches/chris/cocoa-port/vice/src/monitor/mon_file.h
branches/chris/cocoa-port/vice/src/monitor/mon_lex.c
branches/chris/cocoa-port/vice/src/monitor/mon_lex.l
branches/chris/cocoa-port/vice/src/monitor/mon_memory.c
branches/chris/cocoa-port/vice/src/monitor/mon_parse.c
branches/chris/cocoa-port/vice/src/monitor/mon_parse.h
branches/chris/cocoa-port/vice/src/monitor/mon_parse.y
branches/chris/cocoa-port/vice/src/monitor/monitor.c
branches/chris/cocoa-port/vice/src/monitor/montypes.h
branches/chris/cocoa-port/vice/src/monitor.h
branches/chris/cocoa-port/vice/src/network.c
branches/chris/cocoa-port/vice/src/sounddrv/soundallegro.c
branches/chris/cocoa-port/vice/src/sounddrv/soundarts.c
branches/chris/cocoa-port/vice/src/sounddrv/soundmmos2.c
branches/chris/cocoa-port/vice/src/sounddrv/soundmp3.c
branches/chris/cocoa-port/vice/src/sounddrv/soundvoc.c
branches/chris/cocoa-port/vice/src/sounddrv/soundwav.c
branches/chris/cocoa-port/vice/src/tape/tape.c
branches/chris/cocoa-port/vice/src/translate.c
branches/chris/cocoa-port/vice/src/translate.txt
branches/chris/cocoa-port/vice/src/vic20/vic20cartridge.c
branches/chris/cocoa-port/vice/src/zfile.c
Removed Paths:
-------------
branches/chris/cocoa-port/vice/aclocal.m4
branches/chris/cocoa-port/vice/depcomp
branches/chris/cocoa-port/vice/missing
branches/chris/cocoa-port/vice/po/de.gmo
branches/chris/cocoa-port/vice/po/fr.gmo
branches/chris/cocoa-port/vice/po/hu.gmo
branches/chris/cocoa-port/vice/po/it.gmo
branches/chris/cocoa-port/vice/po/nl.gmo
branches/chris/cocoa-port/vice/po/pl.gmo
branches/chris/cocoa-port/vice/po/stamp-cat-id
branches/chris/cocoa-port/vice/po/sv.gmo
branches/chris/cocoa-port/vice/po/vice.pot
branches/chris/cocoa-port/vice/src/resid/aclocal.m4
branches/chris/cocoa-port/vice/src/resid/config.guess
branches/chris/cocoa-port/vice/src/resid/config.sub
branches/chris/cocoa-port/vice/src/resid/configure
branches/chris/cocoa-port/vice/src/resid/depcomp
branches/chris/cocoa-port/vice/src/resid/install-sh
branches/chris/cocoa-port/vice/src/resid/missing
branches/chris/cocoa-port/vice/src/resid/mkinstalldirs
Modified: branches/chris/cocoa-port/vice/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/ChangeLog 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/ChangeLog 2008-06-03 19:12:32 UTC (rev 18834)
@@ -1,3 +1,15 @@
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * autogen.sh: Removed "bash-ism" from script (compare with "=="
+ instead of "=").
+
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot,
+ po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo,
+ po/de.gmo, po/sv.gmo: Removed some more auto-generated or
+ unnecessary files.
+
2008-05-18 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.15.
Modified: branches/chris/cocoa-port/vice/Makefile.am
===================================================================
--- branches/chris/cocoa-port/vice/Makefile.am 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/Makefile.am 2008-06-03 19:12:32 UTC (rev 18834)
@@ -147,7 +147,7 @@
endif
@MAKE_BINDIST_TRUE@installvice:
-@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
+@MAKE_BINDIST_TRUE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
@MAKE_BINDIST_FALSE@installvice: install-recursive
Deleted: branches/chris/cocoa-port/vice/aclocal.m4
===================================================================
--- branches/chris/cocoa-port/vice/aclocal.m4 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/aclocal.m4 2008-06-03 19:12:32 UTC (rev 18834)
@@ -1,884 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
- LEX=${am_missing_run}flex
-fi])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
Modified: branches/chris/cocoa-port/vice/autogen.sh
===================================================================
--- branches/chris/cocoa-port/vice/autogen.sh 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/autogen.sh 2008-06-03 19:12:32 UTC (rev 18834)
@@ -89,7 +89,7 @@
buildfiles
-if [ x"$1" == x"--dist" ]; then
+if [ x"$1" = x"--dist" ]; then
./configure
(cd src/monitor/; make mon_lex.c mon_parse.c)
Deleted: branches/chris/cocoa-port/vice/depcomp
===================================================================
--- branches/chris/cocoa-port/vice/depcomp 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/depcomp 2008-06-03 19:12:32 UTC (rev 18834)
@@ -1,530 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <ol...@dc...>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug...@gn...>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
- stat=$?
-
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-
- if test -f "$tmpdepfile"; then
- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- "$@" || exit $?
- IFS=" "
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Deleted: branches/chris/cocoa-port/vice/missing
===================================================================
--- branches/chris/cocoa-port/vice/missing 2008-06-03 18:47:33 UTC (rev 18833)
+++ branches/chris/cocoa-port/vice/missing 2008-06-03 19:12:32 UTC (rev 18834)
@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pi...@ir...>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for mo...
[truncated message content] |
|
From: <cnv...@us...> - 2008-06-03 18:47:41
|
Revision: 18833
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18833&view=rev
Author: cnvogelg
Date: 2008-06-03 11:47:33 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
chris/cocoa-port: use supplied autogen script in release build
Modified Paths:
--------------
branches/chris/cocoa-port/vice/build/macosx/build-vice-release.sh
Modified: branches/chris/cocoa-port/vice/build/macosx/build-vice-release.sh
===================================================================
--- branches/chris/cocoa-port/vice/build/macosx/build-vice-release.sh 2008-06-03 17:56:27 UTC (rev 18832)
+++ branches/chris/cocoa-port/vice/build/macosx/build-vice-release.sh 2008-06-03 18:47:33 UTC (rev 18833)
@@ -96,13 +96,8 @@
# configure snapshot
echo "configuring new source tree"
-(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+(cd "$SRC_DIR" && ./autogen.sh)
if [ $? != 0 ]; then
- echo "ERROR: configuring resid..."
- exit 1
-fi
-(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
-if [ $? != 0 ]; then
echo "ERROR: configuring VICE..."
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-06-03 17:56:32
|
Revision: 18832
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18832&view=rev
Author: strik
Date: 2008-06-03 10:56:27 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Tagged version 1.22.17.
Added Paths:
-----------
tags/v1.22/v1.22.17/
Copied: tags/v1.22/v1.22.17 (from rev 18831, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-06-03 17:51:31
|
Revision: 18831
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18831&view=rev
Author: strik
Date: 2008-06-03 10:46:25 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
2008-06-03 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.17.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/configure.in
trunk/vice/po/de.po
trunk/vice/po/fr.po
trunk/vice/po/hu.po
trunk/vice/po/it.po
trunk/vice/po/nl.po
trunk/vice/po/pl.po
trunk/vice/po/sv.po
trunk/vice/src/ChangeLog
trunk/vice/src/version.h
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/ChangeLog 2008-06-03 17:46:25 UTC (rev 18831)
@@ -1,5 +1,7 @@
2008-06-03 Spiro Trikaliotis <spi...@gm...>
+ * Version 1.22.17.
+
* configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
if it exists. This adds support for libnet 1.1 for TFE/RR-net
emulation.
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/configure.in 2008-06-03 17:46:25 UTC (rev 18831)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=16
+VICE_VERSION_BUILD=17
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/de.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2008-01-02 16:46+0100\n"
"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
"Language-Team: de <de...@li...>\n"
@@ -23,7 +23,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Emulationsgeschwindigkeit auf Wert beschr\xE4nken."
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -56,23 +56,23 @@
msgid "Cannot load snapshot file."
msgstr "Kann Snapshot Datei nicht laden."
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Sound Wiedergaben einschalten"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Sound Wiedergaben ausschalten"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Setze Sound Sample Rate zu <Wert> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "Setze Source Buffer Gr\xF6\xDFe zu <Wert> msek"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -149,113 +149,113 @@
msgid "<name>"
msgstr "<Name>"
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sound Treiber spezifieren"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<Argumente>"
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Initialisierungsparameter des Sound Treibers spezifizieren"
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sound Treiber f\xFCr Aufnahme spezifizieren"
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr "Initialisierungsparameter f\xFCr Aufnahme Sound Treiber spezifieren"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<Sync>"
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
"Setze Sound Geschwindigkeit Anpassung (0: flexibel, 1: anpassend, 2: exakt)"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "Schreiben auf Sound Ger\xE4t ist fehlgeschlagen."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Kann SID Engine nicht \xF6ffnen"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Kann SID Engine nicht initialisieren"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "Initialisierung von Ger\xE4t `%s' fehlgeschlagen."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "Sound Ger\xE4t unterst\xFCtzt keine Stereo Ausgabe"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "Ger\xE4t '%s' konnte nicht gefunden werden oder ist nicht unterst\xFCtzt."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Aufnahmeger\xE4t %s existiert nicht!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr "Aufnahmeger\xE4t mu\xDF unteschiedlich vom Abspielger\xE4t sein"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr "Warnung! Aufnahmeger\xE4t %s scheint ein Echtzeitger\xE4t zu sein!"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "Initialisierung von Ger\xE4t `%s' fehlgeschlagen."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr "Aufnahmeger\xE4t unterst\xFCtzt derzeitige Soundeinstellungen nicht"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Sound Puffer \xDCberlauf (Zyklus basiert)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Sound Puffer \xDCberlauf."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "Entleerung nicht m\xF6glich."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "Fragmentierungsproblem."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Puffer geleert"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "Ablauf zu langsam."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "Schreiben auf Sound Ger\xE4t ist fehlgeschlagen."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "Speichern auf Sound Ger\xE4t ist fehlgeschlagen."
@@ -385,72 +385,72 @@
msgstr ""
"Wiedergabe Fehler: %s ist unterschiedlich von Zeile %d in Datei debug%06d"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr "Kann zwischen IPV4/IPV6 nicht wechseln, solange netplay aktiv ist."
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr "Teste optimale Framerate..."
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr "Benutze %d Frameverz\xF6gerung."
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
msgid "Cannot load snapshot file for transfer"
msgstr "Kann Snapshot Datei f\xFCr Transfer nicht laden"
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
msgid "Sending snapshot to client..."
msgstr "Sende Snapshot zu Client..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
msgid "Cannot send snapshot to client"
msgstr "Kann Snapshot Datei nicht senden"
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, c-format
msgid "Cannot create snapshot file %s"
msgstr "Kann Snapshot Datei `%s' nicht erzeugen"
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, c-format
msgid "Cannot open snapshot file %s"
msgstr "Kann Snapshot Datei `%s' nicht \xF6ffnen."
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr "Server wartet auf Client..."
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
msgid "Cannot create snapshot file. Select different history directory!"
msgstr "Kann Snapshot Datei nicht erzeugen. Verwende ein anderes Verzeichnis!"
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, c-format
msgid "Cannot resolve %s"
msgstr "Kann %s nicht aufl\xF6sen"
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr "Kann zu %s nicht verbinden (Kein Server aktiv auf Port %d)."
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
msgid "Receiving snapshot from server..."
msgstr "Empfange Snapshot von Server..."
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr "Entfernter Rechner getrennt."
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr "Entfernter Rechner angehaltedn..."
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr "Netzwerksynchronisationsproblem - Trenne Verbindung."
@@ -5009,7 +5009,8 @@
msgstr "*Ethernet aktivieren"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*RR-NET kompatibler Modus"
#: src/arch/unix/gui/uitfe.c:52
Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/fr.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
"Language-Team: fr <fr...@li...>\n"
@@ -28,7 +28,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Limiter la vitesse d'\xE9mulation \xE0 une valeur specifi\xE9e"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -60,23 +60,23 @@
msgid "Cannot load snapshot file."
msgstr "Impossible de charger la sauvegarde."
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Activer le son"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "D\xE9sactiver le son"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "R\xE9gler le taux d'\xE9chantillonage \xE0 <valeur> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "R\xE9gler la taille du tampon \xE0 <valeur> ms"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -153,118 +153,118 @@
msgid "<name>"
msgstr "<nom>"
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sp\xE9cifier le pilote son"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<args>"
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote son"
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sp\xE9cifier le pilote d'enregistrement son"
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
"Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote d'enregistrement son"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr "R\xE9gler l'ajustement son (0: flexible, 1: ajust\xE9 2: exact"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "impossible d'\xE9crire sur le p\xE9riph\xE9rique son."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Erreur d'ouverture de l'engin SID"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Erreur d'initialisation de l'engin SID"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "erreur d'initialisation du p\xE9riph\xE9rique `%s'."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "le p\xE9riph\xE9rique son n'est pas st\xE9r\xE9o"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "p\xE9riph\xE9rique '%s' non trouv\xE9 ou non support\xE9."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Le p\xE9riph\xE9rique d'enregistrement %s n'existe pas!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr ""
"Le p\xE9riph\xE9rique d'enregistrement doit \xEAtre diff\xE9rent du p\xE9riph\xE9rique de "
"lecture"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr ""
"Attention! Le p\xE9riph\xE9rique d'enregistrement %s semble \xEAtre un p\xE9riph\xE9rique "
"temps r\xE9el"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "\xC9chec de l'initialisation du p\xE9riph\xE9rique `%s'."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr ""
"Le p\xE9riph\xE9rique d'enregistrement ne supporte pas les param\xE8tres son actuels"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Erreur de d\xE9passement de limite du tampon son (bas\xE9 sur les cycles)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Erreur de d\xE9passement de limite du tampon son."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "impossible de vider."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "probl\xE8mes de fragments."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Tampon vide"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "ex\xE9cution trop lente."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "erreur d'\xE9criture sur le p\xE9riph\xE9rique son."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "erreur d'enregistrement sur le p\xE9riph\xE9rique son."
@@ -396,77 +396,77 @@
msgstr ""
"Erreur de lecture: %s est diff\xE9rente de la ligne %d du fichier d\xE9bug%06d"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr ""
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr ""
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr ""
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
#, fuzzy
msgid "Cannot load snapshot file for transfer"
msgstr "Impossible de charger la sauvegarde."
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
#, fuzzy
msgid "Sending snapshot to client..."
msgstr "E&nregistrer une sauvegarde..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
#, fuzzy
msgid "Cannot send snapshot to client"
msgstr "Impossible de charger le fichier de sauvegarde."
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, fuzzy, c-format
msgid "Cannot create snapshot file %s"
msgstr "Impossible d'\xE9crire le fichier de sauvegarde `%s'."
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, fuzzy, c-format
msgid "Cannot open snapshot file %s"
msgstr "Impossible d'\xE9crire le fichier de sauvegarde `%s'."
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr ""
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
#, fuzzy
msgid "Cannot create snapshot file. Select different history directory!"
msgstr "Impossible d'\xE9crire le fichier de sauvegarde `%s'."
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, fuzzy, c-format
msgid "Cannot resolve %s"
msgstr "Impossible d'\xE9crire le fichier log `%s'."
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr ""
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
#, fuzzy
msgid "Receiving snapshot from server..."
msgstr "S\xE9lectionner la sauvegarde de fin pour l'historique des \xE9v\xE9nements"
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr ""
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr ""
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr ""
@@ -5173,7 +5173,8 @@
msgstr "*Activer ethernet"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*Mode de compatibilit\xE9 RR-NET"
#: src/arch/unix/gui/uitfe.c:52
Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/hu.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-27 15:58+0200\n"
"Last-Translator: Karai Csaba <cs...@fr...>\n"
"Language-Team: Hungarian <hu...@li...>\n"
@@ -25,7 +25,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Emul\xE1ci\xF3s sebess\xE9g lehat\xE1rol\xE1sa adott \xE9rt\xE9kre"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -57,23 +57,23 @@
msgid "Cannot load snapshot file."
msgstr "Nem siker\xFClt bet\xF6lteni a pillanatk\xE9p f\xE1jlt."
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Hangok enged\xE9lyez\xE9se"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Hangok tilt\xE1sa"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Hang mintav\xE9telez\xE9si r\xE1ta be\xE1ll\xEDt\xE1sa Hz-ben <\xE9rt\xE9k>-re"
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "A hangpuffer m\xE9ret\xE9t <\xE9rt\xE9k> mp-re \xE1ll\xEDtja"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -150,113 +150,113 @@
msgid "<name>"
msgstr "<n\xE9v>"
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Adja meg a hangmodul nev\xE9t"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<argumentumok>"
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Adja meg a hangmodul indul\xE1si param\xE9tereit"
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Adja meg a felv\xE9telhez haszn\xE1lt hangmodult"
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr "Adja meg a felv\xE9telhez haszn\xE1lt hangmodul indul\xE1si param\xE9tereit"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
"Adja meg a zene sebess\xE9g igaz\xEDt\xE1s\xE1t (0: rugalmas. 1: igazod\xF3, 2: pontos)"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "Nem siker\xFClt a hangeszk\xF6zre \xEDrni"
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Nem siker\xFClt a SID motort megnyitni"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Nem siker\xFClt a SID motort elind\xEDtani"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "A `%s' eszk\xF6zt nem siker\xFClt elind\xEDtani."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "A hangeszk\xF6z nem stereo"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "A '%s' eszk\xF6z nem l\xE9tezik, vagy nem t\xE1mogatott."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "A %s felvev\xF5 eszk\xF6z nem l\xE9tezik!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr "A felvev\xF5 \xE9s lej\xE1tsz\xF3 eszk\xF6z\xF6knek k\xFCl\xF6nb\xF6znie kell!"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr "Figyelem! A %s felvev\xF5 eszk\xF6z \xFAgy t\xFBnik, val\xF3s idej\xFB eszk\xF6z!"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "A `%s' eszk\xF6z ind\xEDt\xE1sa nem siker\xFClt."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr "A felvev\xF5 eszk\xF6z nem t\xE1mogatja az aktu\xE1lis hangbe\xE1ll\xEDt\xE1sokat"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Hangpuffer t\xFAlcsordul\xE1s (ciklus alap\xFA)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Hangpuffer t\xFAlcsordul\xE1s."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "nem siker\xFClt \xFCr\xEDteni a puffert."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "t\xF6red\xE9kr\xE9sz probl\xE9m\xE1k."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "A puffer alulcsordult."
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "t\xFAl lassan megy."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "a hangeszk\xF6zre t\xF6rt\xE9n\xF5 \xEDr\xE1s nem siker\xFClt."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "a hangeszk\xF6z\xF6n t\xF6rt\xE9n\xF5 t\xE1rol\xE1s nem siker\xFClt."
@@ -384,73 +384,73 @@
msgstr ""
"Visszaj\xE1tsz\xE1si hiba: %s k\xFCl\xF6nb\xF6zik a %d. sorban a debug%06d f\xE1jl eset\xE9n"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr "Nem v\xE1lthat IPV4/IPV6 k\xF6z\xF6tt, am\xEDg a h\xE1l\xF3zati j\xE1t\xE9k akt\xEDv"
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr "Legjobb k\xE9pkocka k\xE9sleltet\xE9s tesztel\xE9se..."
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr "%d k\xE9pkocka k\xE9sleltet\xE9s haszn\xE1lata."
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
msgid "Cannot load snapshot file for transfer"
msgstr "Nem siker\xFClt az \xE1tk\xFCldend\xF5 pillanatk\xE9p f\xE1jlt bet\xF6lteni"
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
msgid "Sending snapshot to client..."
msgstr "Pillanatk\xE9p k\xFCld\xE9se a kliensnek..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
msgid "Cannot send snapshot to client"
msgstr "Nem siker\xFClt pillanatk\xE9pet elk\xFCldeni a klienshez"
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, c-format
msgid "Cannot create snapshot file %s"
msgstr "Nem siker\xFClt a pillanatk\xE9pf\xE1jlt l\xE9trehozni (%s)"
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, c-format
msgid "Cannot open snapshot file %s"
msgstr "Nem siker\xFClt a pillanatk\xE9pf\xE1jlt megnyitni (%s)"
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr "A kiszolg\xE1l\xF3 kliensre v\xE1r..."
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
msgid "Cannot create snapshot file. Select different history directory!"
msgstr ""
"Nem siker\xFClt pillanatk\xE9p f\xE1jlt l\xE9trehozni. K\xE9rem v\xE1lasszon m\xE1s k\xF6nyvt\xE1rat!"
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, c-format
msgid "Cannot resolve %s"
msgstr "Nem siker\xFClt %s-t feloldani"
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr "Nem siker\xFClt %s-hez kapcsol\xF3dni (a %d porton nem fut kiszolg\xE1l\xF3)"
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
msgid "Receiving snapshot from server..."
msgstr "Pillanatk\xE9p fogad\xE1sa a szerverr\xF5l..."
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr "A t\xE1voli sz\xE1m\xEDtog\xE9p lekapcsol\xF3dott."
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr "A t\xE1voli sz\xE1m\xEDt\xF3g\xE9p felf\xFCggeszt\xE9st k\xE9rt..."
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr "A h\xE1l\xF3zat kiesett a szinkronb\xF3l - sz\xE9tkapcsol\xF3d\xE1s"
@@ -5050,7 +5050,8 @@
msgstr "*Ethernet enged\xE9lyez\xE9se"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*RR-NET kompatibilit\xE1s m\xF3d"
#: src/arch/unix/gui/uitfe.c:52
Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/it.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-28 14:26+0100\n"
"Last-Translator: Andrea Musuruane <mus...@gm...>\n"
"Language-Team: it <it...@li...>\n"
@@ -24,7 +24,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Limita la velocit\xE0 di emulazione al valore specificato"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -56,23 +56,23 @@
msgid "Cannot load snapshot file."
msgstr "Non \xE8 possibile caricare il file di snapshot."
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Attiva la riproduzione dell'audio"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Disattiva la riproduzione dell'audio"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Imposta la velocit\xE0 di campionamento dell'audio a <valore> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "Imposta la dimensione del buffer dell'audio a <valore> msec"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -149,119 +149,119 @@
msgid "<name>"
msgstr "<nome>"
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Specifica il driver audio"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<argomenti>"
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Specifica i parametri di inizializzazione del driver audio"
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Specifica il driver audio di registrazione"
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
"Specifica i parametri di inizializzazione per il driver audio di "
"registrazione"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
"Imposta il tipo di adattamento della velocit\xE0 dell'audio (0: flessibile, 1:"
"adattabile, 2: esatta)"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "scrittura sulla scheda audio fallita."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Non \xE8 possibile aprire il motore SID"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Non \xE8 possibile inizializzare il motore SID"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "inizializzazione fallita per il device `%s'."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "la scheda audio non dispone di una modalit\xE0 stereofonica"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "il device '%s' non \xE8 stato trovato oppure non \xE8 supportato."
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Il device di registrazione %s non esiste!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr ""
"Il device di registrazione deve essere differente da quello di riproduzione"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr ""
"Attenzione! Il device di registrazione %s sembra essere un dispositivo "
"realtime!"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "Inizializzazione fallita per il device `%s'."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr "Il device di registrazione non supporta i parametri attuali"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Overflow del buffer audio (cycle based)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Overflow del buffer audio."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "non \xE8 possibile svuotare."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "problemi di frammentazione."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Buffer vuoto"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "esecuzione troppo lenta."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "scrittura sulla scheda audio fallita."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "memorizzazione sulla scheda audio fallita."
@@ -390,75 +390,75 @@
msgstr ""
"Errore di riproduzione: %s \xE8 differente dalla linea %d del file di debug %06d"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr "Non \xE8 possibile commutare tra IPV4 e IPV6 mentre netplay \xE8 attivo."
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr "Rileva il miglior ritardo tra frame..."
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr "Utilizzo %d frame di ritardo."
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
msgid "Cannot load snapshot file for transfer"
msgstr "Non \xE8 possibile caricare il file di snapshot per il trasferimento"
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
msgid "Sending snapshot to client..."
msgstr "Invio dell'immagine dello snapshot al client in corso..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
msgid "Cannot send snapshot to client"
msgstr "Non \xE8 possibile inviare lo snapshot al client"
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, c-format
msgid "Cannot create snapshot file %s"
msgstr "Non \xE8 possibile creare il file di snapshot %s"
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, c-format
msgid "Cannot open snapshot file %s"
msgstr "Non \xE8 possibile aprire il file di snapshot %s"
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr "Il server \xE8 in attesa di un client..."
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
msgid "Cannot create snapshot file. Select different history directory!"
msgstr ""
"Non \xE8 possibile creare il file di snapshot. Seleziona una directory diversa "
"per la cronologia."
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, c-format
msgid "Cannot resolve %s"
msgstr "Non \xE8 possibile risolvere %s"
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr ""
"Non \xE8 possibile connettersi a %s (nessun server \xE8 attivo sulla porta %d)."
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
msgid "Receiving snapshot from server..."
msgstr "Ricezione dello snapshot dal server in corso..."
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr "Disconnesso dall'host remoto."
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr "Sospesione dell'host remoto in corso..."
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr "Rete non sincronizzata - disconnesione in corso."
@@ -5084,7 +5084,8 @@
msgstr "*Attiva ethernet"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*Modalit\xE0 compatibile RR-NET"
#: src/arch/unix/gui/uitfe.c:52
Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/nl.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
"Language-Team: nl <nl...@li...>\n"
@@ -24,7 +24,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Beperk emulatiesnelheid tot de opgegeven waarde"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -56,23 +56,23 @@
msgid "Cannot load snapshot file."
msgstr "Kan momentopnamebestand niet laden."
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Activeer geluidsweergave"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Geluid uitschakelen"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Zet de geluid sample rate naar <waarde> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "Zet de geluidsbuffergrootte naar <waarde> msec"
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -149,113 +149,113 @@
msgid "<name>"
msgstr "<naam>"
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Geef geluidsstuurprogramma"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<parameters>"
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Geef de initialisatieparameters voor het geluidsstuurprogramma"
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Geef geluidsstuurprogramma voor opname"
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
"Geef initialisatieparameters voor het geluidsstuurprogramma voor opname"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr "Zet geluidssnelheid aanpassing (0: flexibel, 1: aanpassend, 2: exact)"
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr "schrijfactie naar geluidsapparaat is mislukt."
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
msgid "Cannot open SID engine"
msgstr "Kan de SID-kern niet openen"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr "Kan de SID-kern niet initialiseren"
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, c-format
msgid "initialization failed for device `%s'."
msgstr "initialisatie voor apparaat `%s' is mislukt."
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr "geluidsapparaat heeft geen stereo ondersteuning"
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr "apparaat '%s' niet gevonden of wordt niet ondersteund"
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr "Opnameapparaat %s bestaat niet!"
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr "Opnameapparaat moet anders zijn dan afspeelapparaat"
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr "Waarschuwing! Opnameapparaat %s lijkt een realtime apparaat te zijn!"
-#: src/sound.c:767
+#: src/sound.c:771
#, c-format
msgid "Initialization failed for device `%s'."
msgstr "Initialisatie voor apparaat `%s' is mislukt."
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't support current sound parameters"
msgstr "Het opname apparaat ondersteunt de huidige geluid opties niet"
-#: src/sound.c:869 src/translate.c.po.c:326
+#: src/sound.c:873 src/translate.c.po.c:326
msgid "Sound buffer overflow (cycle based)"
msgstr "Geluidsbuffer overloop (cyclus gebaseerd)"
-#: src/sound.c:883 src/translate.c.po.c:336
+#: src/sound.c:887 src/translate.c.po.c:336
msgid "Sound buffer overflow."
msgstr "Geluidsbuffer overloop."
-#: src/sound.c:1013 src/translate.c.po.c:346
+#: src/sound.c:1017 src/translate.c.po.c:346
msgid "cannot flush."
msgstr "kan niet spoelen."
-#: src/sound.c:1062 src/translate.c.po.c:356
+#: src/sound.c:1066 src/translate.c.po.c:356
msgid "fragment problems."
msgstr "fragment problemen."
-#: src/sound.c:1092
+#: src/sound.c:1096
msgid "Buffer drained"
msgstr "Buffer leeg"
-#: src/sound.c:1131 src/translate.c.po.c:366
+#: src/sound.c:1135 src/translate.c.po.c:366
msgid "running too slow."
msgstr "draait te langzaam."
-#: src/sound.c:1147 src/sound.c:1157
+#: src/sound.c:1151 src/sound.c:1161
msgid "write to sounddevice failed."
msgstr "schrijfactie naar geluidsapparaat is mislukt."
-#: src/sound.c:1417 src/translate.c.po.c:376
+#: src/sound.c:1421 src/translate.c.po.c:376
msgid "store to sounddevice failed."
msgstr "opslag naar geluidsapparaat is mislukt."
@@ -383,75 +383,75 @@
msgid "Playback error: %s different from line %d of file debug%06d"
msgstr "Afspeelfout: %s is anders dan regel %d van bestand debug%06d"
-#: src/network.c:262 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
msgid "Cannot switch IPV4/IPV6 while netplay is active."
msgstr "Kan niet schakelen tussen IPV4/IPV6 omdat netplay actief is."
-#: src/network.c:487 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
msgid "Testing best frame delay..."
msgstr "Beste framevertraging aan het testen..."
-#: src/network.c:537 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
#, c-format
msgid "Using %d frames delay."
msgstr "%d frames vertraging in gebruik."
-#: src/network.c:562 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
msgid "Cannot load snapshot file for transfer"
msgstr "Kan het momentopnamebestand voor versturen niet laden"
-#: src/network.c:575 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
msgid "Sending snapshot to client..."
msgstr "Momentopname wordt naar de andere computer verstuurd..."
-#: src/network.c:585 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
msgid "Cannot send snapshot to client"
msgstr "Kan de momentopname niet naar de andere computer versturen"
-#: src/network.c:615 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
#, c-format
msgid "Cannot create snapshot file %s"
msgstr "Kan het momentopnamebestand %s niet maken"
-#: src/network.c:655 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
#, c-format
msgid "Cannot open snapshot file %s"
msgstr "Kan het momentopnamebestand %s niet openen"
-#: src/network.c:805 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
msgid "Server is waiting for a client..."
msgstr "De server wacht op de andere computer..."
-#: src/network.c:842 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
msgid "Cannot create snapshot file. Select different history directory!"
msgstr ""
"Kan het momentopnamebestand niet maken. Selecteer een andere "
"geschiedenisdirectory!"
-#: src/network.c:861 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
#, c-format
msgid "Cannot resolve %s"
msgstr "Onbekende host %s"
-#: src/network.c:906 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
#, c-format
msgid "Cannot connect to %s (no server running on port %d)."
msgstr ""
"Kan geen verbinding maken met %s (er is geen server aanwezig op poort %d)."
-#: src/network.c:920 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
msgid "Receiving snapshot from server..."
msgstr "Momentopname van de server wordt ontvangen..."
-#: src/network.c:1007 src/network.c:1037 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
msgid "Remote host disconnected."
msgstr "Andere computer heeft de verbinding verbroken."
-#: src/network.c:1049 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
msgid "Remote host suspending..."
msgstr "Andere computer halt de netplay..."
-#: src/network.c:1093 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
msgid "Network out of sync - disconnecting."
msgstr "Netwerk niet synchroon - verbinding wordt verbroken."
@@ -5055,7 +5055,8 @@
msgstr "*Activeer Ethernet"
#: src/arch/unix/gui/uitfe.c:50
-msgid "*RR-NET compatibity mode"
+#, fuzzy
+msgid "*RR-NET compatibility mode"
msgstr "*RR-NET compatibiliteitmodus"
#: src/arch/unix/gui/uitfe.c:52
Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po 2008-06-03 17:38:26 UTC (rev 18830)
+++ trunk/vice/po/pl.po 2008-06-03 17:46:25 UTC (rev 18831)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 21:02+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
"PO-Revision-Date: 2007-07-26 11:55+0200\n"
"Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
"Language-Team: pl <pl...@li...>\n"
@@ -23,7 +23,7 @@
msgid "Limit emulation speed to specified value"
msgstr "Ograniczaj pr\xEAdko\xB6\xE6 emulacji do podanej warto\xB6ci"
-#: src/vsync.c:149 src/sound.c:275 src/sound.c:277 src/debug.c:205
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
@@ -58,25 +58,25 @@
"Nie mo\xBFna za\xB3adowa\xE6 pliku zrzutu\n"
"`%s'"
-#: src/sound.c:271 src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
#, fuzzy
msgid "Enable sound playback"
msgstr "*W\xB3\xB1cz d\xBCwi\xEAk"
-#: src/sound.c:273 src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
#, fuzzy
msgid "Disable sound playback"
msgstr "*W\xB3\xB1cz d\xBCwi\xEAk"
-#: src/sound.c:275 src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr ""
-#: src/sound.c:277 src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr ""
-#: src/sound.c:279 src/sound.c:283 src/c128/c128-cmdline-options.c:108
+#: src/sound.c:283 src/sound.c:287 src/c128/c128-cmdline-options.c:108
#: src/c128/c128-cmdline-options.c:110 src/c128/c128-cmdline-options.c:112
#: src/c128/c128-cmdline-options.c:114 src/c128/c128-cmdline-options.c:116
#: src/c128/c128-cmdline-options.c:118 src/c128/c128-cmdline-options.c:120
@@ -153,115 +153,115 @@
msgid "<name>"
msgstr ""
-#: src/sound.c:279 src/translate.c.po.c:4505
+#: src/sound.c:283 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr ""
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
msgid "<args>"
msgstr ""
-#: src/sound.c:281 src/translate.c.po.c:4525
+#: src/sound.c:285 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr ""
-#: src/sound.c:283 src/translate.c.po.c:4535
+#: src/sound.c:287 src/translate.c.po.c:4535
#, fuzzy
msgid "Specify recording sound driver"
msgstr "Zatrzymaj zapisywanie wydarzen "
-#: src/sound.c:285 src/translate.c.po.c:4545
+#: src/sound.c:289 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:291 src/translate.c.po.c:4555
msgid "<sync>"
msgstr ""
-#: src/sound.c:287 src/translate.c.po.c:4565
+#: src/sound.c:291 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
-#: src/sound.c:497 src/translate.c.po.c:231
+#: src/sound.c:501 src/translate.c.po.c:231
msgid "write to sound device failed."
msgstr ""
-#: src/sound.c:512 src/translate.c.po.c:241
+#: src/sound.c:516 src/translate.c.po.c:241
#, fuzzy
msgid "Cannot open SID engine"
msgstr "Ustawienia uk\xB3adu SID"
-#: src/sound.c:551 src/translate.c.po.c:251
+#: src/sound.c:555 src/translate.c.po.c:251
msgid "Cannot initialize SID engine"
msgstr ""
-#: src/sound.c:658 src/translate.c.po.c:261
+#: src/sound.c:662 src/translate.c.po.c:261
#, fuzzy, c-format
msgid "initialization failed for device `%s'."
msgstr "Kalibracja sprz\xEAtowego joysticka dla urz\xB1dzenia `%s':"
-#: src/sound.c:667
+#: src/sound.c:671
msgid "sound device lacks stereo capability"
msgstr ""
-#: src/sound.c:717 src/translate.c.po.c:271
+#: src/sound.c:721 src/translate.c.po.c:271
#, c-format
msgid "device '%s' not found or not supported."
msgstr ""
-#: src/sound.c:738 src/translate.c.po.c:281
+#: src/sound.c:742 src/translate.c.po.c:281
#, c-format
msgid "Recording device %s doesn't exist!"
msgstr ""
-#: src/sound.c:746 src/translate.c.po.c:291
+#: src/sound.c:750 src/translate.c.po.c:291
msgid "Recording device must be different from playback device"
msgstr ""
-#: src/sound.c:756 src/translate.c.po.c:303
+#: src/sound.c:760 src/translate.c.po.c:303
#, c-format
msgid "Warning! Recording device %s seems to be a realtime device!"
msgstr ""
-#: src/sound.c:767
+#: src/sound.c:771
#, fuzzy, c-format
msgid "Initialization failed for device `%s'."
msgstr "Kalibracja sprz\xEAtowego joysticka dla urz\xB1dzenia `%s':"
-#: src/sound.c:782 src/translate.c.po.c:315
+#: src/sound.c:786 src/translate.c.po.c:315
msgid "The recording device doesn't supp...
[truncated message content] |
|
From: <st...@us...> - 2008-06-03 17:51:20
|
Revision: 18830
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18830&view=rev
Author: strik
Date: 2008-06-03 10:38:26 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
2008-06-03 Spiro Trikaliotis <spi...@gm...>
* configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
if it exists. This adds support for libnet 1.1 for TFE/RR-net
emulation.
* src/arch/unix/tfearch.c: Support libnet 1.1 if VICE_USE_LIBNET_1_1
is defined.
* src/arch/unix/gui/uitfe.c: Fixed a typo (compatibity ->
compatibility).
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/configure.in
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/gui/uitfe.c
trunk/vice/src/arch/unix/tfearch.c
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-06-03 17:27:20 UTC (rev 18829)
+++ trunk/vice/ChangeLog 2008-06-03 17:38:26 UTC (rev 18830)
@@ -1,5 +1,11 @@
2008-06-03 Spiro Trikaliotis <spi...@gm...>
+ * configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
+ if it exists. This adds support for libnet 1.1 for TFE/RR-net
+ emulation.
+
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
* configure.in: Changed bash'ism (if [...]) to more general code
(if test ...).
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-06-03 17:27:20 UTC (rev 18829)
+++ trunk/vice/configure.in 2008-06-03 17:38:26 UTC (rev 18830)
@@ -1119,6 +1119,15 @@
dnl /usr/lib/libpcap.a
dnl /usr/lib/libnet.a
AC_CHECK_LIB(pcap, pcap_open_live,[
+ AC_CHECK_LIB(net, libnet_init,[
+ AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
+ AC_DEFINE(VICE_USE_LIBNET_1_1,,[Support for The Final Ethernet])
+ TFE_LIBS="-lpcap `libnet-config --libs`"
+ CFLAGS="$CFLAGS `libnet-config --defines`"
+ ],,$LIBS)],,$LIBS)
+ dnl /usr/lib/libpcap.a
+ dnl /usr/lib/libnet.a
+ AC_CHECK_LIB(pcap, pcap_open_live,[
AC_CHECK_LIB(net, libnet_write_link_layer,[
AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
TFE_LIBS="-lpcap `libnet-config --libs`"
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-06-03 17:27:20 UTC (rev 18829)
+++ trunk/vice/src/ChangeLog 2008-06-03 17:38:26 UTC (rev 18830)
@@ -1,5 +1,13 @@
2008-06-03 Spiro Trikaliotis <spi...@gm...>
+ * arch/unix/tfearch.c: Support libnet 1.1 if VICE_USE_LIBNET_1_1
+ is defined.
+
+ * arch/unix/gui/uitfe.c: Fixed a typo (compatibity ->
+ compatibility).
+
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
* arch/unix/x11/xaw/widgets/MultiList.c,
arch/unix/x11/xaw/widgets/TextField.c: Removed warnings by
providing prototypes for some functions.
Modified: trunk/vice/src/arch/unix/gui/uitfe.c
===================================================================
--- trunk/vice/src/arch/unix/gui/uitfe.c 2008-06-03 17:27:20 UTC (rev 18829)
+++ trunk/vice/src/arch/unix/gui/uitfe.c 2008-06-03 17:38:26 UTC (rev 18830)
@@ -47,7 +47,7 @@
ui_menu_entry_t tfe_submenu[] = {
{ N_("*Enable Ethernet"),
(ui_callback_t)toggle_ETHERNET_ACTIVE, NULL, NULL },
- { N_("*RR-NET compatibity mode"),
+ { N_("*RR-NET compatibility mode"),
(ui_callback_t)toggle_ETHERNET_AS_RR, NULL, NULL },
{ N_("Interface..."),
(ui_callback_t)set_interface_name,
Modified: trunk/vice/src/arch/unix/tfearch.c
===================================================================
--- trunk/vice/src/arch/unix/tfearch.c 2008-06-03 17:27:20 UTC (rev 18829)
+++ trunk/vice/src/arch/unix/tfearch.c 2008-06-03 17:38:26 UTC (rev 18830)
@@ -59,7 +59,12 @@
static pcap_if_t *TfePcapAlldevs = NULL;
static pcap_t *TfePcapFP = NULL;
+
+#ifdef VICE_USE_LIBNET_1_1
+static libnet_t *TfeLibnetFP = NULL;
+#else /* VICE_USE_LIBNET_1_1 */
static struct libnet_link_int *TfeLibnetFP = NULL;
+#endif /* VICE_USE_LIBNET_1_1 */
static char TfePcapErrbuf[PCAP_ERRBUF_SIZE];
static char TfeLibnetErrBuf[LIBNET_ERRBUF_SIZE];
@@ -76,7 +81,7 @@
int i;
sprintf(buffer, "\n%s: length = %u\n", text, len1);
- OutputDebugString(buffer);
+ fprintf(stderr, "%s", buffer);
do {
p = buffer;
for (i=0; (i<8) && len1>0; len1--, i++) {
@@ -84,7 +89,8 @@
p += 3;
}
*(p-1) = '\n'; *p = 0;
- OutputDebugString(buffer);
+ // OutputDebugString(buffer);
+ fprintf(stderr, "%s", buffer);
} while (len1>0);
}
#endif // #ifdef TFE_DEBUG_PKTDUMP
@@ -191,7 +197,12 @@
}
/* now, open the libnet device to be able to send afterwards */
+#ifdef VICE_USE_LIBNET_1_1
+ TfeLibnetFP = libnet_init(LIBNET_LINK, (char *) interface_name, TfeLibnetErrBuf);
+#else /* VICE_USE_LIBNET_1_1 */
TfeLibnetFP = libnet_open_link_interface(interface_name, TfeLibnetErrBuf);
+#endif /* VICE_USE_LIBNET_1_1 */
+
if (TfeLibnetFP == NULL) {
log_message(tfe_arch_log, "Libnet interface could not be opened: '%s'", TfeLibnetErrBuf);
@@ -362,7 +373,10 @@
BYTE *txframe /* Pointer to the frame to be transmitted */
)
{
+#ifdef VICE_USE_LIBNET_1_1
+#else /* VICE_USE_LIBNET_1_1 */
u_char *plibnet_buffer = NULL;
+#endif /* VICE_USE_LIBNET_1_1 */
#ifdef TFE_DEBUG_ARCH
log_message( tfe_arch_log, "tfe_arch_transmit() called, with: "
@@ -380,6 +394,39 @@
#endif // #ifdef TFE_DEBUG_PKTDUMP
/* we want to send via libnet */
+
+#ifdef VICE_USE_LIBNET_1_1
+
+ do {
+ libnet_pblock_t *p;
+
+ p = libnet_pblock_new(TfeLibnetFP, txlength);
+
+ if (p == NULL) {
+ log_message(tfe_arch_log, "WARNING! Could not send packet, libnet_pblock_probe() failed!");
+ break;
+ }
+
+ if ( libnet_pblock_append(TfeLibnetFP, p, txframe, txlength) == -1 ) {
+ log_message(tfe_arch_log, "WARNING! Could not send packet, libnet_pblock_append() failed!");
+ break;
+ }
+
+ libnet_pblock_update(TfeLibnetFP, p, 0, LIBNET_PBLOCK_ETH_H);
+
+ if ( libnet_write(TfeLibnetFP) == -1 ) {
+ log_message(tfe_arch_log, "WARNING! Could not send packet, libnet_write() failed!");
+ break;
+ }
+
+ libnet_pblock_delete(TfeLibnetFP, p);
+
+ } while (0);
+
+#else /* VICE_USE_LIBNET_1_1 */
+
+ /* libnet 1.0 compatibility */
+
if (libnet_init_packet(txlength, &plibnet_buffer)==-1) {
log_message(tfe_arch_log, "WARNING! Could not send packet!");
}
@@ -394,6 +441,8 @@
"but libnet_init_packet() did NOT fail!!");
}
}
+
+#endif /* VICE_USE_LIBNET_1_1 */
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-06-03 17:27:33
|
Revision: 18829
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18829&view=rev
Author: strik
Date: 2008-06-03 10:27:20 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
2008-06-03 Spiro Trikaliotis <spi...@gm...>
* configure.in: Changed bash'ism (if [...]) to more general code
(if test ...).
* src/arch/unix/x11/xaw/widgets/MultiList.c,
src/arch/unix/x11/xaw/widgets/TextField.c: Removed warnings by
providing prototypes for some functions.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/configure.in
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
trunk/vice/src/arch/unix/x11/xaw/widgets/TextField.c
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-06-02 18:57:19 UTC (rev 18828)
+++ trunk/vice/ChangeLog 2008-06-03 17:27:20 UTC (rev 18829)
@@ -1,3 +1,8 @@
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
+ * configure.in: Changed bash'ism (if [...]) to more general code
+ (if test ...).
+
2008-05-25 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.16.
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-06-02 18:57:19 UTC (rev 18828)
+++ trunk/vice/configure.in 2008-06-03 17:27:20 UTC (rev 18829)
@@ -107,7 +107,7 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-if [ "x${OBJCFLAGS}" = x ]; then
+if test -z "x${OBJCFLAGS}"; then
OBJCFLAGS="${CFLAGS}"
fi
OBJCDEPMODE="depmode=${CC}"
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-06-02 18:57:19 UTC (rev 18828)
+++ trunk/vice/src/ChangeLog 2008-06-03 17:27:20 UTC (rev 18829)
@@ -1,3 +1,9 @@
+2008-06-03 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/unix/x11/xaw/widgets/MultiList.c,
+ arch/unix/x11/xaw/widgets/TextField.c: Removed warnings by
+ providing prototypes for some functions.
+
2008-06-01 Marco van den Heuvel <bla...@ya...>
* configure.in: Added extra defines needed for minix, alligned
Modified: trunk/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
===================================================================
--- trunk/vice/src/arch/unix/x11/xaw/widgets/MultiList.c 2008-06-02 18:57:19 UTC (rev 18828)
+++ trunk/vice/src/arch/unix/x11/xaw/widgets/MultiList.c 2008-06-03 17:27:20 UTC (rev 18829)
@@ -60,6 +60,7 @@
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xmu/Drawing.h>
#include "lib.h"
@@ -72,9 +73,6 @@
*===========================================================================*/
-Pixmap XmuCreateStippledPixmap();
-extern void XawInitializeWidgetSet();
-
#define SUPERCLASS &(simpleClassRec)
#define FontAscent(f) ((f)->max_bounds.ascent)
Modified: trunk/vice/src/arch/unix/x11/xaw/widgets/TextField.c
===================================================================
--- trunk/vice/src/arch/unix/x11/xaw/widgets/TextField.c 2008-06-02 18:57:19 UTC (rev 18828)
+++ trunk/vice/src/arch/unix/x11/xaw/widgets/TextField.c 2008-06-03 17:27:20 UTC (rev 18829)
@@ -70,8 +70,8 @@
#undef offset
static void Initialize(Widget treq, Widget tnew, ArgList args, Cardinal * num);
-static void Destroy();
-static void Redisplay();
+static void Destroy(TextFieldWidget w);
+static void Redisplay(Widget aw, XExposeEvent * event, Region region);
static void Resize(Widget aw);
static Boolean SetValues(Widget current, Widget request, Widget reply,
ArgList args, Cardinal * nargs);
@@ -849,7 +849,8 @@
target, type,
/* 1997/02/14 et...@co...: Changed cast to `XPointer *' into a
cast to `char **' to allow compilation under X11R4. */
- (char **) & std_targets,
+ /* 2008/05/28 SRT: undone this cast. Any compile problems? */
+ /* (char **) */ & std_targets,
&std_length, format);
*value = XtMalloc((unsigned) sizeof(Atom) * (std_length + 1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-06-02 18:57:13
|
Revision: 18828
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18828&view=rev
Author: strik
Date: 2008-06-02 11:57:19 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
2008-06-01 Marco van den Heuvel <bla...@ya...>
* configure.in: Added extra defines needed for minix, alligned
the printout of configure and added the --enable-memmap
configure option for the memmap feature from VICEplus as
provided by Hannu Nuotio <han...@tu...>.
* build/qnx4/build.sh: Fixed the qnx 4.x build script.
2008-06-01 Marco van den Heuvel <bla...@ya...>
* intl2po.c: Fixed for the sco ports.
2008-06-01 Marco van den Heuvel <bla...@ya...>
* gfxoutputdrv/pngdrv.c, gfxoutputdrv/jpegdrv.c,
gfxoutputdrv/pcxdrv.c, gfxoutputdrv/ppmdrv.c,
gfxoutputdrv/iffdrv.c, gfxoutputdrv/ffmpegdrv.c,
gfxoutputdrv/gifdrv.c, gfxoutputdrv/bmpdrv.c, gfxoutput.h,
screenshot.c, screenshot.h, c64/c64mem.c, maincpu.c,
monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
monitor/montypes.h, monitor/monitor.c, monitor.h, 6510core.c:
Added the memmap feature from VICEplus as provided by Hannu
Nuotio <han...@tu...>.
* video/video-resources.c, arch/unix/x11/xaw/x11video.c:
Prototype before the actual function was static, so made the
function static too.
* network.c, arch/unix/x11/renderxv.c: Added some minix fixes.
* sounddrv/soundsun.c: Fixed some solaris related
warnings/issues.
* sounddrv/soundhpux.c: Fixes some hpux related warnings/issues.
* c64/patchrom.c, monitor/mon_assemblez80.c,
monitor/mon_assemble6502.c, resources.c, util.c, c1541.c,
sound.c, arch/unix/archdep.c, zfile.c: Added the inclusion of
the strings.h header if present.
* arch/unix/x11/gnome/uipalcontrol.c: Fixed a typo.
Modified Paths:
--------------
trunk/vice/build/qnx4/build.sh
trunk/vice/configure.in
trunk/vice/po/intl2po.c
trunk/vice/src/6510core.c
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/archdep.c
trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
trunk/vice/src/arch/unix/x11/renderxv.c
trunk/vice/src/arch/unix/x11/xaw/x11video.c
trunk/vice/src/c1541.c
trunk/vice/src/c64/c64mem.c
trunk/vice/src/c64/patchrom.c
trunk/vice/src/gfxoutput.h
trunk/vice/src/gfxoutputdrv/bmpdrv.c
trunk/vice/src/gfxoutputdrv/ffmpegdrv.c
trunk/vice/src/gfxoutputdrv/gifdrv.c
trunk/vice/src/gfxoutputdrv/iffdrv.c
trunk/vice/src/gfxoutputdrv/jpegdrv.c
trunk/vice/src/gfxoutputdrv/pcxdrv.c
trunk/vice/src/gfxoutputdrv/pngdrv.c
trunk/vice/src/gfxoutputdrv/ppmdrv.c
trunk/vice/src/maincpu.c
trunk/vice/src/monitor/mon_assemble6502.c
trunk/vice/src/monitor/mon_assemblez80.c
trunk/vice/src/monitor/mon_command.c
trunk/vice/src/monitor/mon_lex.c
trunk/vice/src/monitor/mon_lex.l
trunk/vice/src/monitor/mon_parse.c
trunk/vice/src/monitor/mon_parse.h
trunk/vice/src/monitor/mon_parse.y
trunk/vice/src/monitor/monitor.c
trunk/vice/src/monitor/montypes.h
trunk/vice/src/monitor.h
trunk/vice/src/network.c
trunk/vice/src/resources.c
trunk/vice/src/screenshot.c
trunk/vice/src/screenshot.h
trunk/vice/src/sound.c
trunk/vice/src/sounddrv/soundhpux.c
trunk/vice/src/sounddrv/soundsun.c
trunk/vice/src/util.c
trunk/vice/src/video/video-resources.c
trunk/vice/src/zfile.c
Modified: trunk/vice/build/qnx4/build.sh
===================================================================
--- trunk/vice/build/qnx4/build.sh 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/build/qnx4/build.sh 2008-06-02 18:57:19 UTC (rev 18828)
@@ -12,7 +12,9 @@
mv src/plus4/Makefile.in src/plus4/Makefile.in.orig
sed s/"-rm -f libplus4.a"/"-rm -f -r libplus4.a;cp plus4mem.o ..\/;mv plus4mem.c plus4mem2.c;echo >plus4mem.c;$\(CC\) -c -o plus4mem.o plus4mem.c;mv plus4mem2.c plus4mem.c"/ <src/plus4/Makefile.in.orig >src/plus4/Makefile.in
+mv src/monitor/Makefile.in src/monitor/Makefile.in.orig
+sed s/"-rm -f libmonitor.a"/"-rm -f -r libmonitor.a;cp monitor.o ..\/;mv monitor.c monitor2.c;echo >monitor.c;$\(CC\) -c -o monitor.o monitor.c;mv monitor2.c monitor.c"/ <src/monitor/Makefile.in.orig >src/monitor/Makefile.in
mv src/Makefile.in src/Makefile.in.orig
-sed s/"@XPLUS4_WINRES@"/"plus4mem.o"/ <src/Makefile.in.orig >src/Makefile.in
+sed -e s/"@X128_WINRES@"/"monitor.o"/ -e s/"@X64_WINRES@"/"monitor.o"/ -e s/"@XVIC_WINRES@"/"monitor.o"/ -e s/"@XPET_WINRES@"/"monitor.o"/ -e s/"@XPLUS4_WINRES@"/"plus4mem.o monitor.o"/ -e s/"@XCBM2_WINRES@"/"monitor.o"/ <src/Makefile.in.orig >src/Makefile.in
./configure -v --prefix=/usr/local cross_compiling=yes ac_cv_c_bigendian=no
make
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/configure.in 2008-06-02 18:57:19 UTC (rev 18828)
@@ -64,8 +64,8 @@
AC_ARG_WITH(oss, [ --without-oss do not use the OSS sound system])
AC_ARG_ENABLE(sdl, [ --with-sdl use sdl sound system])
AC_ARG_WITH(resid, [ --without-resid do not use the reSID engine])
-AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
-AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
+AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
+AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
AC_ARG_ENABLE(fullscreen, [ --enable-fullscreen enable XFree86 fullscreen detection], [ echo checking for XFree86 fullscreen requested...], [enable_fullscreen="no"; echo no explicit checking for XFree86 fullscreen requested, disabling fullscreen...])
AC_ARG_ENABLE(gnomeui,[ --enable-gnomeui enables gnome ui support])
AC_ARG_ENABLE(nls,[ --disable-nls disables national language support])
@@ -76,8 +76,13 @@
AC_ARG_ENABLE(parsid,[ --enable-parsid enables ParSID support])
AC_ARG_WITH(picasso96, [ --with-picasso96 use Amiga P96 grafix system instead of cgx])
AC_ARG_ENABLE(bundle, [ --disable-bundle do not use application bundles on Macs])
-AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_ENABLE(memmap, [ --enable-memmap enable the mem map feature])
+if test x"$enable_memmap" = "xyes"; then
+ AC_DEFINE(FEATURE_CPUMEMHISTORY,,[Use the memmap feature.])
+fi
+
if test x"$enable_gnomeui" = "xyes" ; then
AC_DEFINE(USE_GNOMEUI,,[Use GNOME UI.])
fi
@@ -119,6 +124,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
+ CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
fi
if test x"$host_os" = "xcygwin32" -o x"$host_os" = "xcygwin"; then
Modified: trunk/vice/po/intl2po.c
===================================================================
--- trunk/vice/po/intl2po.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/po/intl2po.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef _SCO_ELF
+#include <strings.h>
+#endif
+
/* status definitions */
#define SCANNING 0
#define STRINGTABLE_BEGIN_SCAN 1
Modified: trunk/vice/src/6510core.c
===================================================================
--- trunk/vice/src/6510core.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/6510core.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -1778,8 +1778,30 @@
#endif
#endif
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ memmap_state |= (MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
FETCH_OPCODE(opcode);
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ /* HACK to cope with FETCH_OPCODE optimization in x64 */
+ if (((int)reg_pc) < bank_limit) {
+ memmap_mem_read(reg_pc);
+ }
+
+ if(p0 == 0x20) {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(LOAD(reg_pc+2)));
+ } else {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(p2 >> 8));
+ }
+ memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
#ifdef DEBUG
#ifdef DRIVE_CPU
if (TRACEFLG) {
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/ChangeLog 2008-06-02 18:57:19 UTC (rev 18828)
@@ -1,3 +1,47 @@
+2008-06-01 Marco van den Heuvel <bla...@ya...>
+
+ * configure.in: Added extra defines needed for minix, alligned
+ the printout of configure and added the --enable-memmap
+ configure option for the memmap feature from VICEplus as
+ provided by Hannu Nuotio <han...@tu...>.
+
+ * build/qnx4/build.sh: Fixed the qnx 4.x build script.
+
+2008-06-01 Marco van den Heuvel <bla...@ya...>
+
+ * intl2po.c: Fixed for the sco ports.
+
+2008-06-01 Marco van den Heuvel <bla...@ya...>
+
+ * gfxoutputdrv/pngdrv.c, gfxoutputdrv/jpegdrv.c,
+ gfxoutputdrv/pcxdrv.c, gfxoutputdrv/ppmdrv.c,
+ gfxoutputdrv/iffdrv.c, gfxoutputdrv/ffmpegdrv.c,
+ gfxoutputdrv/gifdrv.c, gfxoutputdrv/bmpdrv.c, gfxoutput.h,
+ screenshot.c, screenshot.h, c64/c64mem.c, maincpu.c,
+ monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
+ monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
+ monitor/montypes.h, monitor/monitor.c, monitor.h, 6510core.c:
+ Added the memmap feature from VICEplus as provided by Hannu
+ Nuotio <han...@tu...>.
+
+ * video/video-resources.c, arch/unix/x11/xaw/x11video.c:
+ Prototype before the actual function was static, so made the
+ function static too.
+
+ * network.c, arch/unix/x11/renderxv.c: Added some minix fixes.
+
+ * sounddrv/soundsun.c: Fixed some solaris related
+ warnings/issues.
+
+ * sounddrv/soundhpux.c: Fixes some hpux related warnings/issues.
+
+ * c64/patchrom.c, monitor/mon_assemblez80.c,
+ monitor/mon_assemble6502.c, resources.c, util.c, c1541.c,
+ sound.c, arch/unix/archdep.c, zfile.c: Added the inclusion of
+ the strings.h header if present.
+
+ * arch/unix/x11/gnome/uipalcontrol.c: Fixed a typo.
+
2008-05-25 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.16.
Modified: trunk/vice/src/arch/unix/archdep.c
===================================================================
--- trunk/vice/src/arch/unix/archdep.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/arch/unix/archdep.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -44,6 +44,10 @@
#include <vfork.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "findpath.h"
#include "ioutil.h"
Modified: trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -68,7 +68,7 @@
static void pal_ctrl_reset (GtkWidget *w, gpointer data)
{
- unsigned int i
+ unsigned int i;
int tmp;
for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
Modified: trunk/vice/src/arch/unix/x11/renderxv.c
===================================================================
--- trunk/vice/src/arch/unix/x11/renderxv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/arch/unix/x11/renderxv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -41,6 +41,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef __minix
+#include <stdlib.h>
+#endif
+
#if defined(__QNX__) || defined(MINIX_SUPPORT)
Status XShmAttach(Display *display, XShmSegmentInfo *shminfo)
{
Modified: trunk/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- trunk/vice/src/arch/unix/x11/xaw/x11video.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/arch/unix/x11/xaw/x11video.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -631,7 +631,7 @@
return 0;
}
-GC video_get_gc(XGCValues *gc_values)
+static GC video_get_gc(XGCValues *gc_values)
{
Display *display;
@@ -824,7 +824,7 @@
/* ------------------------------------------------------------------------- */
-void video_refresh_func(void (*rfunc)(void))
+static void video_refresh_func(void (*rfunc)(void))
{
_refresh_func = rfunc;
}
Modified: trunk/vice/src/c1541.c
===================================================================
--- trunk/vice/src/c1541.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/c1541.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -54,6 +54,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "cbmdos.h"
#include "cbmimage.h"
Modified: trunk/vice/src/c64/c64mem.c
===================================================================
--- trunk/vice/src/c64/c64mem.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/c64/c64mem.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -218,7 +218,12 @@
BYTE REGPARM1 zero_read(WORD addr)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ if(!(memmap_state & MEMMAP_STATE_IGNORE)) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ }
+#endif
switch ((BYTE)addr) {
case 0:
return pport.dir_read;
@@ -242,7 +247,9 @@
void REGPARM2 zero_store(WORD addr, BYTE value)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+#endif
switch ((BYTE)addr) {
case 0:
if (vbank == 0) {
Modified: trunk/vice/src/c64/patchrom.c
===================================================================
--- trunk/vice/src/c64/patchrom.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/c64/patchrom.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -35,6 +35,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "log.h"
#include "c64memrom.h"
#include "patchrom.h"
Modified: trunk/vice/src/gfxoutput.h
===================================================================
--- trunk/vice/src/gfxoutput.h 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutput.h 2008-06-02 18:57:19 UTC (rev 18828)
@@ -27,6 +27,8 @@
#ifndef _GFXOUTPUT_H
#define _GFXOUTPUT_H
+#include "types.h"
+
struct screenshot_s;
typedef struct gfxoutputdrv_s {
@@ -38,6 +40,9 @@
int (*write)(struct screenshot_s *);
int (*save)(struct screenshot_s *, const char *);
int (*record)(struct screenshot_s *);
+#ifdef FEATURE_CPUMEMHISTORY
+ int (*savememmap)(const char *, int, int, BYTE *, BYTE *);
+#endif
} gfxoutputdrv_t;
/* Functions called by external emulator code. */
Modified: trunk/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -348,6 +348,154 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *bmpdrv_memmap_fd;
+static char *bmpdrv_memmap_ext_filename;
+static BYTE *bmpdrv_memmap_bmp_data;
+
+static int bmpdrv_close_memmap(int x_size, int y_size)
+{
+ fwrite(bmpdrv_memmap_bmp_data, y_size * x_size, 1, bmpdrv_memmap_fd);
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ lib_free(bmpdrv_memmap_bmp_data);
+ return 0;
+}
+
+static DWORD bmpdrv_memmap_bmp_size(int x_size, int y_size)
+{
+ DWORD size = 0;
+
+ size = (DWORD)((14 + 40 + 4 * 256) + (x_size * y_size));
+
+ return size;
+}
+
+static int bmpdrv_memmap_write_bitmap_info(int x_size, int y_size, BYTE *palette)
+{
+ BYTE binfo[40];
+ BYTE *bcolor;
+ unsigned int i;
+
+ memset(binfo, 0, sizeof(binfo));
+
+ util_dword_to_le_buf(&binfo[0], sizeof(binfo));
+ util_dword_to_le_buf(&binfo[4], x_size);
+ util_dword_to_le_buf(&binfo[8], y_size);
+
+ binfo[12] = 1;
+ binfo[13] = 0;
+
+ binfo[14] = 8;
+ binfo[15] = 0;
+
+ util_dword_to_le_buf(&binfo[16], 0); /* BI_RGB */
+ util_dword_to_le_buf(&binfo[20], 0);
+
+ /* DPI in Pixels per Meter*/
+ util_dword_to_le_buf(&binfo[24], 0 * 10000 / 254);
+ util_dword_to_le_buf(&binfo[28], 0 * 10000 / 254);
+
+ util_dword_to_le_buf(&binfo[32], 256);
+ util_dword_to_le_buf(&binfo[36], 256);
+
+ if (fwrite(binfo, sizeof(binfo), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ bcolor = (BYTE *)lib_malloc(256 * 4);
+
+ for (i = 0; i < 256; i++)
+ {
+ bcolor[i * 4] = palette[(i*3)+2];
+ bcolor[i * 4 + 1] = palette[(i*3)+1];
+ bcolor[i * 4 + 2] = palette[(i*3)];
+ bcolor[i * 4 + 3] = 0;
+ }
+
+ if (fwrite(bcolor, 256 * 4, 1, bmpdrv_memmap_fd) < 1)
+ {
+ lib_free(bcolor);
+ return -1;
+ }
+
+ lib_free(bcolor);
+ return 0;
+}
+
+static int bmpdrv_memmap_write_file_header(int x_size, int y_size)
+{
+ BYTE header[14];
+
+ memset(header, 0, sizeof(header));
+
+ header[0] = 'B';
+ header[1] = 'M';
+
+ util_dword_to_le_buf(&header[2], bmpdrv_memmap_bmp_size(x_size, y_size));
+
+ util_dword_to_le_buf(&header[10], (14 + 40 + 4 * 256));
+
+ if (fwrite(header, sizeof(header), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ return 0;
+}
+
+static int bmpdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ bmpdrv_memmap_ext_filename = util_add_extension_const(filename, bmp_drv.default_extension);
+
+ bmpdrv_memmap_fd = fopen(bmpdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (bmpdrv_memmap_fd == NULL)
+ {
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_file_header(x_size, y_size) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_bitmap_info(x_size, y_size, palette) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ bmpdrv_memmap_bmp_data = (BYTE *)lib_malloc(x_size*y_size);
+
+ return 0;
+}
+
+static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+{
+ memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
+}
+
+static int bmpdrv_memmap_save(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (bmpdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line=0; line<y_size; line++)
+ {
+ bmpdrv_write_memmap(line, x_size, y_size, gfx);
+ }
+
+ if (bmpdrv_close_memmap(x_size, y_size) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t bmp_drv =
{
"BMP",
@@ -357,7 +505,12 @@
bmpdrv_close,
bmpdrv_write,
bmpdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ bmpdrv_memmap_save
+#else
NULL
+#endif
};
void gfxoutput_init_bmp(void)
Modified: trunk/vice/src/gfxoutputdrv/ffmpegdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -802,7 +802,12 @@
ffmpegdrv_close,
ffmpegdrv_write,
ffmpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ ffmpegdrv_record,
+ NULL
+#else
ffmpegdrv_record
+#endif
},
/*
{
@@ -836,7 +841,11 @@
ffmpegdrv_record
},
*/
- { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+#endi
+ NULL }
};
void gfxoutput_init_ffmpeg(void)
Modified: trunk/vice/src/gfxoutputdrv/gifdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/gifdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/gifdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -161,6 +161,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static GifFileType *gifdrv_memmap_fd;
+static char *gifdrv_memmap_ext_filename;
+
+static int gifdrv_close_memmap(void)
+{
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int gifdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ if (EGifPutLine(gifdrv_memmap_fd, gfx+(line*x_size), x_size)==GIF_ERROR)
+ return -1;
+
+ return 0;
+}
+
+static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ unsigned int i;
+ GifColorType ColorMap256[256];
+
+ gifdrv_memmap_ext_filename=util_add_extension_const(filename, gif_drv.default_extension);
+
+ gifdrv_memmap_fd=EGifOpenFileName(gifdrv_memmap_ext_filename, FALSE);
+
+ if (gifdrv_memmap_fd==NULL)
+ {
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ gif_colors=MakeMapObject(256, ColorMap256);
+
+ for (i = 0; i < 256; i++)
+ {
+ gif_colors->Colors[i].Blue=palette[(i*3)+2];
+ gif_colors->Colors[i].Green=palette[(i*3)+1];
+ gif_colors->Colors[i].Red=palette[i*3];
+ }
+
+ EGifSetGifVersion("87a");
+
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, FALSE, NULL) == GIF_ERROR)
+ {
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int gifdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (gifdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ gifdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (gifdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t gif_drv =
{
"GIF",
@@ -170,7 +248,12 @@
gifdrv_close,
gifdrv_write,
gifdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ gifdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_gif(void)
Modified: trunk/vice/src/gfxoutputdrv/iffdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/iffdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/iffdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -225,6 +225,136 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *iffdrv_memmap_fd;
+static char *iffdrv_memmap_ext_filename;
+static BYTE *iffdrv_memmap_iff_data;
+static int iffdrv_memmap_iff_rowbytes;
+
+static int iffdrv_close_memmap(void)
+{
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_iff_data);
+ lib_free(iffdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int iffdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ int j;
+
+ for (j = 0; j<8; j++)
+ {
+ iff_c2p(gfx+(x_size*line), iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, j);
+ if (fwrite(iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, 1, iffdrv_memmap_fd)<1)
+ return -1;
+ }
+ return 0;
+}
+
+static int iffdrv_write_file_header_memmap(int x_size, int y_size, BYTE *palette)
+{
+ BYTE header[836];
+ int i;
+ int totalsize;
+
+ memset(header, 0, sizeof(header));
+
+ iffdrv_memmap_iff_rowbytes=((x_size+15)>>4)<<1;
+
+ totalsize=828+(iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ header[0]='F';
+ header[1]='O';
+ header[2]='R';
+ header[3]='M';
+ util_dword_to_be_buf(&header[4], totalsize);
+ header[8]='I';
+ header[9]='L';
+ header[10]='B';
+ header[11]='M';
+ header[12]='B';
+ header[13]='M';
+ header[14]='H';
+ header[15]='D';
+ util_dword_to_be_buf(&header[16], 20);
+ util_word_to_be_buf(&header[20],(WORD)(x_size));
+ util_word_to_be_buf(&header[22],(WORD)(y_size));
+ header[28]=8;
+ util_word_to_be_buf(&header[36],(WORD)(x_size));
+ util_word_to_be_buf(&header[38],(WORD)(y_size));
+ header[40]='C';
+ header[41]='M';
+ header[42]='A';
+ header[43]='P';
+ util_dword_to_be_buf(&header[44],3*256);
+
+ for (i = 0; i < 256; i++)
+ {
+ header[48+(i*3)]=palette[i*3];
+ header[49+(i*3)]=palette[(i*3)+1];
+ header[50+(i*3)]=palette[(i*3)+2];
+ }
+ header[816]='C';
+ header[817]='A';
+ header[818]='M';
+ header[819]='G';
+ util_dword_to_be_buf(&header[820],4);
+ header[828]='B';
+ header[829]='O';
+ header[830]='D';
+ header[831]='Y';
+ util_dword_to_be_buf(&header[832],iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ if (fwrite(header,836,1,iffdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int iffdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ iffdrv_memmap_ext_filename=util_add_extension_const(filename, iff_drv.default_extension);
+ iffdrv_memmap_fd = fopen(iffdrv_memmap_ext_filename, "wb");
+
+ if (iffdrv_memmap_fd==NULL)
+ {
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (iffdrv_write_file_header_memmap(x_size, y_size, palette)<0)
+ {
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ iffdrv_memmap_iff_data = (BYTE *)lib_malloc(iffdrv_memmap_iff_rowbytes);
+
+ return 0;
+}
+
+static int iffdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (iffdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ iffdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (iffdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t iff_drv =
{
"IFF",
@@ -234,7 +364,12 @@
iffdrv_close,
iffdrv_write,
iffdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ iffdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_iff(void)
Modified: trunk/vice/src/gfxoutputdrv/jpegdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -135,6 +135,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *jpegdrv_memmap_fd;
+static char *jpegdrv_memmap_ext_filename;
+static BYTE *jpegdrv_memmap_data;
+
+static int jpegdrv_close_memmap(void)
+{
+ jpeg_finish_compress(&cinfo);
+ fclose(jpegdrv_memmap_fd);
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_data);
+ lib_free(jpegdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int jpegdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+ JSAMPROW rowpointer[1];
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ jpegdrv_memmap_data[i*3]=palette[pixval*3];
+ jpegdrv_memmap_data[(i*3)+1]=palette[(pixval*3)+1];
+ jpegdrv_memmap_data[(i*3)+2]=palette[(pixval*3)+2];
+ }
+ rowpointer[0]=jpegdrv_memmap_data;
+ jpeg_write_scanlines(&cinfo, rowpointer, 1);
+
+ return 0;
+}
+
+static int jpegdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_compress(&cinfo);
+ jpegdrv_memmap_ext_filename=util_add_extension_const(filename, jpeg_drv.default_extension);
+ jpegdrv_memmap_fd = fopen(jpegdrv_memmap_ext_filename, "wb");
+ if (jpegdrv_memmap_fd==NULL)
+ {
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_ext_filename);
+ return -1;
+ }
+ jpeg_stdio_dest(&cinfo, jpegdrv_memmap_fd);
+ jpegdrv_memmap_data = (BYTE *)lib_malloc(x_size*3);
+ cinfo.image_width = x_size;
+ cinfo.image_height = y_size;
+ cinfo.input_components = 3;
+ cinfo.in_color_space = JCS_RGB;
+ jpeg_set_defaults(&cinfo);
+ jpeg_start_compress(&cinfo, TRUE);
+
+ return 0;
+}
+
+static int jpegdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (jpegdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ jpegdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (jpegdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t jpeg_drv =
{
"JPEG",
@@ -144,7 +222,12 @@
jpegdrv_close,
jpegdrv_write,
jpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ jpegdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_jpeg(void)
Modified: trunk/vice/src/gfxoutputdrv/pcxdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -256,6 +256,180 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pcxdrv_memmap_fd;
+static char *pcxdrv_memmap_ext_filename;
+static BYTE *pcxdrv_memmap_pcx_data;
+
+static int pcxdrv_close_memmap(BYTE *palette)
+{
+ BYTE pcx_color_prefix[2]="\x0c";
+
+ fwrite(pcx_color_prefix, 1, 1, pcxdrv_memmap_fd);
+
+ fwrite(palette, 3*256, 1, pcxdrv_memmap_fd);
+
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_pcx_data);
+ lib_free(pcxdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pcxdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ BYTE color,amount;
+ unsigned int i,j=0;
+
+ color=gfx[(line*x_size)];
+ amount=1;
+ for (i = 1; i<x_size; i++)
+ {
+ if (gfx[(line*x_size)+i]==color)
+ {
+ amount=amount+1;
+ if (amount==63)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xff;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ amount=0;
+ }
+ }
+ else
+ {
+ if (amount==0)
+ {
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ }
+ }
+ }
+ if (amount==1)
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ }
+
+ if (fwrite(pcxdrv_memmap_pcx_data, j, 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ BYTE header[128];
+
+ memset(header, 0, sizeof(header));
+
+ header[0]=0xa;
+ header[1]=5;
+ header[2]=1;
+ header[3]=8;
+
+ util_word_to_le_buf(&header[8], (WORD)(x_size-1));
+ util_word_to_le_buf(&header[10], (WORD)(y_size-1));
+
+ util_word_to_le_buf(&header[12], (WORD)(0));
+ util_word_to_le_buf(&header[14], (WORD)(0));
+
+ header[65]=1;
+ util_word_to_le_buf(&header[66], (WORD)(x_size));
+
+ if (fwrite(header, sizeof(header), 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ pcxdrv_memmap_ext_filename=util_add_extension_const(filename, pcx_drv.default_extension);
+ pcxdrv_memmap_fd = fopen(pcxdrv_memmap_ext_filename, "wb");
+
+ if (pcxdrv_memmap_fd==NULL)
+ {
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (pcxdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pcxdrv_memmap_pcx_data = (BYTE *)lib_malloc(x_size*2);
+
+ return 0;
+}
+
+static int pcxdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pcxdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pcxdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (pcxdrv_close_memmap(palette) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t pcx_drv =
{
"PCX",
@@ -265,7 +439,12 @@
pcxdrv_close,
pcxdrv_write,
pcxdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pcxdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_pcx(void)
Modified: trunk/vice/src/gfxoutputdrv/pngdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/pngdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/pngdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -161,6 +161,114 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pngdrv_memmap_fd;
+static char *pngdrv_memmap_ext_filename;
+static png_structp pngdrv_memmap_png_ptr;
+static png_infop pngdrv_memmap_info_ptr;
+static BYTE *pngdrv_memmap_png_data;
+
+static int pngdrv_close_memmap(void)
+{
+ png_write_end(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+
+ fclose(pngdrv_memmap_fd);
+ lib_free(pngdrv_memmap_png_data);
+ lib_free(pngdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pngdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ pngdrv_memmap_png_data[i*4] = palette[pixval*3];
+ pngdrv_memmap_png_data[(i*4)+1] = palette[(pixval*3)+1];
+ pngdrv_memmap_png_data[(i*4)+2] = palette[(pixval*3)+2];
+ pngdrv_memmap_png_data[(i*4)+3] = 0;
+ }
+
+ png_write_row(pngdrv_memmap_png_ptr, (png_bytep)(pngdrv_memmap_png_data));
+
+ return 0;
+}
+
+static int pngdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ pngdrv_memmap_png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (void *)NULL, NULL, NULL);
+
+ if (pngdrv_memmap_png_ptr == NULL)
+ return -1;
+
+ pngdrv_memmap_info_ptr = png_create_info_struct(pngdrv_memmap_png_ptr);
+
+ if (pngdrv_memmap_info_ptr == NULL)
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(pngdrv_memmap_png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+ return -1;
+ }
+
+ pngdrv_memmap_ext_filename = util_add_extension_const(filename, png_drv.default_extension);
+
+ pngdrv_memmap_fd = fopen(pngdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (pngdrv_memmap_fd == NULL)
+ {
+ lib_free(pngdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pngdrv_memmap_png_data = (BYTE *)lib_malloc(x_size * 4);
+
+ png_init_io(pngdrv_memmap_png_ptr, pngdrv_memmap_fd);
+ png_set_compression_level(pngdrv_memmap_png_ptr, Z_BEST_COMPRESSION);
+
+ pngdrv_memmap_info_ptr->width = x_size;
+ pngdrv_memmap_info_ptr->height= y_size;
+ pngdrv_memmap_info_ptr->bit_depth = 8;
+ pngdrv_memmap_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+
+ png_write_info(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+ png_set_invert_alpha(pngdrv_memmap_png_ptr);
+#endif
+
+ return 0;
+}
+
+static int pngdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pngdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pngdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (pngdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t png_drv =
{
"PNG",
@@ -170,7 +278,12 @@
pngdrv_close,
pngdrv_write,
pngdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pngdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_png(void)
Modified: trunk/vice/src/gfxoutputdrv/ppmdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -151,6 +151,86 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *ppmdrv_memmap_fd;
+static char *ppmdrv_memmap_ext_filename;
+
+static int ppmdrv_close_memmap(void)
+{
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int ppmdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ unsigned int i;
+ BYTE pixval;
+
+ for (i = 0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ if (fprintf(ppmdrv_memmap_fd, "%3d %3d %3d\x0a",palette[pixval*3],palette[(pixval*3)+1],palette[(pixval*3)+2])<0)
+ return -1;
+ }
+ return 0;
+}
+
+static int ppmdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ if (fprintf(ppmdrv_memmap_fd,"P3\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"# VICEplus generated PPM mem map grafix\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"%d %d\x0a",x_size,y_size)<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"255\x0a")<0)
+ return -1;
+
+ return 0;
+}
+
+static int ppmdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ ppmdrv_memmap_ext_filename=util_add_extension_const(filename, ppm_drv.default_extension);
+ ppmdrv_memmap_fd = fopen(ppmdrv_memmap_ext_filename, "wb");
+
+ if (ppmdrv_memmap_fd==NULL)
+ {
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (ppmdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int ppmdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (ppmdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ ppmdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (ppmdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t ppm_drv =
{
"PPM",
@@ -160,7 +240,12 @@
ppmdrv_close,
ppmdrv_write,
ppmdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ ppmdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_ppm(void)
Modified: trunk/vice/src/maincpu.c
===================================================================
--- trunk/vice/src/maincpu.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/maincpu.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -74,24 +74,76 @@
/* ------------------------------------------------------------------------- */
+#ifndef STORE_ZERO
+#define STORE_ZERO(addr, value) \
+ zero_store((WORD)(addr), (BYTE)(value))
+#endif
+
+#ifndef LOAD_ZERO
+#define LOAD_ZERO(addr) \
+ zero_read((WORD)(addr))
+#endif
+
+#ifdef FEATURE_CPUMEMHISTORY
+
+/* HACK this is C64 specific */
+
+void REGPARM2 memmap_mem_store(WORD addr, BYTE value)
+{
+ if((addr >= 0xd000)&&(addr <= 0xdfff)) {
+ monitor_memmap_store(addr, MEMMAP_I_O_W);
+ } else {
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+ }
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value));
+}
+
+BYTE REGPARM1 memmap_mem_read(WORD addr)
+{
+ switch(addr >> 12) {
+ case 0xa:
+ case 0xb:
+ case 0xe:
+ case 0xf:
+ memmap_state |= MEMMAP_STATE_IGNORE;
+ if(LOAD_ZERO(1) & (1 << ((addr>>14) & 1))) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_ROM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_ROM_R);
+ } else {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ }
+ memmap_state &= ~(MEMMAP_STATE_IGNORE);
+ break;
+ case 0xd:
+ monitor_memmap_store(addr, MEMMAP_I_O_R);
+ break;
+ default:
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ break;
+ }
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ return (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr));
+}
+
#ifndef STORE
#define STORE(addr, value) \
- (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
+ memmap_mem_store(addr, value)
#endif
#ifndef LOAD
#define LOAD(addr) \
- (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
+ memmap_mem_read(addr)
#endif
-#ifndef STORE_ZERO
-#define STORE_ZERO(addr, value) \
- zero_store((WORD)(addr), (BYTE)(value))
+#endif /* FEATURE_CPUMEMHISTORY */
+
+#ifndef STORE
+#define STORE(addr, value) \
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
#endif
-#ifndef LOAD_ZERO
-#define LOAD_ZERO(addr) \
- zero_read((WORD)(addr))
+#ifndef LOAD
+#define LOAD(addr) \
+ (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
#endif
#define LOAD_ADDR(addr) \
Modified: trunk/vice/src/monitor/mon_assemble6502.c
===================================================================
--- trunk/vice/src/monitor/mon_assemble6502.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/monitor/mon_assemble6502.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -30,6 +30,10 @@
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: trunk/vice/src/monitor/mon_assemblez80.c
===================================================================
--- trunk/vice/src/monitor/mon_assemblez80.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/monitor/mon_assemblez80.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -29,6 +29,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: trunk/vice/src/monitor/mon_command.c
===================================================================
--- trunk/vice/src/monitor/mon_command.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/monitor/mon_command.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -31,6 +31,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "mon_command.h"
#include "montypes.h"
#include "mon_parse.h" /* FIXME ! */
@@ -67,6 +71,10 @@
"<type>",
"Specify the type of CPU currently used (6502/z80)." },
+ { "cpuhistory", "chis",
+ "[<count>]",
+ "Show <count> last executed commands." },
+
{ "dump", "",
"\"<filename>\"",
"Write a snapshot of the machine into the file specified.\n"
@@ -221,6 +229,22 @@
"is specified, only one character is displayed. If no addresses are\n"
"given, the ``dot'' address is used." },
+ { "memmapsave", "mmsave",
+ "\"<filename>\" <format>",
+ "Save the memmap as a picture. Format is:\n"
+ "0 = BMP, 1 = PCX, 2 = PNG, 3 = GIF, 4 = IFF." },
+
+ { "memmapshow", "mmsh",
+ "[<mask>] [<address_opt_range>]",
+ "Show the memmap. The mask can be specified to show only those\n"
+ "locations with accesses of certain type(s). The mask is a number\n"
+ "with the bits \"ioRWXrwx\", where RWX are for ROM and rwx for RAM.\n"
+ "Optionally, an address range can be specified." },
+
+ { "memmapzap", "mmzap",
+ NULL,
+ "Clear the memmap." },
+
{ "memsprite", "ms",
"[<data_type>] [<address_opt_range>]",
"Display the contents of memory as sprite data. If only one address is\n"
Modified: trunk/vice/src/monitor/mon_lex.c
===================================================================
--- trunk/vice/src/monitor/mon_lex.c 2008-06-01 19:42:21 UTC (rev 18827)
+++ trunk/vice/src/monitor/mon_lex.c 2008-06-02 18:57:19 UTC (rev 18828)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 169
-#define YY_END_OF_BUFFER 170
+#define YY_NUM_RULES 173
+#define YY_END_OF_BUFFER 174
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,116 +372,119 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[955] =
+static yyconst flex_int16_t yy_acclist[987] =
{ 0,
- 96, 159, 96, 159, 96, 96, 96, 96, 81, 96,
- 81, 96, 96, 96, 96, 159, 96, 159, 96, 159,
- 96, 159, 96, 159, 96, 159, 96, 159, 96, 159,
- 96, 99, 96, 99, 95, 96, 95, 96, 170, 168,
- 169, 96, 169, 97, 168, 169, 79, 168, 169, 168,
- 169, 168, 169, 168, 169, 168, 169, 166, 168, 169,
- 168, 169, 159, 161, 164, 168, 169, 156, 159, 161,
- 164, 168, 169, 161, 164, 168, 169, 161, 164, 168,
- 169, 72, 168, 169, 165, 168, 169, 164, 168, 169,
- 88, 164, 168, 169, 164, 168, 169, 86, 164, 168,
+ 100, 163, 100, 163, 100, 100, 100, 100, 85, 100,
+ 85, 100, 100, 100, 100, 163, 100, 163, 100, 163,
+ 100, 163, 100, 163, 100, 163, 100, 163, 100, 163,
+ 100, 103, 100, 103, 99, 100, 99, 100, 174, 172,
+ 173, 100, 173, 101, 172, 173, 83, 172, 173, 172,
+ 173, 172, 173, 172, 173, 172, 173, 170, 172, 173,
+ 172, 173, 163, 165, 168, 172, 173, 160, 163, 165,
+ 168, 172, 173, 165, 168, 172, 173, 165, 168, 172,
+ 173, 76, 172, 173, 169, 172, 173, 168, 172, 173,
+ 92, 168, 172, 173, 168, 172, 173, 90, 168, 172,
- 169, 87, 168, 169, 89, 168, 169, 168, 169, 168,
- 169, 168, 169, 89, 168, 169, 168, 169, 168, 169,
- 168, 169, 168, 169, 2, 168, 169, 32, 168, 169,
- 3, 168, 169, 71, 168, 169, 4, 71, 168, 169,
- 71, 168, 169, 17, 71, 168, 169, 21, 71, 168,
- 169, 71, 168, 169, 30, 71, 168, 169, 31, 71,
- 168, 169, 33, 71, 168, 169, 34, 71, 168, 169,
- 71, 168, 169, 39, 71, 168, 169, 41, 71, 168,
- 169, 45, 71, 168, 169, 47, 71, 168, 169, 71,
- 168, 169, 52, 71, 168, 169, 57, 71, 168, 169,
+ 173, 91, 172, 173, 93, 172, 173, 172, 173, 172,
+ 173, 172, 173, 93, 172, 173, 172, 173, 172, 173,
+ 172, 173, 172, 173, 2, 172, 173, 33, 172, 173,
+ 3, 172, 173, 75, 172, 173, 4, 75, 172, 173,
+ 75, 172, 173, 17, 75, 172, 173, 22, 75, 172,
+ 173, 75, 172, 173, 31, 75, 172, 173, 32, 75,
+ 172, 173, 34, 75, 172, 173, 35, 75, 172, 173,
+ 75, 172, 173, 40, 75, 172, 173, 42, 75, 172,
+ 173, 49, 75, 172, 173, 51, 75, 172, 173, 75,
+ 172, 173, 56, 75, 172, 173, 61, 75, 172, 173,
- 43, 71, 168, 169, 71, 168, 169, 69, 71, 168,
- 169, 29, 71, 168, 169, 71, 168, 169, 63, 71,
- 168, 169, 1, 168, 169, 81, 168, 169, 81, 96,
- 169, 80, 168, 169, 81, 166, 168, 169, 81, 165,
- 168, 169, 100, 168, 169, 100, 166, 168, 169, 100,
- 165, 168, 169, 153, 168, 169, 151, 168, 169, 152,
- 168, 169, 168, 169, 156, 159, 161, 164, 168, 169,
- 161, 164, 168, 169, 154, 168, 169, 164, 168, 169,
- 16526, 143, 164, 168, 169, 144, 164, 168, 169, 145,
- 164, 168, 169, 146, 164, 168, 169, 164, 168, 169,
+ 47, 75, 172, 173, 75, 172, 173, 73, 75, 172,
+ 173, 30, 75, 172, 173, 75, 172, 173, 67, 75,
+ 172, 173, 1, 172, 173, 85, 172, 173, 85, 100,
+ 173, 84, 172, 173, 85, 170, 172, 173, 85, 169,
+ 172, 173, 104, 172, 173, 104, 170, 172, 173, 104,
+ 169, 172, 173, 157, 172, 173, 155, 172, 173, 156,
+ 172, 173, 172, 173, 160, 163, 165, 168, 172, 173,
+ 165, 168, 172, 173, 158, 172, 173, 168, 172, 173,
+ 16530, 147, 168, 172, 173, 148, 168, 172, 173, 149,
+ 168, 172, 173, 150, 168, 172, 173, 168, 172, 173,
- 168, 169, 147, 168, 169, 168, 169, 148, 168, 169,
- 149, 168, 169, 150, 168, 169, 164, 168, 169,16526,
- 143, 164, 168, 169, 145, 164, 168, 169, 147, 168,
- 169, 168, 169, 149, 168, 169, 168, 169, 168, 169,
- 119, 168, 169, 120, 168, 169, 168, 169, 109, 168,
- 169, 165, 168, 169, 110, 168, 169, 168, 169, 101,
- 164, 168, 169, 168, 169, 168, 169, 102, 168, 169,
- 103, 168, 169, 102, 168, 169, 168, 169, 99, 168,
- 169, 99, 168, 169, 99, 168, 169, 99, 168, 169,
- 99, 168, 169, 95, 168, 169, 96, 163, 157, 158,
+ 172, 173, 151, 172, 173, 172, 173, 152, 172, 173,
+ 153, 172, 173, 154, 172, 173, 168, 172, 173,16530,
+ 147, 168, 172, 173, 149, 168, 172, 173, 151, 172,
+ 173, 172, 173, 153, 172, 173, 172, 173, 172, 173,
+ 123, 172, 173, 124, 172, 173, 172, 173, 113, 172,
+ 173, 169, 172, 173, 114, 172, 173, 172, 173, 105,
+ 168, 172, 173, 172, 173, 172, 173, 106, 172, 173,
+ 107, 172, 173, 106, 172, 173, 172, 173, 103, 172,
+ 173, 103, 172, 173, 103, 172, 173, 103, 172, 173,
+ 103, 172, 173, 99, 172, 173, 100, 167, 161, 162,
- 160, 82, 84, 85, 83, 141, 140, 141, 159, 161,
- 164, 161, 164, 164, 156, 159, 161, 164, 156, 159,
- 161, 164, 91, 92, 90, 162, 78, 73, 71, 71,
- 5, 71, 71, 71, 8, 71, 9, 71, 11, 71,
- 12, 71, 13, 71, 71, 15, 71, 71, 71, 71,
- 71, 23, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 35, 71, 37, 71, 71, 40, 71, 71, 20,
- 71, 42, 71, 71, 71, 44, 71, 71, 46, 71,
- 71, 71, 71, 71, 71, 71, 71, 59, 71, 71,
- 71, 71, 58, 71, 71, 71, 66, 71, 67, 71,
+ 164, 86, 88, 89, 87, 145, 144, 145, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 160, 163,
+ 165, 168, 95, 96, 94, 166, 82, 77, 75, 75,
+ 5, 75, 75, 75, 8, 75, 9, 75, 11, 75,
+ 12, 75, 13, 75, 75, 15, 75, 75, 75, 75,
+ 75, 75, 24, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 36, 75, 38, 75, 75, 41, 75, 75,
+ 21, 75, 43, 75, 75, 75, 75, 48, 75, 75,
+ 50, 75, 75, 75, 75, 75, 75, 75, 75, 63,
+ 75, 75, 75, 75, 62, 75, 75, 75, 70, 75,
- 71, 71, 81, 81, 96, 100, 156, 159, 161, 164,
- 8334, 139, 164, 129, 139, 164, 139, 130, 139, 164,
- 131, 139, 164, 132, 139, 133, 139, 136, 139, 139,
- 162, 133, 139, 136, 139, 107, 112, 114, 115, 116,
- 108, 106, 111, 113, 104, 105, 167, 99, 99, 99,
- 95, 141, 140, 141, 159, 161, 164, 161, 164, 164,
- 156, 159, 161, 164, 93, 94, 74, 98, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 19, 71,
- 22, 71, 71, 24, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 41, 71, 71, 71,
+ 71, 75, 75, 75, 85, 85, 100, 104, 160, 163,
+ 165, 168, 8338, 143, 168, 133, 143, 168, 143, 134,
+ 143, 168, 135, 143, 168, 136, 143, 137, 143, 140,
+ 143, 143, 166, 137, 143, 140, 143, 111, 116, 118,
+ 119, 120, 112, 110, 115, 117, 108, 109, 171, 103,
+ 103, 103, 99, 145, 144, 145, 163, 165, 168, 165,
+ 168, 168, 160, 163, 165, 168, 97, 98, 78, 102,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 19, 75, 23, 75, 75, 25, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 42,
- 71, 71, 48, 71, 71, 50, 71, 51, 71, 71,
- 71, 56, 71, 71, 71, 62, 71, 61, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 139,
- 164, 139, 134, 139, 135, 139, 137, 139, 138, 139,
- 117, 118, 159, 161, 164, 161, 164, 164, 156, 159,
- 161, 164, 76, 71, 71, 71, 7, 71, 71, 71,
- 71, 71, 71, 71, 71, 18, 71, 71, 71, 71,
- 71, 27, 71, 71, 29, 71, 30, 71, 31, 71,
- 32, 71, 33, 71, 71, 71, 39, 71, 71, 71,
- 43, 71, 45, 71, 71, 71, 49, 71, 71, 71,
+ 75, 75, 75, 75, 75, 75, 75, 52, 75, 75,
+ 54, 75, 55, 75, 75, 75, 60, 75, 75, 75,
+ 66, 75, 65, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 143, 168, 143, 138, 143, 139,
+ 143, 141, 143, 142, 143, 121, 122, 163, 165, 168,
+ 165, 168, 168, 160, 163, 165, 168, 80, 75, 75,
+ 75, 7, 75, 75, 75, 75, 75, 75, 20, 75,
+ 75, 75, 18, 75, 75, 75, 75, 75, 75, 28,
+ 75, 75, 30, 75, 31, 75, 32, 75, 33, 75,
+ 34, 75, 75, 75, 40, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 57, 71, 71, 71,
- 71, 71, 63, 71, 64, 71, 71, 71, 71, 71,
- 71, 71, 139, 164, 139, 159, 161, 164, 161, 164,
- 164, 156, 159, 161, 164, 77, 71, 71, 71, 8,
- 71, 71, 10, 71, 11, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 47, 71, 50, 71, 71, 71, 53, 71,
- 71, 71, 71, 71, 71, 71, 60, 71, 71, 71,
- 71, 66, 71, 71, 67, 71, 69, 71, 71, 125,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
+ 45, 75, 75, 47, 75, 49, 75, 75, 75, 53,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 61,
+ 75, 75, 75, 75, 75, 67, 75, 68, 75, 75,
+ 75, 75, 75, 75, 75, 143, 168, 143, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 81, 75,
+ 75, 75, 8, 75, 75, 10, 75, 11, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 46, 75, 75,
+ 51, 75, 54, 75, 75, 75, 57, 75, 75, 75,
+ 75, 75, 75, 75, 64, 75, 75, 75, 75, 70,
- 75, 71, 6, 71, 71, 71, 71, 71, 71, 71,
- 22, 71, 25, 71, 24, 71, 71, 21, 71, 28,
- 71, 36, 71, 38, 71, 71, 71, 71, 71, 51,
- 71, 71, 54, 71, 71, 55, 71, 56, 71, 71,
- 59, 71, 71, 71, 68, 71, 71, 121, 128, 126,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
- 71, 71, 71, 71, 71, 16, 71, 17, 71, 71,
- 71, 26, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 70, 71, 127, 155, 159, 161, 164, 155,
- 161, 164, 155, 164, 155, 156, 159, 161, 164, 71,
+ 75, 75, 71, 75, 73, 75, 75, 129, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 79, 75,
+ 6, 75, 75, 75, 75, 75, 75, 75, 75, 23,
+ 75, 26, 75, 25, 75, 75, 22, 75, 29, 75,
+ 37, 75, 39, 75, 75, 75, 75, 75, 44, 75,
+ 75, 55, 75, 75, 58, 75, 75, 59, 75, 60,
+ 75, 75, 63, 75, 75, 75, 72, 75, 75, 125,
+ 132, 130, 163, 165, 168, 165, 168, 168, 160, 163,
+ 165, 168, 75, 75, 75, 75, 75, 16, 75, 17,
+ 75, 75, 75, 75, 27, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 65, 71, 124, 159, 161, 164, 161,
- 164, 164, 156, 159, 161, 164, 71, 71, 71, 18,
- 71, 71, 71, 52, 71, 71, 71, 71, 71, 71,
- 123, 122, 9, 71, 71, 14, 71, 71, 71, 71,
- 71, 71, 71, 71
+ 75, 75, 75, 75, 75, 75, 75, 74, 75, 131,
+ 159, 163, 165, 168, 159, 165, 168, 159, 168, 159,
+ 160, 163, 165, 168, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 69, 75, 128, 163, 165, 168, 165, 168,
+ 168, 160, 163, 165, 168, 75, 75, 75, 18, 75,
+ 75, 75, 75, 75, 75, 56, 75, 75, 75, 75,
+ 75, 75, 127, 126, 9, 75, 75, 14, 75, 75,
+ 75, 75, 75, 75, 75, 75
} ;
-static yyconst flex_int16_t yy_accept[568] =
+static yyconst flex_int16_t yy_accept[596] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
@@ -502,49 +505,53 @@
415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
- 454, 455, 456, 457, 458, 459, 460, 461, 462, 464,
- 466, 467, 469, 470, 472, 474, 475, 476, 478, 479,
+ 453, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+ 465, 467, 468, 470, 471, 473, 475, 476, 477, 478,
- 481, 482, 483, 484, 485, 486, 487, 488, 490, 491,
- 492, 493, 495, 496, 497, 499, 501, 502, 503, 504,
- 506, 507, 511, 511, 512, 514, 517, 518, 521, 524,
- 526, 528, 530, 532, 534, 536, 537, 538, 539, 539,
- 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
- 549, 550, 551, 552, 553, 555, 558, 560, 561, 565,
- 566, 567, 567, 568, 568, 568, 569, 570, 571, 572,
- 573, 574, 575, 576, 577, 578, 579, 581, 583, 584,
- 586, 587, 588, 589, 590, 591, 592, 593, 594, 595,
- 596, 597, 599, 600, 601, 602, 603, 605, 606, 608,
+ 480, 481, 483, 484, 485, 486, 487, 488, 489, 490,
+ 492, 493, 494, 495, 497, 498, 499, 501, 503, 504,
+ 505, 506, 508, 509, 513, 513, 514, 516, 519, 520,
+ 523, 526, 528, 530, 532, 534, 536, 538, 539, 540,
+ 541, 541, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 554, 555, 557, 560, 562,
+ 563, 567, 568, 569, 569, 570, 570, 570, 571, 572,
+ 573, 574, 575, 576, 577, 578, 579, 580, 581, 582,
+ 584, 586, 587, 589, 590, 591, 592, 593, 594, 595,
+ 596, 597, 598, 599, 600, 602, 603, 604, 605, 606,
- 610, 611, 612, 614, 615, 616, 618, 620, 621, 622,
- 623, 624, 625, 626, 627, 628, 629, 630, 630, 632,
- 633, 635, 637, 639, 641, 642, 643, 646, 648, 649,
- 653, 654, 654, 654, 655, 656, 657, 659, 660, 661,
- 662, 663, 664, 665, 666, 668, 669, 670, 671, 672,
- 674, 675, 677, 679, 681, 683, 685, 686, 687, 689,
- 690, 691, 693, 695, 696, 697, 699, 700, 701, 702,
- 703, 704, 705, 706, 707, 709, 710, 711, 712, 713,
- 715, 717, 718, 719, 720, 721, 722, 723, 723, 723,
- 723, 725, 726, 729, 731, 732, 736, 737, 737, 738,
+ 6...
[truncated message content] |
|
From: <bla...@us...> - 2008-06-01 19:42:28
|
Revision: 18827
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18827&view=rev
Author: blackystardust
Date: 2008-06-01 12:42:21 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Tagged the current state of my ports branch
Added Paths:
-----------
tags/marco/v1.22.16-fixes-vp-memmap/
Copied: tags/marco/v1.22.16-fixes-vp-memmap (from rev 18826, branches/marco/ports)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 19:39:19
|
Revision: 18826
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18826&view=rev
Author: blackystardust
Date: 2008-06-01 12:39:24 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Fixed my ports branch up to what it needed to be
Modified Paths:
--------------
branches/marco/ports/vice/build/qnx4/build.sh
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/po/intl2po.c
branches/marco/ports/vice/src/6510core.c
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
branches/marco/ports/vice/src/c1541.c
branches/marco/ports/vice/src/c64/c64mem.c
branches/marco/ports/vice/src/c64/patchrom.c
branches/marco/ports/vice/src/gfxoutput.h
branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
branches/marco/ports/vice/src/maincpu.c
branches/marco/ports/vice/src/monitor/mon_assemble6502.c
branches/marco/ports/vice/src/monitor/mon_assemblez80.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/mon_lex.c
branches/marco/ports/vice/src/monitor/mon_lex.l
branches/marco/ports/vice/src/monitor/mon_parse.c
branches/marco/ports/vice/src/monitor/mon_parse.h
branches/marco/ports/vice/src/monitor/mon_parse.y
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/monitor/montypes.h
branches/marco/ports/vice/src/monitor.h
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/resources.c
branches/marco/ports/vice/src/screenshot.c
branches/marco/ports/vice/src/screenshot.h
branches/marco/ports/vice/src/sound.c
branches/marco/ports/vice/src/sounddrv/soundhpux.c
branches/marco/ports/vice/src/sounddrv/soundsun.c
branches/marco/ports/vice/src/util.c
branches/marco/ports/vice/src/video/video-resources.c
branches/marco/ports/vice/src/zfile.c
Modified: branches/marco/ports/vice/build/qnx4/build.sh
===================================================================
--- branches/marco/ports/vice/build/qnx4/build.sh 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/build/qnx4/build.sh 2008-06-01 19:39:24 UTC (rev 18826)
@@ -12,7 +12,9 @@
mv src/plus4/Makefile.in src/plus4/Makefile.in.orig
sed s/"-rm -f libplus4.a"/"-rm -f -r libplus4.a;cp plus4mem.o ..\/;mv plus4mem.c plus4mem2.c;echo >plus4mem.c;$\(CC\) -c -o plus4mem.o plus4mem.c;mv plus4mem2.c plus4mem.c"/ <src/plus4/Makefile.in.orig >src/plus4/Makefile.in
+mv src/monitor/Makefile.in src/monitor/Makefile.in.orig
+sed s/"-rm -f libmonitor.a"/"-rm -f -r libmonitor.a;cp monitor.o ..\/;mv monitor.c monitor2.c;echo >monitor.c;$\(CC\) -c -o monitor.o monitor.c;mv monitor2.c monitor.c"/ <src/monitor/Makefile.in.orig >src/monitor/Makefile.in
mv src/Makefile.in src/Makefile.in.orig
-sed s/"@XPLUS4_WINRES@"/"plus4mem.o"/ <src/Makefile.in.orig >src/Makefile.in
+sed -e s/"@X128_WINRES@"/"monitor.o"/ -e s/"@X64_WINRES@"/"monitor.o"/ -e s/"@XVIC_WINRES@"/"monitor.o"/ -e s/"@XPET_WINRES@"/"monitor.o"/ -e s/"@XPLUS4_WINRES@"/"plus4mem.o monitor.o"/ -e s/"@XCBM2_WINRES@"/"monitor.o"/ <src/Makefile.in.orig >src/Makefile.in
./configure -v --prefix=/usr/local cross_compiling=yes ac_cv_c_bigendian=no
make
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/configure.in 2008-06-01 19:39:24 UTC (rev 18826)
@@ -64,8 +64,8 @@
AC_ARG_WITH(oss, [ --without-oss do not use the OSS sound system])
AC_ARG_ENABLE(sdl, [ --with-sdl use sdl sound system])
AC_ARG_WITH(resid, [ --without-resid do not use the reSID engine])
-AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
-AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
+AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
+AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
AC_ARG_ENABLE(fullscreen, [ --enable-fullscreen enable XFree86 fullscreen detection], [ echo checking for XFree86 fullscreen requested...], [enable_fullscreen="no"; echo no explicit checking for XFree86 fullscreen requested, disabling fullscreen...])
AC_ARG_ENABLE(gnomeui,[ --enable-gnomeui enables gnome ui support])
AC_ARG_ENABLE(nls,[ --disable-nls disables national language support])
@@ -76,8 +76,13 @@
AC_ARG_ENABLE(parsid,[ --enable-parsid enables ParSID support])
AC_ARG_WITH(picasso96, [ --with-picasso96 use Amiga P96 grafix system instead of cgx])
AC_ARG_ENABLE(bundle, [ --disable-bundle do not use application bundles on Macs])
-AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_ENABLE(memmap, [ --enable-memmap enable the mem map feature])
+if test x"$enable_memmap" = "xyes"; then
+ AC_DEFINE(FEATURE_CPUMEMHISTORY,,[Use the memmap feature.])
+fi
+
if test x"$enable_gnomeui" = "xyes" ; then
AC_DEFINE(USE_GNOMEUI,,[Use GNOME UI.])
fi
@@ -119,6 +124,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
+ CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
fi
if test x"$host_os" = "xcygwin32" -o x"$host_os" = "xcygwin"; then
Modified: branches/marco/ports/vice/po/intl2po.c
===================================================================
--- branches/marco/ports/vice/po/intl2po.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/po/intl2po.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef _SCO_ELF
+#include <strings.h>
+#endif
+
/* status definitions */
#define SCANNING 0
#define STRINGTABLE_BEGIN_SCAN 1
Modified: branches/marco/ports/vice/src/6510core.c
===================================================================
--- branches/marco/ports/vice/src/6510core.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/6510core.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -1778,8 +1778,30 @@
#endif
#endif
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ memmap_state |= (MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
FETCH_OPCODE(opcode);
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ /* HACK to cope with FETCH_OPCODE optimization in x64 */
+ if (((int)reg_pc) < bank_limit) {
+ memmap_mem_read(reg_pc);
+ }
+
+ if(p0 == 0x20) {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(LOAD(reg_pc+2)));
+ } else {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(p2 >> 8));
+ }
+ memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
#ifdef DEBUG
#ifdef DRIVE_CPU
if (TRACEFLG) {
Modified: branches/marco/ports/vice/src/arch/unix/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -44,6 +44,10 @@
#include <vfork.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "findpath.h"
#include "ioutil.h"
Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -68,7 +68,7 @@
static void pal_ctrl_reset (GtkWidget *w, gpointer data)
{
- unsigned int i
+ unsigned int i;
int tmp;
for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
Modified: branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -41,6 +41,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef __minix
+#include <stdlib.h>
+#endif
+
#if defined(__QNX__) || defined(MINIX_SUPPORT)
Status XShmAttach(Display *display, XShmSegmentInfo *shminfo)
{
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -631,7 +631,7 @@
return 0;
}
-GC video_get_gc(XGCValues *gc_values)
+static GC video_get_gc(XGCValues *gc_values)
{
Display *display;
@@ -824,7 +824,7 @@
/* ------------------------------------------------------------------------- */
-void video_refresh_func(void (*rfunc)(void))
+static void video_refresh_func(void (*rfunc)(void))
{
_refresh_func = rfunc;
}
Modified: branches/marco/ports/vice/src/c1541.c
===================================================================
--- branches/marco/ports/vice/src/c1541.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/c1541.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -54,6 +54,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "cbmdos.h"
#include "cbmimage.h"
Modified: branches/marco/ports/vice/src/c64/c64mem.c
===================================================================
--- branches/marco/ports/vice/src/c64/c64mem.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/c64/c64mem.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -218,7 +218,12 @@
BYTE REGPARM1 zero_read(WORD addr)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ if(!(memmap_state & MEMMAP_STATE_IGNORE)) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ }
+#endif
switch ((BYTE)addr) {
case 0:
return pport.dir_read;
@@ -242,7 +247,9 @@
void REGPARM2 zero_store(WORD addr, BYTE value)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+#endif
switch ((BYTE)addr) {
case 0:
if (vbank == 0) {
Modified: branches/marco/ports/vice/src/c64/patchrom.c
===================================================================
--- branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -35,6 +35,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "log.h"
#include "c64memrom.h"
#include "patchrom.h"
Modified: branches/marco/ports/vice/src/gfxoutput.h
===================================================================
--- branches/marco/ports/vice/src/gfxoutput.h 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutput.h 2008-06-01 19:39:24 UTC (rev 18826)
@@ -27,6 +27,8 @@
#ifndef _GFXOUTPUT_H
#define _GFXOUTPUT_H
+#include "types.h"
+
struct screenshot_s;
typedef struct gfxoutputdrv_s {
@@ -38,6 +40,9 @@
int (*write)(struct screenshot_s *);
int (*save)(struct screenshot_s *, const char *);
int (*record)(struct screenshot_s *);
+#ifdef FEATURE_CPUMEMHISTORY
+ int (*savememmap)(const char *, int, int, BYTE *, BYTE *);
+#endif
} gfxoutputdrv_t;
/* Functions called by external emulator code. */
Modified: branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -348,6 +348,154 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *bmpdrv_memmap_fd;
+static char *bmpdrv_memmap_ext_filename;
+static BYTE *bmpdrv_memmap_bmp_data;
+
+static int bmpdrv_close_memmap(int x_size, int y_size)
+{
+ fwrite(bmpdrv_memmap_bmp_data, y_size * x_size, 1, bmpdrv_memmap_fd);
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ lib_free(bmpdrv_memmap_bmp_data);
+ return 0;
+}
+
+static DWORD bmpdrv_memmap_bmp_size(int x_size, int y_size)
+{
+ DWORD size = 0;
+
+ size = (DWORD)((14 + 40 + 4 * 256) + (x_size * y_size));
+
+ return size;
+}
+
+static int bmpdrv_memmap_write_bitmap_info(int x_size, int y_size, BYTE *palette)
+{
+ BYTE binfo[40];
+ BYTE *bcolor;
+ unsigned int i;
+
+ memset(binfo, 0, sizeof(binfo));
+
+ util_dword_to_le_buf(&binfo[0], sizeof(binfo));
+ util_dword_to_le_buf(&binfo[4], x_size);
+ util_dword_to_le_buf(&binfo[8], y_size);
+
+ binfo[12] = 1;
+ binfo[13] = 0;
+
+ binfo[14] = 8;
+ binfo[15] = 0;
+
+ util_dword_to_le_buf(&binfo[16], 0); /* BI_RGB */
+ util_dword_to_le_buf(&binfo[20], 0);
+
+ /* DPI in Pixels per Meter*/
+ util_dword_to_le_buf(&binfo[24], 0 * 10000 / 254);
+ util_dword_to_le_buf(&binfo[28], 0 * 10000 / 254);
+
+ util_dword_to_le_buf(&binfo[32], 256);
+ util_dword_to_le_buf(&binfo[36], 256);
+
+ if (fwrite(binfo, sizeof(binfo), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ bcolor = (BYTE *)lib_malloc(256 * 4);
+
+ for (i = 0; i < 256; i++)
+ {
+ bcolor[i * 4] = palette[(i*3)+2];
+ bcolor[i * 4 + 1] = palette[(i*3)+1];
+ bcolor[i * 4 + 2] = palette[(i*3)];
+ bcolor[i * 4 + 3] = 0;
+ }
+
+ if (fwrite(bcolor, 256 * 4, 1, bmpdrv_memmap_fd) < 1)
+ {
+ lib_free(bcolor);
+ return -1;
+ }
+
+ lib_free(bcolor);
+ return 0;
+}
+
+static int bmpdrv_memmap_write_file_header(int x_size, int y_size)
+{
+ BYTE header[14];
+
+ memset(header, 0, sizeof(header));
+
+ header[0] = 'B';
+ header[1] = 'M';
+
+ util_dword_to_le_buf(&header[2], bmpdrv_memmap_bmp_size(x_size, y_size));
+
+ util_dword_to_le_buf(&header[10], (14 + 40 + 4 * 256));
+
+ if (fwrite(header, sizeof(header), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ return 0;
+}
+
+static int bmpdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ bmpdrv_memmap_ext_filename = util_add_extension_const(filename, bmp_drv.default_extension);
+
+ bmpdrv_memmap_fd = fopen(bmpdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (bmpdrv_memmap_fd == NULL)
+ {
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_file_header(x_size, y_size) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_bitmap_info(x_size, y_size, palette) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ bmpdrv_memmap_bmp_data = (BYTE *)lib_malloc(x_size*y_size);
+
+ return 0;
+}
+
+static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+{
+ memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
+}
+
+static int bmpdrv_memmap_save(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (bmpdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line=0; line<y_size; line++)
+ {
+ bmpdrv_write_memmap(line, x_size, y_size, gfx);
+ }
+
+ if (bmpdrv_close_memmap(x_size, y_size) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t bmp_drv =
{
"BMP",
@@ -357,7 +505,12 @@
bmpdrv_close,
bmpdrv_write,
bmpdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ bmpdrv_memmap_save
+#else
NULL
+#endif
};
void gfxoutput_init_bmp(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -802,7 +802,12 @@
ffmpegdrv_close,
ffmpegdrv_write,
ffmpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ ffmpegdrv_record,
+ NULL
+#else
ffmpegdrv_record
+#endif
},
/*
{
@@ -836,7 +841,11 @@
ffmpegdrv_record
},
*/
- { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+#endi
+ NULL }
};
void gfxoutput_init_ffmpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -161,6 +161,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static GifFileType *gifdrv_memmap_fd;
+static char *gifdrv_memmap_ext_filename;
+
+static int gifdrv_close_memmap(void)
+{
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int gifdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ if (EGifPutLine(gifdrv_memmap_fd, gfx+(line*x_size), x_size)==GIF_ERROR)
+ return -1;
+
+ return 0;
+}
+
+static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ unsigned int i;
+ GifColorType ColorMap256[256];
+
+ gifdrv_memmap_ext_filename=util_add_extension_const(filename, gif_drv.default_extension);
+
+ gifdrv_memmap_fd=EGifOpenFileName(gifdrv_memmap_ext_filename, FALSE);
+
+ if (gifdrv_memmap_fd==NULL)
+ {
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ gif_colors=MakeMapObject(256, ColorMap256);
+
+ for (i = 0; i < 256; i++)
+ {
+ gif_colors->Colors[i].Blue=palette[(i*3)+2];
+ gif_colors->Colors[i].Green=palette[(i*3)+1];
+ gif_colors->Colors[i].Red=palette[i*3];
+ }
+
+ EGifSetGifVersion("87a");
+
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, FALSE, NULL) == GIF_ERROR)
+ {
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int gifdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (gifdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ gifdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (gifdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t gif_drv =
{
"GIF",
@@ -170,7 +248,12 @@
gifdrv_close,
gifdrv_write,
gifdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ gifdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_gif(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -225,6 +225,136 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *iffdrv_memmap_fd;
+static char *iffdrv_memmap_ext_filename;
+static BYTE *iffdrv_memmap_iff_data;
+static int iffdrv_memmap_iff_rowbytes;
+
+static int iffdrv_close_memmap(void)
+{
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_iff_data);
+ lib_free(iffdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int iffdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ int j;
+
+ for (j = 0; j<8; j++)
+ {
+ iff_c2p(gfx+(x_size*line), iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, j);
+ if (fwrite(iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, 1, iffdrv_memmap_fd)<1)
+ return -1;
+ }
+ return 0;
+}
+
+static int iffdrv_write_file_header_memmap(int x_size, int y_size, BYTE *palette)
+{
+ BYTE header[836];
+ int i;
+ int totalsize;
+
+ memset(header, 0, sizeof(header));
+
+ iffdrv_memmap_iff_rowbytes=((x_size+15)>>4)<<1;
+
+ totalsize=828+(iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ header[0]='F';
+ header[1]='O';
+ header[2]='R';
+ header[3]='M';
+ util_dword_to_be_buf(&header[4], totalsize);
+ header[8]='I';
+ header[9]='L';
+ header[10]='B';
+ header[11]='M';
+ header[12]='B';
+ header[13]='M';
+ header[14]='H';
+ header[15]='D';
+ util_dword_to_be_buf(&header[16], 20);
+ util_word_to_be_buf(&header[20],(WORD)(x_size));
+ util_word_to_be_buf(&header[22],(WORD)(y_size));
+ header[28]=8;
+ util_word_to_be_buf(&header[36],(WORD)(x_size));
+ util_word_to_be_buf(&header[38],(WORD)(y_size));
+ header[40]='C';
+ header[41]='M';
+ header[42]='A';
+ header[43]='P';
+ util_dword_to_be_buf(&header[44],3*256);
+
+ for (i = 0; i < 256; i++)
+ {
+ header[48+(i*3)]=palette[i*3];
+ header[49+(i*3)]=palette[(i*3)+1];
+ header[50+(i*3)]=palette[(i*3)+2];
+ }
+ header[816]='C';
+ header[817]='A';
+ header[818]='M';
+ header[819]='G';
+ util_dword_to_be_buf(&header[820],4);
+ header[828]='B';
+ header[829]='O';
+ header[830]='D';
+ header[831]='Y';
+ util_dword_to_be_buf(&header[832],iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ if (fwrite(header,836,1,iffdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int iffdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ iffdrv_memmap_ext_filename=util_add_extension_const(filename, iff_drv.default_extension);
+ iffdrv_memmap_fd = fopen(iffdrv_memmap_ext_filename, "wb");
+
+ if (iffdrv_memmap_fd==NULL)
+ {
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (iffdrv_write_file_header_memmap(x_size, y_size, palette)<0)
+ {
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ iffdrv_memmap_iff_data = (BYTE *)lib_malloc(iffdrv_memmap_iff_rowbytes);
+
+ return 0;
+}
+
+static int iffdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (iffdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ iffdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (iffdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t iff_drv =
{
"IFF",
@@ -234,7 +364,12 @@
iffdrv_close,
iffdrv_write,
iffdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ iffdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_iff(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -135,6 +135,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *jpegdrv_memmap_fd;
+static char *jpegdrv_memmap_ext_filename;
+static BYTE *jpegdrv_memmap_data;
+
+static int jpegdrv_close_memmap(void)
+{
+ jpeg_finish_compress(&cinfo);
+ fclose(jpegdrv_memmap_fd);
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_data);
+ lib_free(jpegdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int jpegdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+ JSAMPROW rowpointer[1];
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ jpegdrv_memmap_data[i*3]=palette[pixval*3];
+ jpegdrv_memmap_data[(i*3)+1]=palette[(pixval*3)+1];
+ jpegdrv_memmap_data[(i*3)+2]=palette[(pixval*3)+2];
+ }
+ rowpointer[0]=jpegdrv_memmap_data;
+ jpeg_write_scanlines(&cinfo, rowpointer, 1);
+
+ return 0;
+}
+
+static int jpegdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_compress(&cinfo);
+ jpegdrv_memmap_ext_filename=util_add_extension_const(filename, jpeg_drv.default_extension);
+ jpegdrv_memmap_fd = fopen(jpegdrv_memmap_ext_filename, "wb");
+ if (jpegdrv_memmap_fd==NULL)
+ {
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_ext_filename);
+ return -1;
+ }
+ jpeg_stdio_dest(&cinfo, jpegdrv_memmap_fd);
+ jpegdrv_memmap_data = (BYTE *)lib_malloc(x_size*3);
+ cinfo.image_width = x_size;
+ cinfo.image_height = y_size;
+ cinfo.input_components = 3;
+ cinfo.in_color_space = JCS_RGB;
+ jpeg_set_defaults(&cinfo);
+ jpeg_start_compress(&cinfo, TRUE);
+
+ return 0;
+}
+
+static int jpegdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (jpegdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ jpegdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (jpegdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t jpeg_drv =
{
"JPEG",
@@ -144,7 +222,12 @@
jpegdrv_close,
jpegdrv_write,
jpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ jpegdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_jpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -256,6 +256,180 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pcxdrv_memmap_fd;
+static char *pcxdrv_memmap_ext_filename;
+static BYTE *pcxdrv_memmap_pcx_data;
+
+static int pcxdrv_close_memmap(BYTE *palette)
+{
+ BYTE pcx_color_prefix[2]="\x0c";
+
+ fwrite(pcx_color_prefix, 1, 1, pcxdrv_memmap_fd);
+
+ fwrite(palette, 3*256, 1, pcxdrv_memmap_fd);
+
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_pcx_data);
+ lib_free(pcxdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pcxdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ BYTE color,amount;
+ unsigned int i,j=0;
+
+ color=gfx[(line*x_size)];
+ amount=1;
+ for (i = 1; i<x_size; i++)
+ {
+ if (gfx[(line*x_size)+i]==color)
+ {
+ amount=amount+1;
+ if (amount==63)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xff;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ amount=0;
+ }
+ }
+ else
+ {
+ if (amount==0)
+ {
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ }
+ }
+ }
+ if (amount==1)
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ }
+
+ if (fwrite(pcxdrv_memmap_pcx_data, j, 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ BYTE header[128];
+
+ memset(header, 0, sizeof(header));
+
+ header[0]=0xa;
+ header[1]=5;
+ header[2]=1;
+ header[3]=8;
+
+ util_word_to_le_buf(&header[8], (WORD)(x_size-1));
+ util_word_to_le_buf(&header[10], (WORD)(y_size-1));
+
+ util_word_to_le_buf(&header[12], (WORD)(0));
+ util_word_to_le_buf(&header[14], (WORD)(0));
+
+ header[65]=1;
+ util_word_to_le_buf(&header[66], (WORD)(x_size));
+
+ if (fwrite(header, sizeof(header), 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ pcxdrv_memmap_ext_filename=util_add_extension_const(filename, pcx_drv.default_extension);
+ pcxdrv_memmap_fd = fopen(pcxdrv_memmap_ext_filename, "wb");
+
+ if (pcxdrv_memmap_fd==NULL)
+ {
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (pcxdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pcxdrv_memmap_pcx_data = (BYTE *)lib_malloc(x_size*2);
+
+ return 0;
+}
+
+static int pcxdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pcxdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pcxdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (pcxdrv_close_memmap(palette) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t pcx_drv =
{
"PCX",
@@ -265,7 +439,12 @@
pcxdrv_close,
pcxdrv_write,
pcxdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pcxdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_pcx(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -161,6 +161,114 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pngdrv_memmap_fd;
+static char *pngdrv_memmap_ext_filename;
+static png_structp pngdrv_memmap_png_ptr;
+static png_infop pngdrv_memmap_info_ptr;
+static BYTE *pngdrv_memmap_png_data;
+
+static int pngdrv_close_memmap(void)
+{
+ png_write_end(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+
+ fclose(pngdrv_memmap_fd);
+ lib_free(pngdrv_memmap_png_data);
+ lib_free(pngdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pngdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ pngdrv_memmap_png_data[i*4] = palette[pixval*3];
+ pngdrv_memmap_png_data[(i*4)+1] = palette[(pixval*3)+1];
+ pngdrv_memmap_png_data[(i*4)+2] = palette[(pixval*3)+2];
+ pngdrv_memmap_png_data[(i*4)+3] = 0;
+ }
+
+ png_write_row(pngdrv_memmap_png_ptr, (png_bytep)(pngdrv_memmap_png_data));
+
+ return 0;
+}
+
+static int pngdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ pngdrv_memmap_png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (void *)NULL, NULL, NULL);
+
+ if (pngdrv_memmap_png_ptr == NULL)
+ return -1;
+
+ pngdrv_memmap_info_ptr = png_create_info_struct(pngdrv_memmap_png_ptr);
+
+ if (pngdrv_memmap_info_ptr == NULL)
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(pngdrv_memmap_png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+ return -1;
+ }
+
+ pngdrv_memmap_ext_filename = util_add_extension_const(filename, png_drv.default_extension);
+
+ pngdrv_memmap_fd = fopen(pngdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (pngdrv_memmap_fd == NULL)
+ {
+ lib_free(pngdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pngdrv_memmap_png_data = (BYTE *)lib_malloc(x_size * 4);
+
+ png_init_io(pngdrv_memmap_png_ptr, pngdrv_memmap_fd);
+ png_set_compression_level(pngdrv_memmap_png_ptr, Z_BEST_COMPRESSION);
+
+ pngdrv_memmap_info_ptr->width = x_size;
+ pngdrv_memmap_info_ptr->height= y_size;
+ pngdrv_memmap_info_ptr->bit_depth = 8;
+ pngdrv_memmap_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+
+ png_write_info(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+ png_set_invert_alpha(pngdrv_memmap_png_ptr);
+#endif
+
+ return 0;
+}
+
+static int pngdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pngdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pngdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (pngdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t png_drv =
{
"PNG",
@@ -170,7 +278,12 @@
pngdrv_close,
pngdrv_write,
pngdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pngdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_png(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -151,6 +151,86 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *ppmdrv_memmap_fd;
+static char *ppmdrv_memmap_ext_filename;
+
+static int ppmdrv_close_memmap(void)
+{
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int ppmdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ unsigned int i;
+ BYTE pixval;
+
+ for (i = 0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ if (fprintf(ppmdrv_memmap_fd, "%3d %3d %3d\x0a",palette[pixval*3],palette[(pixval*3)+1],palette[(pixval*3)+2])<0)
+ return -1;
+ }
+ return 0;
+}
+
+static int ppmdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ if (fprintf(ppmdrv_memmap_fd,"P3\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"# VICEplus generated PPM mem map grafix\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"%d %d\x0a",x_size,y_size)<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"255\x0a")<0)
+ return -1;
+
+ return 0;
+}
+
+static int ppmdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ ppmdrv_memmap_ext_filename=util_add_extension_const(filename, ppm_drv.default_extension);
+ ppmdrv_memmap_fd = fopen(ppmdrv_memmap_ext_filename, "wb");
+
+ if (ppmdrv_memmap_fd==NULL)
+ {
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (ppmdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int ppmdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (ppmdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ ppmdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (ppmdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t ppm_drv =
{
"PPM",
@@ -160,7 +240,12 @@
ppmdrv_close,
ppmdrv_write,
ppmdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ ppmdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_ppm(void)
Modified: branches/marco/ports/vice/src/maincpu.c
===================================================================
--- branches/marco/ports/vice/src/maincpu.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/maincpu.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -74,24 +74,76 @@
/* ------------------------------------------------------------------------- */
+#ifndef STORE_ZERO
+#define STORE_ZERO(addr, value) \
+ zero_store((WORD)(addr), (BYTE)(value))
+#endif
+
+#ifndef LOAD_ZERO
+#define LOAD_ZERO(addr) \
+ zero_read((WORD)(addr))
+#endif
+
+#ifdef FEATURE_CPUMEMHISTORY
+
+/* HACK this is C64 specific */
+
+void REGPARM2 memmap_mem_store(WORD addr, BYTE value)
+{
+ if((addr >= 0xd000)&&(addr <= 0xdfff)) {
+ monitor_memmap_store(addr, MEMMAP_I_O_W);
+ } else {
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+ }
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value));
+}
+
+BYTE REGPARM1 memmap_mem_read(WORD addr)
+{
+ switch(addr >> 12) {
+ case 0xa:
+ case 0xb:
+ case 0xe:
+ case 0xf:
+ memmap_state |= MEMMAP_STATE_IGNORE;
+ if(LOAD_ZERO(1) & (1 << ((addr>>14) & 1))) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_ROM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_ROM_R);
+ } else {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ }
+ memmap_state &= ~(MEMMAP_STATE_IGNORE);
+ break;
+ case 0xd:
+ monitor_memmap_store(addr, MEMMAP_I_O_R);
+ break;
+ default:
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ break;
+ }
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ return (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr));
+}
+
#ifndef STORE
#define STORE(addr, value) \
- (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
+ memmap_mem_store(addr, value)
#endif
#ifndef LOAD
#define LOAD(addr) \
- (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
+ memmap_mem_read(addr)
#endif
-#ifndef STORE_ZERO
-#define STORE_ZERO(addr, value) \
- zero_store((WORD)(addr), (BYTE)(value))
+#endif /* FEATURE_CPUMEMHISTORY */
+
+#ifndef STORE
+#define STORE(addr, value) \
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
#endif
-#ifndef LOAD_ZERO
-#define LOAD_ZERO(addr) \
- zero_read((WORD)(addr))
+#ifndef LOAD
+#define LOAD(addr) \
+ (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
#endif
#define LOAD_ADDR(addr) \
Modified: branches/marco/ports/vice/src/monitor/mon_assemble6502.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -30,6 +30,10 @@
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_assemblez80.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -29,6 +29,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -31,6 +31,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "mon_command.h"
#include "montypes.h"
#include "mon_parse.h" /* FIXME ! */
@@ -67,6 +71,10 @@
"<type>",
"Specify the type of CPU currently used (6502/z80)." },
+ { "cpuhistory", "chis",
+ "[<count>]",
+ "Show <count> last executed commands." },
+
{ "dump", "",
"\"<filename>\"",
"Write a snapshot of the machine into the file specified.\n"
@@ -221,6 +229,22 @@
"is specified, only one character is displayed. If no addresses are\n"
"given, the ``dot'' address is used." },
+ { "memmapsave", "mmsave",
+ "\"<filename>\" <format>",
+ "Save the memmap as a picture. Format is:\n"
+ "0 = BMP, 1 = PCX, 2 = PNG, 3 = GIF, 4 = IFF." },
+
+ { "memmapshow", "mmsh",
+ "[<mask>] [<address_opt_range>]",
+ "Show the memmap. The mask can be specified to show only those\n"
+ "locations with accesses of certain type(s). The mask is a number\n"
+ "with the bits \"ioRWXrwx\", where RWX are for ROM and rwx for RAM.\n"
+ "Optionally, an address range can be specified." },
+
+ { "memmapzap", "mmzap",
+ NULL,
+ "Clear the memmap." },
+
{ "memsprite", "ms",
"[<data_type>] [<address_opt_range>]",
"Display the contents of memory as sprite data. If only one address is\n"
Modified: branches/marco/ports/vice/src/monitor/mon_lex.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.c 2008-06-01 19:23:33 UTC (rev 18825)
+++ branches/marco/ports/vice/src/monitor/mon_lex.c 2008-06-01 19:39:24 UTC (rev 18826)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 169
-#define YY_END_OF_BUFFER 170
+#define YY_NUM_RULES 173
+#define YY_END_OF_BUFFER 174
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,116 +372,119 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[955] =
+static yyconst flex_int16_t yy_acclist[987] =
{ 0,
- 96, 159, 96, 159, 96, 96, 96, 96, 81, 96,
- 81, 96, 96, 96, 96, 159, 96, 159, 96, 159,
- 96, 159, 96, 159, 96, 159, 96, 159, 96, 159,
- 96, 99, 96, 99, 95, 96, 95, 96, 170, 168,
- 169, 96, 169, 97, 168, 169, 79, 168, 169, 168,
- 169, 168, 169, 168, 169, 168, 169, 166, 168, 169,
- 168, 169, 159, 161, 164, 168, 169, 156, 159, 161,
- 164, 168, 169, 161, 164, 168, 169, 161, 164, 168,
- 169, 72, 168, 169, 165, 168, 169, 164, 168, 169,
- 88, 164, 168, 169, 164, 168, 169, 86, 164, 168,
+ 100, 163, 100, 163, 100, 100, 100, 100, 85, 100,
+ 85, 100, 100, 100, 100, 163, 100, 163, 100, 163,
+ 100, 163, 100, 163, 100, 163, 100, 163, 100, 163,
+ 100, 103, 100, 103, 99, 100, 99, 100, 174, 172,
+ 173, 100, 173, 101, 172, 173, 83, 172, 173, 172,
+ 173, 172, 173, 172, 173, 172, 173, 170, 172, 173,
+ 172, 173, 163, 165, 168, 172, 173, 160, 163, 165,
+ 168, 172, 173, 165, 168, 172, 173, 165, 168, 172,
+ 173, 76, 172, 173, 169, 172, 173, 168, 172, 173,
+ 92, 168, 172, 173, 168, 172, 173, 90, 168, 172,
- 169, 87, 168, 169, 89, 168, 169, 168, 169, 168,
- 169, 168, 169, 89, 168, 169, 168, 169, 168, 169,
- 168, 169, 168, 169, 2, 168, 169, 32, 168, 169,
- 3, 168, 169, 71, 168, 169, 4, 71, 168, 169,
- 71, 168, 169, 17, 71, 168, 169, 21, 71, 168,
- 169, 71, 168, 169, 30, 71, 168, 169, 31, 71,
- 168, 169, 33, 71, 168, 169, 34, 71, 168, 169,
- 71, 168, 169, 39, 71, 168, 169, 41, 71, 168,
- 169, 45, 71, 168, 169, 47, 71, 168, 169, 71,
- 168, 169, 52, 71, 168, 169, 57, 71, 168, 169,
+ 173, 91, 172, 173, 93, 172, 173, 172, 173, 172,
+ 173, 172, 173, 93, 172, 173, 172, 173, 172, 173,
+ 172, 173, 172, 173, 2, 172, 173, 33, 172, 173,
+ 3, 172, 173, 75, 172, 173, 4, 75, 172, 173,
+ 75, 172, 173, 17, 75, 172, 173, 22, 75, 172,
+ 173, 75, 172, 173, 31, 75, 172, 173, 32, 75,
+ 172, 173, 34, 75, 172, 173, 35, 75, 172, 173,
+ 75, 172, 173, 40, 75, 172, 173, 42, 75, 172,
+ 173, 49, 75, 172, 173, 51, 75, 172, 173, 75,
+ 172, 173, 56, 75, 172, 173, 61, 75, 172, 173,
- 43, 71, 168, 169, 71, 168, 169, 69, 71, 168,
- 169, 29, 71, 168, 169, 71, 168, 169, 63, 71,
- 168, 169, 1, 168, 169, 81, 168, 169, 81, 96,
- 169, 80, 168, 169, 81, 166, 168, 169, 81, 165,
- 168, 169, 100, 168, 169, 100, 166, 168, 169, 100,
- 165, 168, 169, 153, 168, 169, 151, 168, 169, 152,
- 168, 169, 168, 169, 156, 159, 161, 164, 168, 169,
- 161, 164, 168, 169, 154, 168, 169, 164, 168, 169,
- 16526, 143, 164, 168, 169, 144, 164, 168, 169, 145,
- 164, 168, 169, 146, 164, 168, 169, 164, 168, 169,
+ 47, 75, 172, 173, 75, 172, 173, 73, 75, 172,
+ 173, 30, 75, 172, 173, 75, 172, 173, 67, 75,
+ 172, 173, 1, 172, 173, 85, 172, 173, 85, 100,
+ 173, 84, 172, 173, 85, 170, 172, 173, 85, 169,
+ 172, 173, 104, 172, 173, 104, 170, 172, 173, 104,
+ 169, 172, 173, 157, 172, 173, 155, 172, 173, 156,
+ 172, 173, 172, 173, 160, 163, 165, 168, 172, 173,
+ 165, 168, 172, 173, 158, 172, 173, 168, 172, 173,
+ 16530, 147, 168, 172, 173, 148, 168, 172, 173, 149,
+ 168, 172, 173, 150, 168, 172, 173, 168, 172, 173,
- 168, 169, 147, 168, 169, 168, 169, 148, 168, 169,
- 149, 168, 169, 150, 168, 169, 164, 168, 169,16526,
- 143, 164, 168, 169, 145, 164, 168, 169, 147, 168,
- 169, 168, 169, 149, 168, 169, 168, 169, 168, 169,
- 119, 168, 169, 120, 168, 169, 168, 169, 109, 168,
- 169, 165, 168, 169, 110, 168, 169, 168, 169, 101,
- 164, 168, 169, 168, 169, 168, 169, 102, 168, 169,
- 103, 168, 169, 102, 168, 169, 168, 169, 99, 168,
- 169, 99, 168, 169, 99, 168, 169, 99, 168, 169,
- 99, 168, 169, 95, 168, 169, 96, 163, 157, 158,
+ 172, 173, 151, 172, 173, 172, 173, 152, 172, 173,
+ 153, 172, 173, 154, 172, 173, 168, 172, 173,16530,
+ 147, 168, 172, 173, 149, 168, 172, 173, 151, 172,
+ 173, 172, 173, 153, 172, 173, 172, 173, 172, 173,
+ 123, 172, 173, 124, 172, 173, 172, 173, 113, 172,
+ 173, 169, 172, 173, 114, 172, 173, 172, 173, 105,
+ 168, 172, 173, 172, 173, 172, 173, 106, 172, 173,
+ 107, 172, 173, 106, 172, 173, 172, 173, 103, 172,
+ 173, 103, 172, 173, 103, 172, 173, 103, 172, 173,
+ 103, 172, 173, 99, 172, 173, 100, 167, 161, 162,
- 160, 82, 84, 85, 83, 141, 140, 141, 159, 161,
- 164, 161, 164, 164, 156, 159, 161, 164, 156, 159,
- 161, 164, 91, 92, 90, 162, 78, 73, 71, 71,
- 5, 71, 71, 71, 8, 71, 9, 71, 11, 71,
- 12, 71, 13, 71, 71, 15, 71, 71, 71, 71,
- 71, 23, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 35, 71, 37, 71, 71, 40, 71, 71, 20,
- 71, 42, 71, 71, 71, 44, 71, 71, 46, 71,
- 71, 71, 71, 71, 71, 71, 71, 59, 71, 71,
- 71, 71, 58, 71, 71, 71, 66, 71, 67, 71,
+ 164, 86, 88, 89, 87, 145, 144, 145, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 160, 163,
+ 165, 168, 95, 96, 94, 166, 82, 77, 75, 75,
+ 5, 75, 75, 75, 8, 75, 9, 75, 11, 75,
+ 12, 75, 13, 75, 75, 15, 75, 75, 75, 75,
+ 75, 75, 24, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 36, 75, 38, 75, 75, 41, 75, 75,
+ 21, 75, 43, 75, 75, 75, 75, 48, 75, 75,
+ 50, 75, 75, 75, 75, 75, 75, 75, 75, 63,
+ 75, 75, 75, 75, 62, 75, 75, 75, 70, 75,
- 71, 71, 81, 81, 96, 100, 156, 159, 161, 164,
- 8334, 139, 164, 129, 139, 164, 139, 130, 139, 164,
- 131, 139, 164, 132, 139, 133, 139, 136, 139, 139,
- 162, 133, 139, 136, 139, 107, 112, 114, 115, 116,
- 108, 106, 111, 113, 104, 105, 167, 99, 99, 99,
- 95, 141, 140, 141, 159, 161, 164, 161, 164, 164,
- 156, 159, 161, 164, 93, 94, 74, 98, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 19, 71,
- 22, 71, 71, 24, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 41, 71, 71, 71,
+ 71, 75, 75, 75, 85, 85, 100, 104, 160, 163,
+ 165, 168, 8338, 143, 168, 133, 143, 168, 143, 134,
+ 143, 168, 135, 143, 168, 136, 143, 137, 143, 140,
+ 143, 143, 166, 137, 143, 140, 143, 111, 116, 118,
+ 119, 120, 112, 110, 115, 117, 108, 109, 171, 103,
+ 103, 103, 99, 145, 144, 145, 163, 165, 168, 165,
+ 168, 168, 160, 163, 165, 168, 97, 98, 78, 102,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 19, 75, 23, 75, 75, 25, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 42,
- 71, 71, 48, 71, 71, 50, 71, 51, 71, 71,
- 71, 56, 71, 71, 71, 62, 71, 61, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 139,
- 164, 139, 134, 139, 135, 139, 137, 139, 138, 139,
- 117, 118, 159, 161, 164, 161, 164, 164, 156, 159,
- 161, 164, 76, 71, 71, 71, 7, 71, 71, 71,
- 71, 71, 71, 71, 71, 18, 71, 71, 71, 71,
- 71, 27, 71, 71, 29, 71, 30, 71, 31, 71,
- 32, 71, 33, 71, 71, 71, 39, 71, 71, 71,
- 43, 71, 45, 71, 71, 71, 49, 71, 71, 71,
+ 75, 75, 75, 75, 75, 75, 75, 52, 75, 75,
+ 54, 75, 55, 75, 75, 75, 60, 75, 75, 75,
+ 66, 75, 65, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 143, 168, 143, 138, 143, 139,
+ 143, 141, 143, 142, 143, 121, 122, 163, 165, 168,
+ 165, 168, 168, 160, 163, 165, 168, 80, 75, 75,
+ 75, 7, 75, 75, 75, 75, 75, 75, 20, 75,
+ 75, 75, 18, 75, 75, 75, 75, 75, 75, 28,
+ 75, 75, 30, 75, 31, 75, 32, 75, 33, 75,
+ 34, 75, 75, 75, 40, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 57, 71, 71, 71,
- 71, 71, 63, 71, 64, 71, 71, 71, 71, 71,
- 71, 71, 139, 164, 139, 159, 161, 164, 161, 164,
- 164, 156, 159, 161, 164, 77, 71, 71, 71, 8,
- 71, 71, 10, 71, 11, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 47, 71, 50, 71, 71, 71, 53, 71,
- 71, 71, 71, 71, 71, 71, 60, 71, 71, 71,
- 71, 66, 71, 71, 67, 71, 69, 71, 71, 125,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
+ 45, 75, 75, 47, 75, 49, 75, 75, 75, 53,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 61,
+ 75, 75, 75, 75, 75, 67, 75, 68, 75, 75,
+ 75, 75, 75, 75, 75, 143, 168, 143, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 81, 75,
+ 75, 75, 8, 75, 75, 10, 75, 11, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 46, 75, 75,
+ 51, 75, 54, 75, 75, 75, 57, 75, 75, 75,
+ 75, 75, 75, 75, 64, 75, 75, 75, 75, 70,
- 75, 71, 6, 71, 71, 71, 71, 71, 71, 71,
- 22, 71, 25, 71, 24, 71, 71, 21, 71, 28,
- 71, 36, 71, 38, 71, 71, 71, 71, 71, 51,
- 71, 71, 54, 71, 71, 55, 71, 56, 71, 71,
- 59, 71, 71, 71, 68, 71, 71, 121, 128, 126,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
- 71, 71, 71, 71, 71, 16, 71, 17, 71, 71,
- 71, 26, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 70, 71, 127, 155, 159, 161, 164, 155,
- 161, 164, 155, 164, 155, 156, 159, 161, 164, 71,
+ 75, 75, 71, 75, 73, 75, 75, 129, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 79, 75,
+ 6, 75, 75, 75, 75, 75, 75, 75, 75, 23,
+ 75, 26, 75, 25, 75, 75, 22, 75, 29, 75,
+ 37, 75, 39, 75, 75, 75, 75, 75, 44, 75,
+ 75, 55, 75, 75, 58, 75, 75, 59, 75, 60,
+ 75, 75, 63, 75, 75, 75, 72, 75, 75, 125,
+ 132, 130, 163, 165, 168, 165, 168, 168, 160, 163,
+ 165, 168, 75, 75, 75, 75, 75, 16, 75, 17,
+ 75, 75, 75, 75, 27, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 65, 71, 124, 159, 161, 164, 161,
- 164, 164, 156, 159, 161, 164, 71, 71, 71, 18,
- 71, 71, 71, 52, 71, 71, 71, 71, 71, 71,
- 123, 122, 9, 71, 71, 14, 71, 71, 71, 71,
- 71, 71, 71, 71
+ 75, 75, 75, 75, 75, 75, 75, 74, 75, 131,
+ 159, 163, 165, 168, 159, 165, 168, 159, 168, 159,
+ 160, 163, 165, 168, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 69, 75, 128, 163, 165, 168, 165, 168,
+ 168, 160, 163, 165, 168, 75, 75, 75, 18, 75,
+ 75, 75, 75, 75, 75, 56, 75, 75, 75, 75,
+ 75, 75, 127, 126, 9, 75, 75, 14, 75, 75,
+ 75, 75, 75, 75, 75, 75
} ;
-static yyconst flex_int16_t yy_accept[568] =
+static yyconst flex_int16_t yy_accept[596] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
@@ -502,49 +505,53 @@
415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
- 454, 455, 456, 457, 458, 459, 460, 461, 462, 464,
- 466, 467, 469, 470, 472, 474, 475, 476, 478, 479,
+ 453, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+ 465, 467, 468, 470, 471, 473, 475, 476, 477, 478,
- 481, 482, 483, 484, 485, 486, 487, 488, 490, 491,
- 492, 493, 495, 496, 497, 499, 501, 502, 503, 504,
- 506, 507, 511, 511, 512, 514, 517, 518, 521, 524,
- 526, 528, 530, 532, 534, 536, 537, 538, 539, 539,
- 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
- 549, 550, 551, 552, 553, 555, 558, 560, 561, 565,
- 566, 567, 567, 568, 568, 568, 569, 570, 571, 572,
- 573, 574, 575, 576, 577, 578, 579, 581, 583, 584,
- 586, 587, 588, 589, 590, 591, 592, 593, 594, 595,
- 596, 597, 599, 600, 601, 602, 603, 605, 606, 608,
+ 480, 481, 483, 484, 485, 486, 487, 488, 489, 490,
+ 492, 493, 494, 495, 497, 498, 499, 501, 503, 504,
+ 505, 506, 508, 509, 513, 513, 514, 516, 519, 520,
+ 523, 526, 528, 530, 532, 534, 536, 538, 539, 540,
+ 541, 541, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 554, 555, 557, 560, 562,
+ 563, 567, 568, 569, 569, 570, 570, 570, 571, 572,
+ 573, 574, 575, 576, 577, 578, 579, 580, 581, 582,
+ 584, 586, 587, 589, 590, 591, 592, 593, 594, 595,
+ 596, 597, 598, 599, 600, 602, 603, 604, 605, 606,
- 610, 611, 612, 614, 615, 616, 618, 620, 621, 622,
- 623, 624, 625, 626, 627, 628, 629, 630, 630, 632,
- 633, 635, 637, 639, 641, 642, 643, 646, 648, 649,
- 653, 654, 654, 654, 655, 656, 657, 659, 660, 661,
- 662, 663, 664, 665, 666, 668, 669, 670, 671, 672,
- 674, 675, 677, 679, 681, 683, 685, 686, 687, 689,
- 690, 691, 693, 695, 696, 697, 699, 700, 701, 702,
- 703, 704, 705, 706, 707, 709, 710, 711, 712, 713,
- 715, 717, 718, 719, 720, 721, 722, 723, 723, 723,
- 723, 725, 726, 729, 731, 732, 736, 737, 737, 738,
+ 607, 608, 610, 611, 613, 615, 616, 617, 619, 620,
+ 621, 623, 625, 626, 627, 628, 629, 630, 631, 632,
+ 633, 634, 635, 635, 637, 638, 640, 642, 644, 646,
+ 647, 648, 651, 653, 654, 658, 659, 659, 659, 660,
+ 661, 662, 664, 665, 666, 667, 668, 669, 671, 672,
+ 673, 675, 676, 677, 678, 679, 680, 682, 683, 685,
+ 687, 689, 691, 693, 694, 695, 697, 698, 699, 700,
+ 701, 703, 704, 706, 708, 709, 710, 712, 713, 714,
+ 715, 716, 717, 718, 719, 720, 722, 723, 724, 725,
+ 726, 728, 730, 731, 732, 733, 734, 735, 736, 736,
- 739, 740, 742, 743, 745, 747, 748, 749, 750, 751,
- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761,
- 762, 763, 765, 767, 768, 769, 771, 772, 773, 774,
- 775, 776, 777, 779, 780, 781, 782, 784, 785, 787,
- 789, 790, 790, 791, 791, 791, 791, 794, 796, 797,
- 801, 802, 803, 805, 806, 807, 808, 809, 810, 811,
- 813, 815, 817, 818, 820, 822, 824, 826, 827, 828,
- 829, 830, 832, 833, 835, 836, 838, 840, 841, 843,
- 844, 845, 847, 848, 848, 848, 849, 850, 851, 851,
- 854, 856, 857, 861, 862, 863, 864, 865, 866, 868,
+ 736, 736, 738, 739, 742, 744, 745, 749, 750, 750,
+ 751, 752, 753, 755, 756, 758, 760, 761, 762, 763,
+ 764, 765, 766, 767, 768, 769, 770, 771, 772, 773,
+ 774, 775, 776, 777, 778, 780, 781, 783, 785, 786,
+ 787, 789, 790, 791, 792, 793, 794, 795, 797, 798,
+ 799, 800, 802, 803, 805, 807, 808, 808, 809, 809,
+ 809, 809, 812, 814, 815, 819, 820, 821, 823, 824,
+ 825, 826, 827, 828, 829, 830, 832, 834, 836, 837,
+ 839, 841, 843, 845, 846, 847, 848, 849, 851, 852,
+ 854...
[truncated message content] |
|
From: <bla...@us...> - 2008-06-01 19:27:17
|
Revision: 18825
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18825&view=rev
Author: blackystardust
Date: 2008-06-01 12:23:33 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
fresh copy of the 1.22.16 branch to my ports branch
Added Paths:
-----------
branches/marco/ports/
Copied: branches/marco/ports (from rev 18824, tags/v1.22/v1.22.16)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 19:27:01
|
Revision: 18824
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18824&view=rev
Author: blackystardust
Date: 2008-06-01 12:22:27 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
redoing my ports branch.
Removed Paths:
-------------
branches/marco/ports/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 18:13:32
|
Revision: 18823
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18823&view=rev
Author: blackystardust
Date: 2008-06-01 11:13:39 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Fixed up my branch
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
Added Paths:
-----------
branches/marco/ports/vice/build/macosx/build-vice-release.sh
branches/marco/ports/vice/data/C64/osx_sym_de.vkm
branches/marco/ports/vice/data/C64/osx_sym_us.vkm
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/VICE.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/cartridge.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/floppy525.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/tape.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/x128.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/x64.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/x65.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/xcbm2.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/xpet.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/xplus4.icns
branches/marco/ports/vice/src/arch/unix/macosx/Resources/xvic.icns
branches/marco/ports/vice/src/arch/unix/macosx/VICE.xcodeproj/
branches/marco/ports/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.m
Removed Paths:
-------------
branches/marco/ports/vice/po/de.gmo
branches/marco/ports/vice/po/fr.gmo
branches/marco/ports/vice/po/hu.gmo
branches/marco/ports/vice/po/it.gmo
branches/marco/ports/vice/po/nl.gmo
branches/marco/ports/vice/po/pl.gmo
branches/marco/ports/vice/po/stamp-cat-id
branches/marco/ports/vice/po/sv.gmo
branches/marco/ports/vice/po/vice.pot
Added: branches/marco/ports/vice/build/macosx/build-vice-release.sh
===================================================================
--- branches/marco/ports/vice/build/macosx/build-vice-release.sh (rev 0)
+++ branches/marco/ports/vice/build/macosx/build-vice-release.sh 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,153 @@
+#!/bin/bash
+#
+# build snapshot binaries for x11 gtk and cocoa from the SVN
+#
+# written by Christian Vogelgsang <ch...@vo...>
+#
+# Usage:
+# build-vice-release [-s] [<vice-svn-repository>] [<path to extlib>] [<target dir>] [<arch>] [<uis>]
+# -s = snapshot
+
+echo "--- build VICE release from SVN repository ---"
+
+# is a snapshot
+SNAPSHOT=0
+if [ "x$1" = "x-s" ]; then
+ SNAPSHOT=1
+ shift
+fi
+
+# check repository directory
+SVN_REPO="$1"
+if [ "x$SVN_REPO" = x ]; then
+ SVN_REPO=vice-emu-cocoa
+fi
+if [ ! -d "$SVN_REPO" ]; then
+ echo "ERROR: SVN repository '$SVN_REPO' not found!"
+ exit 1
+fi
+SVN_REPO="`(cd \"$SVN_REPO\" && pwd -P)`"
+echo "SVN repository: $SVN_REPO"
+
+# check extlib directory
+EXTLIB="$2"
+if [ "x$EXTLIB" = x ]; then
+ EXTLIB=extlib
+fi
+if [ ! -d "$EXTLIB" ]; then
+ echo "ERROR: external libs '$EXTLIB' not found!"
+ exit 1
+fi
+EXTLIB="`(cd \"$EXTLIB\" && pwd)`"
+echo "external libs: $EXTLIB"
+
+# check target dir
+BUILD_DIR="$3"
+if [ "x$BUILD_DIR" = x ]; then
+ if [ $SNAPSHOT = 1 ]; then
+ BUILD_DIR=build-vice-snapshot
+ else
+ BUILD_DIR=build-vice-release
+ fi
+fi
+if [ -d "$BUILD_DIR" ]; then
+ echo "ERROR: $BUILD_DIR already exists!"
+ exit 1
+fi
+BUILD_DIR="`pwd`/$BUILD_DIR"
+echo "build dir: $BUILD_DIR"
+
+# get revision of build
+REVISION=`(cd "$SVN_REPO" && svn info | grep Revision | awk '{ print $2 }')`
+echo "SVN revision: $REVISION"
+
+# create build src dir
+echo "creating dir $BUILD_DIR"
+mkdir -p "$BUILD_DIR"
+if [ ! -d "$BUILD_DIR" ]; then
+ echo "ERROR: can't creat dir!"
+ exit 1
+fi
+
+# export fresh source
+SRC_DIR="$BUILD_DIR/src"
+echo "exporting src $SRC_DIR"
+svn export "$SVN_REPO" "$SRC_DIR"
+if [ $? != 0 ]; then
+ echo "ERROR: export faild!"
+ exit 1
+fi
+
+# patch BUILD version if doing snapshot
+if [ $SNAPSHOT = 1 ]; then
+ # tag
+ DATE=`date '+%Y%m%d'`
+ TAG="-r${REVISION}_$DATE"
+
+ # patch VICE_VERSION_BUILD
+ echo "patching configure.in: $TAG"
+ PATCH_VVB="$SRC_DIR/configure.in"
+ perl -pi -e "s/(VICE_VERSION_BUILD=\d+).*\$/\$1$TAG/" $PATCH_VVB
+ if [ $? != 0 ]; then
+ echo "ERROR: patching..."
+ exit 1
+ fi
+fi
+
+# configure snapshot
+echo "configuring new source tree"
+(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring resid..."
+ exit 1
+fi
+(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring VICE..."
+ exit 1
+fi
+
+# build dists
+ARCH="$4"
+if [ "x$ARCH" = "x" ]; then
+ ARCH="ub"
+fi
+UI="$5"
+if [ "x$UI" = "x" ]; then
+ UI="x11 gtk cocoa"
+fi
+if [ "$UI" != "none" ]; then
+ echo "--- binaries for $UI ---"
+ for dist in $UI ; do
+ echo "building binaries for $dist/$ARCH"
+ LOG="$BUILD_DIR/build-$dist.log"
+ (cd "$SRC_DIR" && $BASH build/macosx/build-vice-dist.sh $ARCH $dist dmg "$EXTLIB" "$BUILD_DIR") >"$LOG" 2>&1
+ FILES="$(ls $BUILD_DIR/$dist/$ARCH/*.dmg 2>/dev/null)"
+ echo "generated files: $FILES"
+ if [ "x$FILES" = "x" ]; then
+ echo "no file found!"
+ exit 1
+ fi
+ grep +++ "$LOG"
+ du -sh "$FILES"
+ mv "$FILES" "$BUILD_DIR"
+ done
+fi
+
+# packing source
+echo "--- source ---"
+echo "packing source"
+DEST_DIR="$BUILD_DIR/tarball"
+mkdir "$DEST_DIR"
+if [ ! -d "$DEST_DIR" ]; then
+ echo "ERROR: creating dir"
+ exit 1
+fi
+(cd "$DEST_DIR" && $SRC_DIR/configure && make dist) >/dev/null 2>&1
+FILES="$(ls $DEST_DIR/*.tar.gz 2>/dev/null)"
+echo "generated: $FILES"
+du -sh "$FILES"
+mv "$FILES" "$BUILD_DIR"
+
+echo "--- ready ---"
+exit 0
Property changes on: branches/marco/ports/vice/build/macosx/build-vice-release.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/data/C64/osx_sym_de.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_sym_de.vkm (rev 0)
+++ branches/marco/ports/vice/data/C64/osx_sym_de.vkm 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,154 @@
+# 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 line has '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)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 3 1 8 /* Y -> Y */
+7 2 7 8 /* X -> X */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 1 4 8 /* Z -> Z */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 0 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 3 0 1 /* ` -> ´ ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 32 /* 7 -> 7 !! */
+26 6 7 16 /* 7 -> / !! */
+27 6 7 1 /* \ss -> ? ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 32 /* 0 -> 0 !! */
+29 6 5 16 /* 0 -> 0 !! */
+30 5 0 32 /* Plus -> + !! */
+30 6 1 16 /* Plus -> * !! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+#33 5 6 8 /* "U -> ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+#39 6 2 8 /* "A -> ! */
+40 4 5 8 /* K -> K */
+#41 5 5 8 /* "O -> ! */
+42 1 0 33 /* Hash -> # !! */
+42 3 0 1 /* Hash -> ' !! */
+43 5 7 32 /* , -> , !! */
+43 6 2 16 /* , -> ; !! */
+44 5 3 0 /* Minus -> Minus ! */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 32 /* . -> . !! */
+47 5 5 16 /* . -> : !! */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 5 7 33 /* < > -> < !! */
+50 5 4 1 /* < > -> > !! */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Property changes on: branches/marco/ports/vice/data/C64/osx_sym_de.vkm
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/data/C64/osx_sym_us.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_sym_us.vkm (rev 0)
+++ branches/marco/ports/vice/data/C64/osx_sym_us.vkm 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,150 @@
+# 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 line has '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)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 1 4 8 /* Z -> Z */
+7 2 7 8 /* X -> X ! */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 3 1 8 /* Y -> Y ! */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 8 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 6 5 32 /* = -> = ! */
+24 5 0 0 /* = -> + ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 8 /* 7 -> 7 */
+27 5 3 0 /* - -> - ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 8 /* 0 -> 0 */
+30 6 2 1 /* ] -> ] ! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+33 5 5 1 /* [ -> [ ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+39 3 0 33 /* ' -> ' ! */
+39 7 3 1 /* " -> " ! */
+40 4 5 8 /* K -> K */
+41 6 2 32 /* ; -> ; ! */
+41 5 5 16 /* ; -> : ! */
+42 6 6 8 /* \ -> Up Arrow ! */
+43 5 7 8 /* , -> , */
+44 6 7 8 /* / -> / */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 8 /* . -> . */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 7 5 8 /* < > -> CBM */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Property changes on: branches/marco/ports/vice/data/C64/osx_sym_us.vkm
___________________________________________________________________
Name: svn:executable
+ *
Deleted: branches/marco/ports/vice/po/de.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/fr.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/hu.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/it.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/nl.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/pl.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/stamp-cat-id
===================================================================
Deleted: branches/marco/ports/vice/po/sv.gmo
===================================================================
(Binary files differ)
Deleted: branches/marco/ports/vice/po/vice.pot
===================================================================
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>activateOpenCMBDevice</key>
+ <string>id</string>
+ <key>activateRawFloppyDevice</key>
+ <string>id</string>
+ <key>attachImage</key>
+ <string>id</string>
+ <key>autostartImage</key>
+ <string>id</string>
+ <key>changeAttachReadOnly</key>
+ <string>id</string>
+ <key>changeHideNonP00Files</key>
+ <string>id</string>
+ <key>changeReadP00Files</key>
+ <string>id</string>
+ <key>changeUseIECDrive</key>
+ <string>id</string>
+ <key>changeWriteP00Files</key>
+ <string>id</string>
+ <key>mountDir</key>
+ <string>id</string>
+ <key>toggleDrive</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>IECDriveSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>attachImage</key>
+ <string>NSButton</string>
+ <key>attachReadOnly</key>
+ <string>NSButton</string>
+ <key>autostartImage</key>
+ <string>NSButton</string>
+ <key>dirPath</key>
+ <string>NSTextField</string>
+ <key>driveChooser</key>
+ <string>NSSegmentedControl</string>
+ <key>enableIECDrive</key>
+ <string>NSButton</string>
+ <key>hideNonP00Files</key>
+ <string>NSButton</string>
+ <key>imagePath</key>
+ <string>NSTextField</string>
+ <key>mountDir</key>
+ <string>NSButton</string>
+ <key>readP00Files</key>
+ <string>NSButton</string>
+ <key>status</key>
+ <string>NSTextField</string>
+ <key>useOpenCBMDevice</key>
+ <string>NSButton</string>
+ <key>useRawFloppy</key>
+ <string>NSButton</string>
+ <key>writeP00Files</key>
+ <string>NSButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>2</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9B18</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedKeymapFile</key>
+ <string>id</string>
+ <key>dumpKeymap</key>
+ <string>id</string>
+ <key>pickKeymap</key>
+ <string>id</string>
+ <key>selectKeymap</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>KeyboardSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>keymapSelector</key>
+ <string>NSMatrix</string>
+ <key>posFile</key>
+ <string>NSTextField</string>
+ <key>symDEFile</key>
+ <string>NSTextField</string>
+ <key>symUSFile</key>
+ <string>NSTextField</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>1</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9C7010</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedDriver</key>
+ <string>id</string>
+ <key>changedIECDevice</key>
+ <string>id</string>
+ <key>changedOutput</key>
+ <string>id</string>
+ <key>changedPrinterEmulation</key>
+ <string>id</string>
+ <key>changedPrinterTextDevice</key>
+ <string>id</string>
+ <key>changedTextDevice</key>
+ <string>id</string>
+ <key>doSendFormFeed</key>
+ <string>id</string>
+ <key>togglePrinter</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>PrinterSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>driver</key>
+ <string>NSPopUpButton</string>
+ <key>output</key>
+ <string>NSPopUpButton</string>
+ <key>printerChooser</key>
+ <string>NSSegmentedControl</string>
+ <key>printerEmulation</key>
+ <string>NSPopUpButton</string>
+ <key>printerTextDevice1</key>
+ <string>NSTextField</string>
+ <key>printerTextDevice2</key>
+ <string>NSTextField</string>
+ <key>printerTextDevice3</key>
+ <string>NSTextField</string>
+ <key>sendFormFeed</key>
+ <string>NSButton</string>
+ <key>textDevice</key>
+ <string>NSPopUpButton</string>
+ <key>useIECDevice</key>
+ <string>NSButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>2</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9B18</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedAudioBitrate</key>
+ <string>id</string>
+ <key>changedAudioFormat</key>
+ <string>id</string>
+ <key>changedMediaFileName</key>
+ <string>id</string>
+ <key>changedMediaFormat</key>
+ <string>id</string>
+ <key>changedMediaType</key>
+ <string>id</string>
+ <key>changedVideoBitrate</key>
+ <string>id</string>
+ <key>changedVideoFormat</key>
+ <string>id</string>
+ <key>pickMediaFileName</key>
+ <string>id</string>
+ <key>startRecording</key>
+ <string>id</string>
+ <key>stopRecording</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>RecordMediaWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>audioBitrate</key>
+ <string>NSTextField</string>
+ <key>audioFormat</key>
+ <string>NSPopUpButton</string>
+ <key>mediaFileName</key>
+ <string>NSTextField</string>
+ <key>mediaFileNamePicker</key>
+ <string>NSButton</string>
+ <key>mediaFormat</key>
+ <string>NSPopUpButton</string>
+ <key>mediaType</key>
+ <string>NSPopUpButton</string>
+ <key>startRecord</key>
+ <string>NSButton</string>
+ <key>stopRecord</key>
+ <string>NSButton</string>
+ <key>videoBitrate</key>
+ <string>NSTextField</string>
+ <key>videoFormat</key>
+ <string>NSPopUpButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../../VICE.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>25</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9C7010</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>ResourceEditorController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>treeView</key>
+ <string>NSOutlineView</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>1</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9C7010</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>Cartridges</key>
+ <dict>
+ <key>256K</key>
+ <dict>
+ <key>Base Address</key>
+ <string>C64_256Kbase,E,$DE00,$DE80,$DF00,$DF80</string>
+ <key>Enable</key>
+ <string>C64_256K,b</string>
+ <key>Image File</key>
+ <string>C64_256Kfilename,fs</string>
+ </dict>
+ <key>ACIA</key>
+ <dict>
+ <key>Device</key>
+ <string>Acia1Dev,e,RS232 Device 1,RS232 Device 2,RS232 Device 3,RS232 Device 4</string>
+ <key>Enable</key>
+ <string>Acia1Enable,b</string>
+ <key>Interrupt</key>
+ <string>Acia1Irq,e,None,IRQ,NMI</string>
+ <key>Mode</key>
+ <string>Acia1Mode,e,Normal,Swiftlink,Turbo232</string>
+ </dict>
+ <key>DIGIMAX</key>
+ <dict>
+ <key>Base Address</key>
+ <string>DIGIMAXbase,E,$DD00,$DE00,$DE20,$DE40,$DE60,$DE80,$DEA0,$DEC0,$DEE0,$DF00,$DF20,$DF40,$DF60,$DF80,$DFA0,$DFC0,$DFE0</string>
+ <key>Enable</key>
+ <string>DIGIMAX,b</string>
+ </dict>
+ <key>GEORAM</key>
+ <dict>
+ <key>Enable</key>
+ <string>GEORAM,b</string>
+ <key>Image File</key>
+ <string>GEORAMsize,E,64,128,256,512,1024,2048,4096</string>
+ <key>Size (KiB)</key>
+ <string>GEORAMfilename,fs</string>
+ </dict>
+ <key>IDE64</key>
+ <dict>
+ <key>Autodetect Size</key>
+ <string>IDE64AutodetectSize,b</string>
+ <key>Cylinders</key>
+ <string>IDE64Cylinders,i</string>
+ <key>HD Image File</key>
+ <string>IDE64Image,fs</string>
+ <key>Heads</key>
+ <string>IDE64Heads,i</string>
+ <key>Sectors</key>
+ <string>IDE64Sectors,i</string>
+ </dict>
+ <key>MMC64</key>
+ <dict>
+ <key>BIOS File</key>
+ <string>MMC64BIOSfilename,fs</string>
+ <key>BIOS Revision</key>
+ <string>MMC64_revision,e,Rev A,Rev B</string>
+ <key>Enable</key>
+ <string>MMC64,b</string>
+ <key>Enable BIOS Flash Jumper</key>
+ <string>MMC64_flashjumper,b</string>
+ <key>MMC/SD Image</key>
+ <string>MMC64imagefilename,fs</string>
+ <key>MMC/SD Image read-only</key>
+ <string>MMC64_RO,b</string>
+ <key>Save BIOS when changed</key>
+ <string>MMC64_bios_write,b</string>
+ </dict>
+ <key>Plus256k</key>
+ <dict>
+ <key>Enable</key>
+ <string>PLUS256K,b</string>
+ <key>Image File</key>
+ <string>PLUS256Kfilename,fs</string>
+ </dict>
+ <key>Plus60k</key>
+ <dict>
+ <key>Base Address</key>
+ <string>PLUS60Kbase,E,$D040,$D100</string>
+ <key>Enable</key>
+ <string>PLUS60K,b</string>
+ <key>Image File</key>
+ <string>PLUS60Kfilename,fs</string>
+ </dict>
+ <key>RAMCART</key>
+ <dict>
+ <key>Enable</key>
+ <string>RAMCART,b</string>
+ <key>Image File</key>
+ <string>RAMCARTfilename,fs</string>
+ <key>Read Only</key>
+ <string>RAMCART_RO,b</string>
+ <key>Size (KiB)</key>
+ <string>RAMCARTsize,E,64,128</string>
+ </dict>
+ <key>REU</key>
+ <dict>
+ <key>Enable</key>
+ <string>REU,b</string>
+ <key>Image File</key>
+ <string>REUfilename,fs</string>
+ <key>Size (KiB)</key>
+ <string>REUsize,E,128,256,512,1024,2048,4096,8192,16384</string>
+ </dict>
+ <key>TFE/RRNet</key>
+ <dict>
+ <key>Enable</key>
+ <string>ETHERNET_ACTIVE,b</string>
+ <key>Interface</key>
+ <string>ETHERNET_INTERFACE,s</string>
+ <key>RRNet</key>
+ <string>ETHERNET_AS_RR,b</string>
+ </dict>
+ </dict>
+ <key>Datasette</key>
+ <dict>
+ <key>Reset with CPU</key>
+ <string>DatasetteResetWithCPU,b</string>
+ <key>Speed Tuning</key>
+ <string>DatasetteSpeedTuning,E,0,1,2,3,4,5,6,7</string>
+ <key>Zero Gap Delay</key>
+ <string>DatasetteZeroGapDelay,E,1000,2000,5000,10000,20000,50000,100000</string>
+ </dict>
+ <key>Peripherals</key>
+ <dict>
+ <key>RS232</key>
+ <dict>
+ <key>Device 1</key>
+ <string>RsDevice1,s</string>
+ <key>Device 2</key>
+ <string>RsDevice2,s</string>
+ <key>Device 3</key>
+ <string>RsDevice3,s</string>
+ <key>Device 4</key>
+ <string>RsDevice4,s</string>
+ </dict>
+ <key>Userport RS232</key>
+ <dict>
+ <key>Baud Rate</key>
+ <string>RsUserBaud,E,300,600,1200,2400,4800,9600</string>
+ <key>Enable</key>
+ <string>RsUserEnable,b</string>
+ <key>RS232 Device</key>
+ <string>RsUserDev,e,Device 1,Device 2,Device 3,Device 4</string>
+ </dict>
+ </dict>
+ <key>RAM</key>
+ <dict>
+ <key>Length of constant pattern</key>
+ <string>RAMInitPatternInvert,i</string>
+ <key>Length of constant values</key>
+ <string>RAMInitValueInvert,i</string>
+ <key>Value of first Byte</key>
+ <string>RAMInitStartValue,i</string>
+ </dict>
+ <key>SID</key>
+ <dict>
+ <key>Engine</key>
+ <string>SidEngine,e,Fast SID,ReSID</string>
+ <key>Filters</key>
+ <string>SidFilters,b</string>
+ <key>Model</key>
+ <string>SidModel,e,6581,8580</string>
+ <key>ReSID</key>
+ <dict>
+ <key>Passband (0-90%)</key>
+ <string>SidResidPassband,r,0,90</string>
+ <key>Sample Method</key>
+ <string>SidResidSampling,e,Fast,Interpolating,Resampling,Fast Resampling</string>
+ </dict>
+ <key>Stereo SID</key>
+ <dict>
+ <key>Base Address</key>
+ <string>SidStereoStartAddress,e,$D4,$D5,$D6,$D7,$DE,$DF</string>
+ <key>Enable</key>
+ <string>SidStereo,b</string>
+ </dict>
+ </dict>
+ <key>VIC II</key>
+ <dict>
+ <key>Border Mode</key>
+ <string>VICIIBorderMode,e,Normal,Full,Debug</string>
+ <key>Check Sprite Background Collision</key>
+ <string>VICIICheckSbColl,b</string>
+ <key>Check Sprite Sprite Collision</key>
+ <string>VICIICheckSsColl,b</string>
+ <key>New Luminances</key>
+ <string>VICIINewLuminances,b</string>
+ </dict>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changeBufferSize</key>
+ <string>id</string>
+ <key>changeOversample</key>
+ <string>id</string>
+ <key>changeSampleRate</key>
+ <string>id</string>
+ <key>changeSpeedAdjustment</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>SoundSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>bufferSizeButton</key>
+ <string>NSPopUpButton</string>
+ <key>oversampleButton</key>
+ <string>NSPopUpButton</string>
+ <key>sampleRateButton</key>
+ <string>NSPopUpButton</string>
+ <key>speedAdjustmentButton</key>
+ <string>NSPopUpButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>39</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9C31</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/VICE.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/VICE.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/cartridge.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/cartridge.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/floppy525.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/floppy525.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/tape.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/tape.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x128.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x128.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x64.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x64.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x65.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/x65.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xcbm2.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xcbm2.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xpet.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xpet.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xplus4.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xplus4.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xvic.icns
===================================================================
(Binary files differ)
Property changes on: branches/marco/ports/vice/src/arch/unix/macosx/Resources/xvic.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/marco/ports/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj (rev 0)
+++ branches/marco/ports/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj 2008-06-01 18:13:39 UTC (rev 18823)
@@ -0,0 +1,628 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 83E499CD0DE4CA54001DE90F /* IECDriveSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4997B0DE4C8C8001DE90F /* IECDriveSettings.nib */; };
+ 83E499CE0DE4CA54001DE90F /* SoundSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4998D0DE4C8C8001DE90F /* SoundSettings.nib */; };
+ 83E499CF0DE4CA54001DE90F /* KeyboardSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4997F0DE4C8C8001DE90F /* KeyboardSettings.nib */; };
+ 83E499D00DE4CA54001DE90F /* DriveSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499790DE4C8C8001DE90F /* DriveSettings.nib */; };
+ 83E499D20DE4CA54001DE90F /* PrinterSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499850DE4C8C8001DE90F /* PrinterSettings.nib */; };
+ 83E499D30DE4CA54001DE90F /* VICEInformation.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4998F0DE4C8C8001DE90F /* VICEInformation.nib */; };
+ 83E499D40DE4CA54001DE90F /* ResourceEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499890DE4C8C8001DE90F /* ResourceEditor.nib */; };
+ 83E499D50DE4CA54001DE90F /* x64.nib in Resources */ = {isa = P...
[truncated message content] |
|
From: <bla...@us...> - 2008-06-01 17:44:25
|
Revision: 18822
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18822&view=rev
Author: blackystardust
Date: 2008-06-01 10:44:09 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Deleted the files that were deleted before
Removed Paths:
-------------
branches/marco/ports/vice/aclocal.m4
branches/marco/ports/vice/depcomp
branches/marco/ports/vice/missing
branches/marco/ports/vice/src/resid/aclocal.m4
branches/marco/ports/vice/src/resid/config.guess
branches/marco/ports/vice/src/resid/config.sub
branches/marco/ports/vice/src/resid/configure
branches/marco/ports/vice/src/resid/depcomp
branches/marco/ports/vice/src/resid/install-sh
branches/marco/ports/vice/src/resid/missing
branches/marco/ports/vice/src/resid/mkinstalldirs
Deleted: branches/marco/ports/vice/aclocal.m4
===================================================================
Deleted: branches/marco/ports/vice/depcomp
===================================================================
Deleted: branches/marco/ports/vice/missing
===================================================================
Deleted: branches/marco/ports/vice/src/resid/aclocal.m4
===================================================================
Deleted: branches/marco/ports/vice/src/resid/config.guess
===================================================================
Deleted: branches/marco/ports/vice/src/resid/config.sub
===================================================================
Deleted: branches/marco/ports/vice/src/resid/configure
===================================================================
Deleted: branches/marco/ports/vice/src/resid/depcomp
===================================================================
Deleted: branches/marco/ports/vice/src/resid/install-sh
===================================================================
Deleted: branches/marco/ports/vice/src/resid/missing
===================================================================
Deleted: branches/marco/ports/vice/src/resid/mkinstalldirs
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 17:32:01
|
Revision: 18821
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18821&view=rev
Author: blackystardust
Date: 2008-06-01 10:31:30 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
have to redo because of previously deleted files still showing up in my branch
Removed Paths:
-------------
tags/marco/v1.22.16-fixes-vp-memmap/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 16:38:03
|
Revision: 18820
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18820&view=rev
Author: blackystardust
Date: 2008-06-01 09:38:12 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Tagged my latest fixes and addition of the memmap feature from VICEplus
Added Paths:
-----------
tags/marco/v1.22.16-fixes-vp-memmap/
Copied: tags/marco/v1.22.16-fixes-vp-memmap (from rev 18819, branches/marco/ports)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 16:33:26
|
Revision: 18819
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18819&view=rev
Author: blackystardust
Date: 2008-06-01 09:33:26 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Added #include <strings.h> to some headers, which was needed for the SCO ports and fixed a typo (missing semi-colon)
Modified Paths:
--------------
branches/marco/ports/vice/po/intl2po.c
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/marco/ports/vice/src/c1541.c
branches/marco/ports/vice/src/c64/patchrom.c
branches/marco/ports/vice/src/monitor/mon_assemble6502.c
branches/marco/ports/vice/src/monitor/mon_assemblez80.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/resources.c
branches/marco/ports/vice/src/sound.c
branches/marco/ports/vice/src/util.c
branches/marco/ports/vice/src/zfile.c
Modified: branches/marco/ports/vice/po/intl2po.c
===================================================================
--- branches/marco/ports/vice/po/intl2po.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/po/intl2po.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef _SCO_ELF
+#include <strings.h>
+#endif
+
/* status definitions */
#define SCANNING 0
#define STRINGTABLE_BEGIN_SCAN 1
Modified: branches/marco/ports/vice/src/arch/unix/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -44,6 +44,10 @@
#include <vfork.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "findpath.h"
#include "ioutil.h"
Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -68,7 +68,7 @@
static void pal_ctrl_reset (GtkWidget *w, gpointer data)
{
- unsigned int i
+ unsigned int i;
int tmp;
for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
Modified: branches/marco/ports/vice/src/c1541.c
===================================================================
--- branches/marco/ports/vice/src/c1541.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/c1541.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -54,6 +54,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "cbmdos.h"
#include "cbmimage.h"
Modified: branches/marco/ports/vice/src/c64/patchrom.c
===================================================================
--- branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -35,6 +35,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "log.h"
#include "c64memrom.h"
#include "patchrom.h"
Modified: branches/marco/ports/vice/src/monitor/mon_assemble6502.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -30,6 +30,10 @@
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_assemblez80.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -29,6 +29,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -31,6 +31,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "mon_command.h"
#include "montypes.h"
#include "mon_parse.h" /* FIXME ! */
Modified: branches/marco/ports/vice/src/monitor/monitor.c
===================================================================
--- branches/marco/ports/vice/src/monitor/monitor.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/monitor.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -37,6 +37,10 @@
#include <direct.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "charset.h"
#include "cmdline.h"
Modified: branches/marco/ports/vice/src/resources.c
===================================================================
--- branches/marco/ports/vice/src/resources.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/resources.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -41,7 +41,7 @@
#include <string.h>
#include <ctype.h>
-#if 0
+#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
Modified: branches/marco/ports/vice/src/sound.c
===================================================================
--- branches/marco/ports/vice/src/sound.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/sound.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -34,6 +34,10 @@
#include <string.h>
#include <time.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "clkguard.h"
#include "cmdline.h"
Modified: branches/marco/ports/vice/src/util.c
===================================================================
--- branches/marco/ports/vice/src/util.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/util.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -33,6 +33,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "ioutil.h"
#include "lib.h"
Modified: branches/marco/ports/vice/src/zfile.c
===================================================================
--- branches/marco/ports/vice/src/zfile.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/zfile.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -45,6 +45,10 @@
#include <zlib.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "ioutil.h"
#include "lib.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 03:24:05
|
Revision: 18818
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18818&view=rev
Author: blackystardust
Date: 2008-05-31 20:24:13 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Added the memmap feature from VICEplus, it is a feature that shows what memory places have been accessed and how. Because of the CPU overhead the feature is activated with the configure option --enable-memmap
Modified Paths:
--------------
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/src/6510core.c
branches/marco/ports/vice/src/c64/c64mem.c
branches/marco/ports/vice/src/gfxoutput.h
branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
branches/marco/ports/vice/src/maincpu.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/mon_lex.c
branches/marco/ports/vice/src/monitor/mon_lex.l
branches/marco/ports/vice/src/monitor/mon_parse.c
branches/marco/ports/vice/src/monitor/mon_parse.h
branches/marco/ports/vice/src/monitor/mon_parse.y
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/monitor/montypes.h
branches/marco/ports/vice/src/monitor.h
branches/marco/ports/vice/src/screenshot.c
branches/marco/ports/vice/src/screenshot.h
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/configure.in 2008-06-01 03:24:13 UTC (rev 18818)
@@ -64,8 +64,8 @@
AC_ARG_WITH(oss, [ --without-oss do not use the OSS sound system])
AC_ARG_ENABLE(sdl, [ --with-sdl use sdl sound system])
AC_ARG_WITH(resid, [ --without-resid do not use the reSID engine])
-AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
-AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
+AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
+AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
AC_ARG_ENABLE(fullscreen, [ --enable-fullscreen enable XFree86 fullscreen detection], [ echo checking for XFree86 fullscreen requested...], [enable_fullscreen="no"; echo no explicit checking for XFree86 fullscreen requested, disabling fullscreen...])
AC_ARG_ENABLE(gnomeui,[ --enable-gnomeui enables gnome ui support])
AC_ARG_ENABLE(nls,[ --disable-nls disables national language support])
@@ -76,8 +76,13 @@
AC_ARG_ENABLE(parsid,[ --enable-parsid enables ParSID support])
AC_ARG_WITH(picasso96, [ --with-picasso96 use Amiga P96 grafix system instead of cgx])
AC_ARG_ENABLE(bundle, [ --disable-bundle do not use application bundles on Macs])
-AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_ENABLE(memmap, [ --enable-memmap enable the mem map feature])
+if test x"$enable_memmap" = "xyes"; then
+ AC_DEFINE(FEATURE_CPUMEMHISTORY,,[Use the memmap feature.])
+fi
+
if test x"$enable_gnomeui" = "xyes" ; then
AC_DEFINE(USE_GNOMEUI,,[Use GNOME UI.])
fi
Modified: branches/marco/ports/vice/src/6510core.c
===================================================================
--- branches/marco/ports/vice/src/6510core.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/6510core.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -1778,8 +1778,30 @@
#endif
#endif
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ memmap_state |= (MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
FETCH_OPCODE(opcode);
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ /* HACK to cope with FETCH_OPCODE optimization in x64 */
+ if (((int)reg_pc) < bank_limit) {
+ memmap_mem_read(reg_pc);
+ }
+
+ if(p0 == 0x20) {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(LOAD(reg_pc+2)));
+ } else {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(p2 >> 8));
+ }
+ memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
#ifdef DEBUG
#ifdef DRIVE_CPU
if (TRACEFLG) {
Modified: branches/marco/ports/vice/src/c64/c64mem.c
===================================================================
--- branches/marco/ports/vice/src/c64/c64mem.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/c64/c64mem.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -218,7 +218,12 @@
BYTE REGPARM1 zero_read(WORD addr)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ if(!(memmap_state & MEMMAP_STATE_IGNORE)) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ }
+#endif
switch ((BYTE)addr) {
case 0:
return pport.dir_read;
@@ -242,7 +247,9 @@
void REGPARM2 zero_store(WORD addr, BYTE value)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+#endif
switch ((BYTE)addr) {
case 0:
if (vbank == 0) {
Modified: branches/marco/ports/vice/src/gfxoutput.h
===================================================================
--- branches/marco/ports/vice/src/gfxoutput.h 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutput.h 2008-06-01 03:24:13 UTC (rev 18818)
@@ -27,6 +27,8 @@
#ifndef _GFXOUTPUT_H
#define _GFXOUTPUT_H
+#include "types.h"
+
struct screenshot_s;
typedef struct gfxoutputdrv_s {
@@ -38,6 +40,9 @@
int (*write)(struct screenshot_s *);
int (*save)(struct screenshot_s *, const char *);
int (*record)(struct screenshot_s *);
+#ifdef FEATURE_CPUMEMHISTORY
+ int (*savememmap)(const char *, int, int, BYTE *, BYTE *);
+#endif
} gfxoutputdrv_t;
/* Functions called by external emulator code. */
Modified: branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -348,6 +348,154 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *bmpdrv_memmap_fd;
+static char *bmpdrv_memmap_ext_filename;
+static BYTE *bmpdrv_memmap_bmp_data;
+
+static int bmpdrv_close_memmap(int x_size, int y_size)
+{
+ fwrite(bmpdrv_memmap_bmp_data, y_size * x_size, 1, bmpdrv_memmap_fd);
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ lib_free(bmpdrv_memmap_bmp_data);
+ return 0;
+}
+
+static DWORD bmpdrv_memmap_bmp_size(int x_size, int y_size)
+{
+ DWORD size = 0;
+
+ size = (DWORD)((14 + 40 + 4 * 256) + (x_size * y_size));
+
+ return size;
+}
+
+static int bmpdrv_memmap_write_bitmap_info(int x_size, int y_size, BYTE *palette)
+{
+ BYTE binfo[40];
+ BYTE *bcolor;
+ unsigned int i;
+
+ memset(binfo, 0, sizeof(binfo));
+
+ util_dword_to_le_buf(&binfo[0], sizeof(binfo));
+ util_dword_to_le_buf(&binfo[4], x_size);
+ util_dword_to_le_buf(&binfo[8], y_size);
+
+ binfo[12] = 1;
+ binfo[13] = 0;
+
+ binfo[14] = 8;
+ binfo[15] = 0;
+
+ util_dword_to_le_buf(&binfo[16], 0); /* BI_RGB */
+ util_dword_to_le_buf(&binfo[20], 0);
+
+ /* DPI in Pixels per Meter*/
+ util_dword_to_le_buf(&binfo[24], 0 * 10000 / 254);
+ util_dword_to_le_buf(&binfo[28], 0 * 10000 / 254);
+
+ util_dword_to_le_buf(&binfo[32], 256);
+ util_dword_to_le_buf(&binfo[36], 256);
+
+ if (fwrite(binfo, sizeof(binfo), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ bcolor = (BYTE *)lib_malloc(256 * 4);
+
+ for (i = 0; i < 256; i++)
+ {
+ bcolor[i * 4] = palette[(i*3)+2];
+ bcolor[i * 4 + 1] = palette[(i*3)+1];
+ bcolor[i * 4 + 2] = palette[(i*3)];
+ bcolor[i * 4 + 3] = 0;
+ }
+
+ if (fwrite(bcolor, 256 * 4, 1, bmpdrv_memmap_fd) < 1)
+ {
+ lib_free(bcolor);
+ return -1;
+ }
+
+ lib_free(bcolor);
+ return 0;
+}
+
+static int bmpdrv_memmap_write_file_header(int x_size, int y_size)
+{
+ BYTE header[14];
+
+ memset(header, 0, sizeof(header));
+
+ header[0] = 'B';
+ header[1] = 'M';
+
+ util_dword_to_le_buf(&header[2], bmpdrv_memmap_bmp_size(x_size, y_size));
+
+ util_dword_to_le_buf(&header[10], (14 + 40 + 4 * 256));
+
+ if (fwrite(header, sizeof(header), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ return 0;
+}
+
+static int bmpdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ bmpdrv_memmap_ext_filename = util_add_extension_const(filename, bmp_drv.default_extension);
+
+ bmpdrv_memmap_fd = fopen(bmpdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (bmpdrv_memmap_fd == NULL)
+ {
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_file_header(x_size, y_size) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_bitmap_info(x_size, y_size, palette) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ bmpdrv_memmap_bmp_data = (BYTE *)lib_malloc(x_size*y_size);
+
+ return 0;
+}
+
+static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+{
+ memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
+}
+
+static int bmpdrv_memmap_save(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (bmpdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line=0; line<y_size; line++)
+ {
+ bmpdrv_write_memmap(line, x_size, y_size, gfx);
+ }
+
+ if (bmpdrv_close_memmap(x_size, y_size) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t bmp_drv =
{
"BMP",
@@ -357,7 +505,12 @@
bmpdrv_close,
bmpdrv_write,
bmpdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ bmpdrv_memmap_save
+#else
NULL
+#endif
};
void gfxoutput_init_bmp(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -802,7 +802,12 @@
ffmpegdrv_close,
ffmpegdrv_write,
ffmpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ ffmpegdrv_record,
+ NULL
+#else
ffmpegdrv_record
+#endif
},
/*
{
@@ -836,7 +841,11 @@
ffmpegdrv_record
},
*/
- { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+#endi
+ NULL }
};
void gfxoutput_init_ffmpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -161,6 +161,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static GifFileType *gifdrv_memmap_fd;
+static char *gifdrv_memmap_ext_filename;
+
+static int gifdrv_close_memmap(void)
+{
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int gifdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ if (EGifPutLine(gifdrv_memmap_fd, gfx+(line*x_size), x_size)==GIF_ERROR)
+ return -1;
+
+ return 0;
+}
+
+static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ unsigned int i;
+ GifColorType ColorMap256[256];
+
+ gifdrv_memmap_ext_filename=util_add_extension_const(filename, gif_drv.default_extension);
+
+ gifdrv_memmap_fd=EGifOpenFileName(gifdrv_memmap_ext_filename, FALSE);
+
+ if (gifdrv_memmap_fd==NULL)
+ {
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ gif_colors=MakeMapObject(256, ColorMap256);
+
+ for (i = 0; i < 256; i++)
+ {
+ gif_colors->Colors[i].Blue=palette[(i*3)+2];
+ gif_colors->Colors[i].Green=palette[(i*3)+1];
+ gif_colors->Colors[i].Red=palette[i*3];
+ }
+
+ EGifSetGifVersion("87a");
+
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, FALSE, NULL) == GIF_ERROR)
+ {
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int gifdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (gifdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ gifdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (gifdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t gif_drv =
{
"GIF",
@@ -170,7 +248,12 @@
gifdrv_close,
gifdrv_write,
gifdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ gifdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_gif(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -225,6 +225,136 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *iffdrv_memmap_fd;
+static char *iffdrv_memmap_ext_filename;
+static BYTE *iffdrv_memmap_iff_data;
+static int iffdrv_memmap_iff_rowbytes;
+
+static int iffdrv_close_memmap(void)
+{
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_iff_data);
+ lib_free(iffdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int iffdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ int j;
+
+ for (j = 0; j<8; j++)
+ {
+ iff_c2p(gfx+(x_size*line), iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, j);
+ if (fwrite(iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, 1, iffdrv_memmap_fd)<1)
+ return -1;
+ }
+ return 0;
+}
+
+static int iffdrv_write_file_header_memmap(int x_size, int y_size, BYTE *palette)
+{
+ BYTE header[836];
+ int i;
+ int totalsize;
+
+ memset(header, 0, sizeof(header));
+
+ iffdrv_memmap_iff_rowbytes=((x_size+15)>>4)<<1;
+
+ totalsize=828+(iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ header[0]='F';
+ header[1]='O';
+ header[2]='R';
+ header[3]='M';
+ util_dword_to_be_buf(&header[4], totalsize);
+ header[8]='I';
+ header[9]='L';
+ header[10]='B';
+ header[11]='M';
+ header[12]='B';
+ header[13]='M';
+ header[14]='H';
+ header[15]='D';
+ util_dword_to_be_buf(&header[16], 20);
+ util_word_to_be_buf(&header[20],(WORD)(x_size));
+ util_word_to_be_buf(&header[22],(WORD)(y_size));
+ header[28]=8;
+ util_word_to_be_buf(&header[36],(WORD)(x_size));
+ util_word_to_be_buf(&header[38],(WORD)(y_size));
+ header[40]='C';
+ header[41]='M';
+ header[42]='A';
+ header[43]='P';
+ util_dword_to_be_buf(&header[44],3*256);
+
+ for (i = 0; i < 256; i++)
+ {
+ header[48+(i*3)]=palette[i*3];
+ header[49+(i*3)]=palette[(i*3)+1];
+ header[50+(i*3)]=palette[(i*3)+2];
+ }
+ header[816]='C';
+ header[817]='A';
+ header[818]='M';
+ header[819]='G';
+ util_dword_to_be_buf(&header[820],4);
+ header[828]='B';
+ header[829]='O';
+ header[830]='D';
+ header[831]='Y';
+ util_dword_to_be_buf(&header[832],iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ if (fwrite(header,836,1,iffdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int iffdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ iffdrv_memmap_ext_filename=util_add_extension_const(filename, iff_drv.default_extension);
+ iffdrv_memmap_fd = fopen(iffdrv_memmap_ext_filename, "wb");
+
+ if (iffdrv_memmap_fd==NULL)
+ {
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (iffdrv_write_file_header_memmap(x_size, y_size, palette)<0)
+ {
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ iffdrv_memmap_iff_data = (BYTE *)lib_malloc(iffdrv_memmap_iff_rowbytes);
+
+ return 0;
+}
+
+static int iffdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (iffdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ iffdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (iffdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t iff_drv =
{
"IFF",
@@ -234,7 +364,12 @@
iffdrv_close,
iffdrv_write,
iffdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ iffdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_iff(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -135,6 +135,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *jpegdrv_memmap_fd;
+static char *jpegdrv_memmap_ext_filename;
+static BYTE *jpegdrv_memmap_data;
+
+static int jpegdrv_close_memmap(void)
+{
+ jpeg_finish_compress(&cinfo);
+ fclose(jpegdrv_memmap_fd);
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_data);
+ lib_free(jpegdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int jpegdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+ JSAMPROW rowpointer[1];
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ jpegdrv_memmap_data[i*3]=palette[pixval*3];
+ jpegdrv_memmap_data[(i*3)+1]=palette[(pixval*3)+1];
+ jpegdrv_memmap_data[(i*3)+2]=palette[(pixval*3)+2];
+ }
+ rowpointer[0]=jpegdrv_memmap_data;
+ jpeg_write_scanlines(&cinfo, rowpointer, 1);
+
+ return 0;
+}
+
+static int jpegdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_compress(&cinfo);
+ jpegdrv_memmap_ext_filename=util_add_extension_const(filename, jpeg_drv.default_extension);
+ jpegdrv_memmap_fd = fopen(jpegdrv_memmap_ext_filename, "wb");
+ if (jpegdrv_memmap_fd==NULL)
+ {
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_ext_filename);
+ return -1;
+ }
+ jpeg_stdio_dest(&cinfo, jpegdrv_memmap_fd);
+ jpegdrv_memmap_data = (BYTE *)lib_malloc(x_size*3);
+ cinfo.image_width = x_size;
+ cinfo.image_height = y_size;
+ cinfo.input_components = 3;
+ cinfo.in_color_space = JCS_RGB;
+ jpeg_set_defaults(&cinfo);
+ jpeg_start_compress(&cinfo, TRUE);
+
+ return 0;
+}
+
+static int jpegdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (jpegdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ jpegdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (jpegdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t jpeg_drv =
{
"JPEG",
@@ -144,7 +222,12 @@
jpegdrv_close,
jpegdrv_write,
jpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ jpegdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_jpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -256,6 +256,180 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pcxdrv_memmap_fd;
+static char *pcxdrv_memmap_ext_filename;
+static BYTE *pcxdrv_memmap_pcx_data;
+
+static int pcxdrv_close_memmap(BYTE *palette)
+{
+ BYTE pcx_color_prefix[2]="\x0c";
+
+ fwrite(pcx_color_prefix, 1, 1, pcxdrv_memmap_fd);
+
+ fwrite(palette, 3*256, 1, pcxdrv_memmap_fd);
+
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_pcx_data);
+ lib_free(pcxdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pcxdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ BYTE color,amount;
+ unsigned int i,j=0;
+
+ color=gfx[(line*x_size)];
+ amount=1;
+ for (i = 1; i<x_size; i++)
+ {
+ if (gfx[(line*x_size)+i]==color)
+ {
+ amount=amount+1;
+ if (amount==63)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xff;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ amount=0;
+ }
+ }
+ else
+ {
+ if (amount==0)
+ {
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ }
+ }
+ }
+ if (amount==1)
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ }
+
+ if (fwrite(pcxdrv_memmap_pcx_data, j, 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ BYTE header[128];
+
+ memset(header, 0, sizeof(header));
+
+ header[0]=0xa;
+ header[1]=5;
+ header[2]=1;
+ header[3]=8;
+
+ util_word_to_le_buf(&header[8], (WORD)(x_size-1));
+ util_word_to_le_buf(&header[10], (WORD)(y_size-1));
+
+ util_word_to_le_buf(&header[12], (WORD)(0));
+ util_word_to_le_buf(&header[14], (WORD)(0));
+
+ header[65]=1;
+ util_word_to_le_buf(&header[66], (WORD)(x_size));
+
+ if (fwrite(header, sizeof(header), 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ pcxdrv_memmap_ext_filename=util_add_extension_const(filename, pcx_drv.default_extension);
+ pcxdrv_memmap_fd = fopen(pcxdrv_memmap_ext_filename, "wb");
+
+ if (pcxdrv_memmap_fd==NULL)
+ {
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (pcxdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pcxdrv_memmap_pcx_data = (BYTE *)lib_malloc(x_size*2);
+
+ return 0;
+}
+
+static int pcxdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pcxdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pcxdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (pcxdrv_close_memmap(palette) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t pcx_drv =
{
"PCX",
@@ -265,7 +439,12 @@
pcxdrv_close,
pcxdrv_write,
pcxdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pcxdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_pcx(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -161,6 +161,114 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pngdrv_memmap_fd;
+static char *pngdrv_memmap_ext_filename;
+static png_structp pngdrv_memmap_png_ptr;
+static png_infop pngdrv_memmap_info_ptr;
+static BYTE *pngdrv_memmap_png_data;
+
+static int pngdrv_close_memmap(void)
+{
+ png_write_end(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+
+ fclose(pngdrv_memmap_fd);
+ lib_free(pngdrv_memmap_png_data);
+ lib_free(pngdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pngdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ pngdrv_memmap_png_data[i*4] = palette[pixval*3];
+ pngdrv_memmap_png_data[(i*4)+1] = palette[(pixval*3)+1];
+ pngdrv_memmap_png_data[(i*4)+2] = palette[(pixval*3)+2];
+ pngdrv_memmap_png_data[(i*4)+3] = 0;
+ }
+
+ png_write_row(pngdrv_memmap_png_ptr, (png_bytep)(pngdrv_memmap_png_data));
+
+ return 0;
+}
+
+static int pngdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ pngdrv_memmap_png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (void *)NULL, NULL, NULL);
+
+ if (pngdrv_memmap_png_ptr == NULL)
+ return -1;
+
+ pngdrv_memmap_info_ptr = png_create_info_struct(pngdrv_memmap_png_ptr);
+
+ if (pngdrv_memmap_info_ptr == NULL)
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(pngdrv_memmap_png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+ return -1;
+ }
+
+ pngdrv_memmap_ext_filename = util_add_extension_const(filename, png_drv.default_extension);
+
+ pngdrv_memmap_fd = fopen(pngdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (pngdrv_memmap_fd == NULL)
+ {
+ lib_free(pngdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pngdrv_memmap_png_data = (BYTE *)lib_malloc(x_size * 4);
+
+ png_init_io(pngdrv_memmap_png_ptr, pngdrv_memmap_fd);
+ png_set_compression_level(pngdrv_memmap_png_ptr, Z_BEST_COMPRESSION);
+
+ pngdrv_memmap_info_ptr->width = x_size;
+ pngdrv_memmap_info_ptr->height= y_size;
+ pngdrv_memmap_info_ptr->bit_depth = 8;
+ pngdrv_memmap_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+
+ png_write_info(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+ png_set_invert_alpha(pngdrv_memmap_png_ptr);
+#endif
+
+ return 0;
+}
+
+static int pngdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pngdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pngdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (pngdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t png_drv =
{
"PNG",
@@ -170,7 +278,12 @@
pngdrv_close,
pngdrv_write,
pngdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pngdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_png(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -151,6 +151,86 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *ppmdrv_memmap_fd;
+static char *ppmdrv_memmap_ext_filename;
+
+static int ppmdrv_close_memmap(void)
+{
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int ppmdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ unsigned int i;
+ BYTE pixval;
+
+ for (i = 0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ if (fprintf(ppmdrv_memmap_fd, "%3d %3d %3d\x0a",palette[pixval*3],palette[(pixval*3)+1],palette[(pixval*3)+2])<0)
+ return -1;
+ }
+ return 0;
+}
+
+static int ppmdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ if (fprintf(ppmdrv_memmap_fd,"P3\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"# VICEplus generated PPM mem map grafix\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"%d %d\x0a",x_size,y_size)<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"255\x0a")<0)
+ return -1;
+
+ return 0;
+}
+
+static int ppmdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ ppmdrv_memmap_ext_filename=util_add_extension_const(filename, ppm_drv.default_extension);
+ ppmdrv_memmap_fd = fopen(ppmdrv_memmap_ext_filename, "wb");
+
+ if (ppmdrv_memmap_fd==NULL)
+ {
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (ppmdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int ppmdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (ppmdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ ppmdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (ppmdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t ppm_drv =
{
"PPM",
@@ -160,7 +240,12 @@
ppmdrv_close,
ppmdrv_write,
ppmdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ ppmdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_ppm(void)
Modified: branches/marco/ports/vice/src/maincpu.c
===================================================================
--- branches/marco/ports/vice/src/maincpu.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/maincpu.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -74,24 +74,76 @@
/* ------------------------------------------------------------------------- */
+#ifndef STORE_ZERO
+#define STORE_ZERO(addr, value) \
+ zero_store((WORD)(addr), (BYTE)(value))
+#endif
+
+#ifndef LOAD_ZERO
+#define LOAD_ZERO(addr) \
+ zero_read((WORD)(addr))
+#endif
+
+#ifdef FEATURE_CPUMEMHISTORY
+
+/* HACK this is C64 specific */
+
+void REGPARM2 memmap_mem_store(WORD addr, BYTE value)
+{
+ if((addr >= 0xd000)&&(addr <= 0xdfff)) {
+ monitor_memmap_store(addr, MEMMAP_I_O_W);
+ } else {
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+ }
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value));
+}
+
+BYTE REGPARM1 memmap_mem_read(WORD addr)
+{
+ switch(addr >> 12) {
+ case 0xa:
+ case 0xb:
+ case 0xe:
+ case 0xf:
+ memmap_state |= MEMMAP_STATE_IGNORE;
+ if(LOAD_ZERO(1) & (1 << ((addr>>14) & 1))) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_ROM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_ROM_R);
+ } else {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ }
+ memmap_state &= ~(MEMMAP_STATE_IGNORE);
+ break;
+ case 0xd:
+ monitor_memmap_store(addr, MEMMAP_I_O_R);
+ break;
+ default:
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ break;
+ }
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ return (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr));
+}
+
#ifndef STORE
#define STORE(addr, value) \
- (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
+ memmap_mem_store(addr, value)
#endif
#ifndef LOAD
#define LOAD(addr) \
- (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
+ memmap_mem_read(addr)
#endif
-#ifndef STORE_ZERO
-#define STORE_ZERO(addr, value) \
- zero_store((WORD)(addr), (BYTE)(value))
+#endif /* FEATURE_CPUMEMHISTORY */
+
+#ifndef STORE
+#define STORE(addr, value) \
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
#endif
-#ifndef LOAD_ZERO
-#define LOAD_ZERO(addr) \
- zero_read((WORD)(addr))
+#ifndef LOAD
+#define LOAD(addr) \
+ (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
#endif
#define LOAD_ADDR(addr) \
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -67,6 +67,10 @@
"<type>",
"Specify the type of CPU currently used (6502/z80)." },
+ { "cpuhistory", "chis",
+ "[<count>]",
+ "Show <count> last executed commands." },
+
{ "dump", "",
"\"<filename>\"",
"Write a snapshot of the machine into the file specified.\n"
@@ -221,6 +225,22 @@
"is specified, only one character is displayed. If no addresses are\n"
"given, the ``dot'' address is used." },
+ { "memmapsave", "mmsave",
+ "\"<filename>\" <format>",
+ "Save the memmap as a picture. Format is:\n"
+ "0 = BMP, 1 = PCX, 2 = PNG, 3 = GIF, 4 = IFF." },
+
+ { "memmapshow", "mmsh",
+ "[<mask>] [<address_opt_range>]",
+ "Show the memmap. The mask can be specified to show only those\n"
+ "locations with accesses of certain type(s). The mask is a number\n"
+ "with the bits \"ioRWXrwx\", where RWX are for ROM and rwx for RAM.\n"
+ "Optionally, an address range can be specified." },
+
+ { "memmapzap", "mmzap",
+ NULL,
+ "Clear the memmap." },
+
{ "memsprite", "ms",
"[<data_type>] [<address_opt_range>]",
"Display the contents of memory as sprite data. If only one address is\n"
Modified: branches/marco/ports/vice/src/monitor/mon_lex.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/monitor/mon_lex.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 169
-#define YY_END_OF_BUFFER 170
+#define YY_NUM_RULES 173
+#define YY_END_OF_BUFFER 174
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,116 +372,119 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[955] =
+static yyconst flex_int16_t yy_acclist[987] =
{ 0,
- 96, 159, 96, 159, 96, 96, 96, 96, 81, 96,
- 81, 96, 96, 96, 96, 159, 96, 159, 96, 159,
- 96, 159, 96, 159, 96, 159, 96, 159, 96, 159,
- 96, 99, 96, 99, 95, 96, 95, 96, 170, 168,
- 169, 96, 169, 97, 168, 169, 79, 168, 169, 168,
- 169, 168, 169, 168, 169, 168, 169, 166, 168, 169,
- 168, 169, 159, 161, 164, 168, 169, 156, 159, 161,
- 164, 168, 169, 161, 164, 168, 169, 161, 164, 168,
- 169, 72, 168, 169, 165, 168, 169, 164, 168, 169,
- 88, 164, 168, 169, 164, 168, 169, 86, 164, 168,
+ 100, 163, 100, 163, 100, 100, 100, 100, 85, 100,
+ 85, 100, 100, 100, 100, 163, 100, 163, 100, 163,
+ 100, 163, 100, 163, 100, 163, 100, 163, 100, 163,
+ 100, 103, 100, 103, 99, 100, 99, 100, 174, 172,
+ 173, 100, 173, 101, 172, 173, 83, 172, 173, 172,
+ 173, 172, 173, 172, 173, 172, 173, 170, 172, 173,
+ 172, 173, 163, 165, 168, 172, 173, 160, 163, 165,
+ 168, 172, 173, 165, 168, 172, 173, 165, 168, 172,
+ 173, 76, 172, 173, 169, 172, 173, 168, 172, 173,
+ 92, 168, 172, 173, 168, 172, 173, 90, 168, 172,
- 169, 87, 168, 169, 89, 168, 169, 168, 169, 168,
- 169, 168, 169, 89, 168, 169, 168, 169, 168, 169,
- 168, 169, 168, 169, 2, 168, 169, 32, 168, 169,
- 3, 168, 169, 71, 168, 169, 4, 71, 168, 169,
- 71, 168, 169, 17, 71, 168, 169, 21, 71, 168,
- 169, 71, 168, 169, 30, 71, 168, 169, 31, 71,
- 168, 169, 33, 71, 168, 169, 34, 71, 168, 169,
- 71, 168, 169, 39, 71, 168, 169, 41, 71, 168,
- 169, 45, 71, 168, 169, 47, 71, 168, 169, 71,
- 168, 169, 52, 71, 168, 169, 57, 71, 168, 169,
+ 173, 91, 172, 173, 93, 172, 173, 172, 173, 172,
+ 173, 172, 173, 93, 172, 173, 172, 173, 172, 173,
+ 172, 173, 172, 173, 2, 172, 173, 33, 172, 173,
+ 3, 172, 173, 75, 172, 173, 4, 75, 172, 173,
+ 75, 172, 173, 17, 75, 172, 173, 22, 75, 172,
+ 173, 75, 172, 173, 31, 75, 172, 173, 32, 75,
+ 172, 173, 34, 75, 172, 173, 35, 75, 172, 173,
+ 75, 172, 173, 40, 75, 172, 173, 42, 75, 172,
+ 173, 49, 75, 172, 173, 51, 75, 172, 173, 75,
+ 172, 173, 56, 75, 172, 173, 61, 75, 172, 173,
- 43, 71, 168, 169, 71, 168, 169, 69, 71, 168,
- 169, 29, 71, 168, 169, 71, 168, 169, 63, 71,
- 168, 169, 1, 168, 169, 81, 168, 169, 81, 96,
- 169, 80, 168, 169, 81, 166, 168, 169, 81, 165,
- 168, 169, 100, 168, 169, 100, 166, 168, 169, 100,
- 165, 168, 169, 153, 168, 169, 151, 168, 169, 152,
- 168, 169, 168, 169, 156, 159, 161, 164, 168, 169,
- 161, 164, 168, 169, 154, 168, 169, 164, 168, 169,
- 16526, 143, 164, 168, 169, 144, 164, 168, 169, 145,
- 164, 168, 169, 146, 164, 168, 169, 164, 168, 169,
+ 47, 75, 172, 173, 75, 172, 173, 73, 75, 172,
+ 173, 30, 75, 172, 173, 75, 172, 173, 67, 75,
+ 172, 173, 1, 172, 173, 85, 172, 173, 85, 100,
+ 173, 84, 172, 173, 85, 170, 172, 173, 85, 169,
+ 172, 173, 104, 172, 173, 104, 170, 172, 173, 104,
+ 169, 172, 173, 157, 172, 173, 155, 172, 173, 156,
+ 172, 173, 172, 173, 160, 163, 165, 168, 172, 173,
+ 165, 168, 172, 173, 158, 172, 173, 168, 172, 173,
+ 16530, 147, 168, 172, 173, 148, 168, 172, 173, 149,
+ 168, 172, 173, 150, 168, 172, 173, 168, 172, 173,
- 168, 169, 147, 168, 169, 168, 169, 148, 168, 169,
- 149, 168, 169, 150, 168, 169, 164, 168, 169,16526,
- 143, 164, 168, 169, 145, 164, 168, 169, 147, 168,
- 169, 168, 169, 149, 168, 169, 168, 169, 168, 169,
- 119, 168, 169, 120, 168, 169, 168, 169, 109, 168,
- 169, 165, 168, 169, 110, 168, 169, 168, 169, 101,
- 164, 168, 169, 168, 169, 168, 169, 102, 168, 169,
- 103, 168, 169, 102, 168, 169, 168, 169, 99, 168,
- 169, 99, 168, 169, 99, 168, 169, 99, 168, 169,
- 99, 168, 169, 95, 168, 169, 96, 163, 157, 158,
+ 172, 173, 151, 172, 173, 172, 173, 152, 172, 173,
+ 153, 172, 173, 154, 172, 173, 168, 172, 173,16530,
+ 147, 168, 172, 173, 149, 168, 172, 173, 151, 172,
+ 173, 172, 173, 153, 172, 173, 172, 173, 172, 173,
+ 123, 172, 173, 124, 172, 173, 172, 173, 113, 172,
+ 173, 169, 172, 173, 114, 172, 173, 172, 173, 105,
+ 168, 172, 173, 172, 173, 172, 173, 106, 172, 173,
+ 107, 172, 173, 106, 172, 173, 172, 173, 103, 172,
+ 173, 103, 172, 173, 103, 172, 173, 103, 172, 173,
+ 103, 172, 173, 99, 172, 173, 100, 167, 161, 162,
- 160, 82, 84, 85, 83, 141, 140, 141, 159, 161,
- 164, 161, 164, 164, 156, 159, 161, 164, 156, 159,
- 161, 164, 91, 92, 90, 162, 78, 73, 71, 71,
- 5, 71, 71, 71, 8, 71, 9, 71, 11, 71,
- 12, 71, 13, 71, 71, 15, 71, 71, 71, 71,
- 71, 23, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 35, 71, 37, 71, 71, 40, 71, 71, 20,
- 71, 42, 71, 71, 71, 44, 71, 71, 46, 71,
- 71, 71, 71, 71, 71, 71, 71, 59, 71, 71,
- 71, 71, 58, 71, 71, 71, 66, 71, 67, 71,
+ 164, 86, 88, 89, 87, 145, 144, 145, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 160, 163,
+ 165, 168, 95, 96, 94, 166, 82, 77, 75, 75,
+ 5, 75, 75, 75, 8, 75, 9, 75, 11, 75,
+ 12, 75, 13, 75, 75, 15, 75, 75, 75, 75,
+ 75, 75, 24, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 36, 75, 38, 75, 75, 41, 75, 75,
+ 21, 75, 43, 75, 75, 75, 75, 48, 75, 75,
+ 50, 75, 75, 75, 75, 75, 75, 75, 75, 63,
+ 75, 75, 75, 75, 62, 75, 75, 75, 70, 75,
- 71, 71, 81, 81, 96, 100, 156, 159, 161, 164,
- 8334, 139, 164, 129, 139, 164, 139, 130, 139, 164,
- 131, 139, 164, 132, 139, 133, 139, 136, 139, 139,
- 162, 133, 139, 136, 139, 107, 112, 114, 115, 116,
- 108, 106, 111, 113, 104, 105, 167, 99, 99, 99,
- 95, 141, 140, 141, 159, 161, 164, 161, 164, 164,
- 156, 159, 161, 164, 93, 94, 74, 98, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 19, 71,
- 22, 71, 71, 24, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 41, 71, 71, 71,
+ 71, 75, 75, 75, 85, 85, 100, 104, 160, 163,
+ 165, 168, 8338, 143, 168, 133, 143, 168, 143, 134,
+ 143, 168, 135, 143, 168, 136, 143, 137, 143, 140,
+ 143, 143, 166, 137, 143, 140, 143, 111, 116, 118,
+ 119, 120, 112, 110, 115, 117, 108, 109, 171, 103,
+ 103, 103, 99, 145, 144, 145, 163, 165, 168, 165,
+ 168, 168, 160, 163, 165, 168, 97, 98, 78, 102,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 19, 75, 23, 75, 75, 25, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 42,
- 71, 71, 48, 71, 71, 50, 71, 51, 71, 71,
- 71, 56, 71, 71, 71, 62, 71, 61, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 139,
- 164, 139, 134, 139, 135, 139, 137, 139, 138, 139,
- 117, 118, 159, 161, 164, 161, 164, 164, 156, 159,
- 161, 164, 76, 71, 71, 71, 7, 71, 71, 71,
- 71, 71, 71, 71, 71, 18, 71, 71, 71, 71,
- 71, 27, 71, 71, 29, 71, 30, 71, 31, 71,
- 32, 71, 33, 71, 71, 71, 39, 71, 71, 71,
- 43, 71, 45, 71, 71, 71, 49, 71, 71, 71,
+ 75, 75, 75, 75, 75, 75, 75, 52, 75, 75,
+ 54, 75, 55, 75, 75, 75, 60, 75, 75, 75,
+ 66, 75, 65, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 143, 168, 143, 138, 143, 139,
+ 143, 141, 143, 142, 143, 121, 122, 163, 165, 168,
+ 165, 168, 168, 160, 163, 165, 168, 80, 75, 75,
+ 75, 7, 75, 75, 75, 75, 75, 75, 20, 75,
+ 75, 75, 18, 75, 75, 75, 75, 75, 75, 28,
+ 75, 75, 30, 75, 31, 75, 32, 75, 33, 75,
+ 34, 75, 75, 75, 40, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 57, 71, 71, 71,
- 71, 71, 63, 71, 64, 71, 71, 71, 71, 71,
- 71, 71, 139, 164, 139, 159, 161, 164, 161, 164,
- 164, 156, 159, 161, 164, 77, 71, 71, 71, 8,
- 71, 71, 10, 71, 11, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 47, 71, 50, 71, 71, 71, 53, 71,
- 71, 71, 71, 71, 71, 71, 60, 71, 71, 71,
- 71, 66, 71, 71, 67, 71, 69, 71, 71, 125,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
+ 45, 75, 75, 47, 75, 49, 75, 75, 75, 53,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 61,
+ 75, 75, 75, 75, 75, 67, 75, 68, 75, 75,
+ 75, 75, 75, 75, 75, 143, 168, 143, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 81, 75,
+ 75, 75, 8, 75, 75, 10, 75, 11, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 46, 75, 75,
+ 51, 75, 54, 75, 75, 75, 57, 75, 75, 75,
+ 75, 75, 75, 75, 64, 75, 75, 75, 75, 70,
- 75, 71, 6, 71, 71, 71, 71, 71, 71, 71,
- 22, 71, 25, 71, 24, 71, 71, 21, 71, 28,
- 71, 36, 71, 38, 71, 71, 71, 71, 71, 51,
- 71, 71, 54, 71, 71, 55, 71, 56, 71, 71,
- 59, 71, 71, 71, 68, 71, 71, 121, 128, 126,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
- 71, 71, 71, 71, 71, 16, 71, 17, 71, 71,
- 71, 26, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 70, 71, 127, 155, 159, 161, 164, 155,
- 161, 164, 155, 164, 155, 156, 159, 161, 164, 71,
+ 75, 75, 71, 75, 73, 75, 75, 129, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 79, 75,
+ 6, 75, 75, 75, 75, 75, 75, 75, 75, 23,
+ 75, 26, 75, 25, 75, 75, 22, 75, 29, 75,
+ 37, 75, 39, 75, 75, 75, 75, 75, 44, 75,
+ 75, 55, 75, 75, 58, 75, 75, 59, 75, 60,
+ 75, 75, 63, 75, 75, 75, 72, 75, 75, 125,
+ 132, 130, 163, 165, 168, 165, 168, 168, 160, 163,
+ 165, 168, 75, 75, 75, 75, 75, 16, 75, 17,
+ 75, 75, 75, 75, 27, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 65, 71, 124, 159, 161, 164, 161,
- 164, 164, 156, 159, 161, 164, 71, 71, 71, 18,
- 71, 71, 71, 52, 71, 71, 71, 71, 71, 71,
- 123, 122, 9, 71, 71, 14, 71, 71, 71, 71,
- 71, 71, 71, 71
+ 75, 75, 75, 75, 75, 75, 75, 74, 75, 131,
+ 159, 163, 165, 168, 159, 165, 168, 159, 168, 159,
+ 160, 163, 165, 168, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 69, 75, 128, 163, 165, 168, 165, 168,
+ 168, 160, 163, 165, 168, 75, 75, 75, 18, 75,
+ 75, 75, 75, 75, 75, 56, 75, 75, 75, 75,
+ 75, 75, 127, 126, 9, 75, 75, 14, 75, 75,
+ 75, 75, 75, 75, 75, 75
} ;
-static yyconst flex_int16_t yy_accept[568] =
+static yyconst flex_int16_t yy_accept[596] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
@@ -502,49 +505,53 @@
415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
- 454, 455, 456, 457, 458, 459, 460, 461, 462, 464,
- 466, 467, 469, 470, 472, 474, 475, 476, 478, 479,
+ 453, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+ 465, 467, 468, 470, 471, 473, 475, 476, 477, 478,
- 481, 482, 483, 484, 485, 486, 487, 488, 490, 491,
- 492, 493, 495, 496, 497, 499, 501, 502, 503, 504,
- 506, 507, 511, 511, 512, 514, 517, 518, 521, 524,
- 526, 528, 530, 532, 534, 536, 537, 538, 539, 539,
- 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
- 549, 550, 551, 552, 553, 555, 558, 560, 561, 565,
- 566, 567, 567, 568, 568, 568, 569, 570, 571, 572,
- 573, 574, 575, 576, 577, 578, 579, 581, 583, 584,
- 586, 587, 588, 589, 590, 591, 592, 593, 594, 595,
- 596, 597, 599, 600, 601, 602, 603, 605, 606, 608,
+ 480, 481, 483, 484, 485, 486, 487, 488, 489, 490,
+ 492, 493, 494, 495, 497, 498, 499, 501, 503, 504,
+ 505, 506, 508, 509, 513, 513, 514, 516, 519, 520,
+ 523, 526, 528, 530, 532, 534, 536, 538, 539, 540,
+ 541, 541, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 554, 555, 557, 560, 562,
+ 563, 567, 568, 569, 569, 570, 570, 570, 571, 572,
+ 573, 574, 575, 576, 577, 578, 579, 580, 581, 582,
+ 584, 586, 587, 589, 590, 591, 592, 593, 594, 595,
+ 596, 597, 598, 599, 600, 602, 603, 604, 605, 606,
- 610, 611, 612, 614, 615, 616, 618, 620, 621, 622,
- 623, 624, 625, 626, 627, 628, 629, 630, 630, 632,
- 633, 635, 637, 639, 641, 642, 643, 646, 648, 649,
- 653, 654, 654, 654, 655, 656, 657, 659, 660, 661,
- 662, 663, 664, 665, 666, 668, 669, 670, 671, 672,
- 674, 675, 677, 679, 681, 683, 685, 686, 687, 689,
- 690, 691, 693, 695, 696, 697, 699, 700, 701, 702,
- 703, 704, 705, 706, 707, 709, 710, 711, 712, 713,
- 715, 717, 718, 719, 720, 721, 722, 723, 723, 723,
- 723, 725, 726, 729, 731, 732, 736, 737, 737, 738,
+ 607, 608, 610, 611, 613, 615, 616, 617, 619, 620,
+ 621, 623, 625, 626, 627, 628, 629, 630, 631, 632,
+ 633, 634, 635, 635, 637, 638, 640, 642, 644, 646,
+ 647, 648, 651, 653, 654, 658, 659, 659, 659, 660,
+ 661, 662, 664, 665, 666, 667, 668, 669, 671, 672,
+ 673, 675, 676, 677, 678, 679, 680, 682, 683, 685,
+ 687, 689, 691, 693, 694, 695, 697, 698, 699, 700,
+ 701, 703, 704, 706, 708, 709, 710, 712, 713, 714,
+ 715, 716, 717, 718, 719, 720, 722, 723, 724, 725,
+ 726, 728, 730, 731, 732, 733, 734, 735, 736, 736,
- 739, 740, 742, 743, 745, 747, 748, 749, 750, 751,
- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761,
- 762, 763, 765, 767, 768, 769, 771, 772, 773, 774,
- 775, 776, 777, 779, 780, 781, 782, 784, 785, 787,
- 789, 790, 790, 791, 791, 791, 791, 794, 796, 797,
- 801, 802, 803, 805, 806, 807, 808, 809, 810, 811,
- 813, 815, 817, 818, 820, 822, 824, 826, 827, 828,
- 829, 830, 832, 833, 835, 836, 838, 840, 841, 843,
- 844, 845, 847, 848, 848, 848, 849, 850, 851, 851,
- 854, 856, 857, 861, 862, 863, 864, 865, 866, 868,
+ 736, 736, 738, 739, 742, 744, 745, 749, 750, 750,
+ 751, 752, 753, 755, 756, 758, 760, 761, 762, 763,
+ 764, 765, 766, 767, 768, 769, 770, 771, 772, 773,
+ 774, 775, 776, 777, 778, 780, 781, 783, 785, 786,
+ 787, 789, 790, 791, 792, 793, 794, 795, 797, 798,
+ 799, 800, 802, 803, 805, 807, 808, 808, 809, 809,
+ 809, 809, 812, 814, 815, 819, 820, 821, 823, 824,
+ 825, 826, 827, 828, 829, 830, 832, 834, 836, 837,
+ 839, 841, 843, 845, 846, 847, 848, 849, 851, 852,
+ 854, 855, 857, 858, 860, 862, 863, 865, 866, 867,
- 870, 871, 872, 874, 875, 876, 877, 878, 879, 880,
- 881, 882, 883, 885, 885, 885, 886, 890, 893, 895,
- 900, 901, 902, 903, 904, 905, 906, 907, 908, 909,
- 910, 911, 912, 913, 914, 916, 917, 917, 920, 922,
- 923, 927, 928, 929, 930, 932, 933, 934, 936, 937,
- 938, 939, 940, 941, 942, 943, 945, 946, 948, 949,
- 950, 951, 952, 953, 954, 955, 955
+ 869, 870, 870, 870, 871, 872, 873, 873, 876, 878,
+ 879, 883, 884, 885, 886, 887, 888, 890, 892, 893,
+ 894, 895, 897, 898, 899, 900, 901, 902, 903, 904,
+ 905, 906, 907, 908, 910, 910, 910, 911, 915, 918,
+ 920, 925, 926, 927, 928, 929, 930, 931, 932, 933,
+ 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
+ 945, 946, 946, 949, 951, 952, 956, 957, 958, 959,
+ 961, 962, 963, 964, 965, 966, 968, 969, 970, 971,
+ 972, 973, 974, 975, 977, 978, 980, 981, 982, 983,
+ 984, 985, 986, 987, 987
+
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -590,147 +597,153 @@
11, 11, 11, 11, 11, 11, 11, 11, 1, 1
} ;
-static yyconst flex_int16_t yy_base[601] =
+static yyconst flex_int16_t yy_base[629] =
{ 0,
0, 0, 65, 0, 131, 0, 200, 205, 213, 218,
242, 0, 308, 0, 372, 0, 418, 464, 531, 0,
- 601, 671, 1387, 1388, 75, 1388, 1388, 0, 72, 74,
- 308, 1388, 415, 331, 355, 107, 1365, 1388, 1388, 0,
- 0, 1364, 0, 1388, 1388, 1343, 1334, 1325, 52, 1319,
- 1323, 1313, 0, 1388, 1388, 1388, 0, 171, 383, 310,
- 345, 20, 1326, 1320, 57, 178, 1328, 177, 404, 1327,
- 409, 1311, 192, 426, 55, 1317, 1328, 0, 1304, 0,
- 1388, 0, 100, 1388, 0, 0, 0, 0, 0, 1388,
- 1388, 1388, 486, 113, 1349, 1388, 740, 615, 628, 631,
+ 601, 671, 1419, 1420, 75, 1420, 1420, 0, 72, 74,
+ 308, 1420, 415, 331, 355, 107, 1397, 1420, 1420, 0,
+ 0, 1396, 0, 1420, 1420, 1375, 1366, 1357, 52, 1351,
+ 1355, 1345, 0, 1420, 1420, 1420, 0, 171, 383, 310,
+ 345, 20, 1358, 1352, 57, 178, 1360, 177, 406, 1359,
+ 410, 1343, 192, 445, 55, 1349, 1360, 0, 1336, 0,
+ 1420, 0, 100, 1420, 0, 0, 0, 0, 0, 1420,
+ 1420, 1420, 502, 113, 1381, 1420, 740, 447, 469, 615,
- 635, 685, 0, 1332, 171, 0, 1327, 0, 177, 699,
- 705, 1313, 249, 1300, 1341, 324, 1388, 1388, 487, 1340,
- 1339, 1338, 1292, 0, 193, 278, 1319, 1388, 1293, 0,
- 0, 305, 1337, 1336, 1335, 0, 354, 0, 328, 378,
- 500, 1388, 1388, 1388, 1388, 0, 405, 624, 694, 0,
- 450, 1334, 1388, 1388, 1388, 1388, 1388, 1310, 1304, 1388,
- 1295, 1301, 1344, 0, 1302, 0, 1286, 320, 1290, 1298,
- 1301, 0, 0, 1284, 0, 308, 1280, 419, 323, 0,
- 1287, 1297, 1288, 1285, 1276, 1283, 1280, 1279, 0, 0,
- 1267, 0, 1289, 0, 0, 1277, 1267, 0, 1264, 0,
+ 628, 631, 0, 1364, 171, 0, 1359, 0, 177, 685,
+ 699, 1345, 249, 1332, 1373, 324, 1420, 1420, 601, 1372,
+ 1371, 1370, 1324, 0, 193, 278, 1351, 1420, 1325, 0,
+ 0, 305, 1369, 1368, 1367, 0, 354, 0, 328, 378,
+ 500, 1420, 1420, 1420, 1420, 0, 405, 637, 649, 0,
+ 642, 1366, 1420, 1420, 1420, 1420, 1420, 1342, 1336, 1420,
+ 1327, 1333, 1376, 0, 1334, 0, 1318, 320, 1322, 1330,
+ 1333, 0, 0, 1316, 0, 1323, 308, 1311, 645, 323,
+ 0, 1318, 1328, 1319, 1316, 1307, 1314, 1311, 1310, 0,
+ 0, 1298, 0, 1320, 0, 0, 1308, 318, 1298, 0,
- 1285, 1276, 1280, 1274, 1278, 604, 1260, 1263, 1256, 64,
- 1274, 0, 281, 1262, 1275, 360, 1256, 1270, 0, 445,
- 0, 1295, 713, 1388, 805, 851, 731, 0, 0, 810,
- 827, 856, 885, 890, 907, 1388, 1388, 1388, 1285, 1275,
- 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 0, 0,
- 1292, 1291, 0, 0, 408, 705, 711, 0, 473, 1388,
- 1388, 1264, 1388, 1250, 1259, 1302, 1264, 1262, 1252, 1251,
- 407, 1259, 1238, 1239, 351, 1253, 0, 1251, 1254, 1245,
- 1252, 1237, 1249, 1231, 1238, 1234, 1232, 1227, 1231, 1242,
- 1239, 436, 1237, 1222, 1216, 1226, 0, 1219, 1228, 1222,
+ 1295, 0, 1316, 1307, 1311, 1305, 1309, 654, 1291, 1294,
+ 1287, 64, 1305, 0, 281, 1293, 1306, 360, 1287, 1301,
+ 0, 479, 0, 1326, 708, 1420, 805, 851, 717, 0,
+ 0, 734, 810, 840, 869, 874, 897, 1420, 1420, 1420,
+ 1316, 1306, 1420, 1420, 1420, 1420, 1420, 1420, 1420, 1420,
+ 0, 0, 1323, 1322, 0, 0, 408, 706, 746, 0,
+ 621, 1420, 1420, 1295, 1420, 1281, 1290, 1333, 1295, 1293,
+ 1283, 1282, 449, 1290, 1269, 1270, 1270, 351, 1283, 1278,
+ 1280, 1283, 1274, 1281, 1266, 1278, 1260, 1267, 1263, 1261,
+ 1256, 1260, 1271, 1268, 684, 470, 1270, 1265, 1250, 1244,
- 1226, 871, 1214, 1228, 439, 0, 0, 1210, 1226, 1215,
- 1214, 1223, 1224, 1206, 1216, 1221, 1218, 1254, 958, 918,
- 929, 935, 952, 963, 1388, 1388, 746, 799, 0, 493,
- 1388, 1216, 1209, 1208, 1215, 1198, 0, 1212, 1205, 1204,
- 1208, 1206, 1210, 1209, 1200, 1189, 1204, 1203, 453, 0,
- 1194, 0, 0, 0, 0, 0, 1187, 1183, 1202, 1193,
- 1185, 0, 0, 1197, 1179, 0, 1174, 1179, 1177, 1175,
- 1188, 1172, 1186, 1173, 1189, 1183, 1179, 1186, 1179, 0,
- 0, 1181, 1178, 1167, 1163, 1161, 1161, 0, 1191, 641,
- 1200, 1195, 896, 976, 0, 794, 1388, 1147, 1150, 1138,
+ 1254, 0, 1247, 1256, 1250, 1254, 815, 1242, 1256, 405,
+ 0, 0, 1238, 1254, 1243, 1242, 1251, 1252, 1234, 1244,
+ 1249, 1246, 1282, 948, 902, 919, 925, 942, 953, 1420,
+ 1420, 799, 823, 0, 628, 1420, 1244, 1237, 1236, 1243,
+ 1226, 0, 1240, 1233, 1232, 1236, 1234, 0, 1238, 1237,
+ 1228, 1227, 1216, 1231, 1230, 437, 0, 1221, 0, 0,
+ 0, 0, 0, 1214, 1210, 1229, 1220, 1226, 1211, 1204,
+ 0, 1209, 0, 0, 1221, 1203, 0, 1198, 1203, 1201,
+ 1199, 1212, 1196, 1210, 1197, 1213, 1207, 1203, 1210, 1203,
+ 0, 0, 1205, 1202, 1194, 1194, 1196, 1201, 0, 1231,
- 1125, 0, 1140, 0, 0, 1122, 1125, 1120, 1114, 1127,
- 1123, 1123, 1113, 1104, 1116, 1115, 1113, 1105, 1100, 1079,
- 1083, 0, 0, 1066, 1041, 0, 1039, 1036, 1022, 1025,
- 1021, 1018, 0, 1019, 1004, 923, 0, 926, 0, 0,
- 910, 0, 955, 946, 945, 0, 981, 992, 0, 823,
- 1388, 912, 0, 906, 350, 895, 895, 892, 868, 875,
- 0, 0, 869, 0, 0, 0, 0, 848, 830, 836,
- 832, 0, 829, 0, 820, 0, 0, 821, 802, 817,
- 799, 0, 798, 830, 0, 1388, 1388, 1388, 818, 997,
- 1002, 0, 840, 772, 767, 735, 707, 707, 0, 0,
+ 794, 1240, 1239, 891, 914, 0, 886, 1420, 1194, 1197,
+ ...
[truncated message content] |
|
From: <bla...@us...> - 2008-05-31 20:59:21
|
Revision: 18817
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18817&view=rev
Author: blackystardust
Date: 2008-05-31 13:59:20 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Fixed some minix 3.x and qnx 4.x issues
Modified Paths:
--------------
branches/marco/ports/vice/build/qnx4/build.sh
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/video/video-resources.c
Modified: branches/marco/ports/vice/build/qnx4/build.sh
===================================================================
--- branches/marco/ports/vice/build/qnx4/build.sh 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/build/qnx4/build.sh 2008-05-31 20:59:20 UTC (rev 18817)
@@ -12,7 +12,9 @@
mv src/plus4/Makefile.in src/plus4/Makefile.in.orig
sed s/"-rm -f libplus4.a"/"-rm -f -r libplus4.a;cp plus4mem.o ..\/;mv plus4mem.c plus4mem2.c;echo >plus4mem.c;$\(CC\) -c -o plus4mem.o plus4mem.c;mv plus4mem2.c plus4mem.c"/ <src/plus4/Makefile.in.orig >src/plus4/Makefile.in
+mv src/monitor/Makefile.in src/monitor/Makefile.in.orig
+sed s/"-rm -f libmonitor.a"/"-rm -f -r libmonitor.a;cp monitor.o ..\/;mv monitor.c monitor2.c;echo >monitor.c;$\(CC\) -c -o monitor.o monitor.c;mv monitor2.c monitor.c"/ <src/monitor/Makefile.in.orig >src/monitor/Makefile.in
mv src/Makefile.in src/Makefile.in.orig
-sed s/"@XPLUS4_WINRES@"/"plus4mem.o"/ <src/Makefile.in.orig >src/Makefile.in
+sed -e s/"@X128_WINRES@"/"monitor.o"/ -e s/"@X64_WINRES@"/"monitor.o"/ -e s/"@XVIC_WINRES@"/"monitor.o"/ -e s/"@XPET_WINRES@"/"monitor.o"/ -e s/"@XPLUS4_WINRES@"/"plus4mem.o monitor.o"/ -e s/"@XCBM2_WINRES@"/"monitor.o"/ <src/Makefile.in.orig >src/Makefile.in
./configure -v --prefix=/usr/local cross_compiling=yes ac_cv_c_bigendian=no
make
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/configure.in 2008-05-31 20:59:20 UTC (rev 18817)
@@ -119,6 +119,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
+ CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
fi
if test x"$host_os" = "xcygwin32" -o x"$host_os" = "xcygwin"; then
Modified: branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -41,6 +41,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef __minix
+#include <stdlib.h>
+#endif
+
#if defined(__QNX__) || defined(MINIX_SUPPORT)
Status XShmAttach(Display *display, XShmSegmentInfo *shminfo)
{
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -631,7 +631,7 @@
return 0;
}
-GC video_get_gc(XGCValues *gc_values)
+static GC video_get_gc(XGCValues *gc_values)
{
Display *display;
@@ -824,7 +824,7 @@
/* ------------------------------------------------------------------------- */
-void video_refresh_func(void (*rfunc)(void))
+static void video_refresh_func(void (*rfunc)(void))
{
_refresh_func = rfunc;
}
Modified: branches/marco/ports/vice/src/network.c
===================================================================
--- branches/marco/ports/vice/src/network.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/network.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -30,9 +30,11 @@
#ifdef HAVE_NETWORK
#ifdef MINIX_SUPPORT
-#define _POSIX_SOURCE
#include <limits.h>
#define PF_INET AF_INET
+
+extern ssize_t recv(int socket, void *buffer, size_t length, int flags);
+extern ssize_t send(int socket, const void *buffer, size_t length, int flags);
#endif
#include <assert.h>
@@ -100,6 +102,12 @@
#include <unistd.h>
#endif
+#ifdef __minix
+#define recv(socket, buffer, length, flags) \
+ recvfrom(socket, buffer, length, flags, NULL, NULL)
+extern ssize_t send(int socket, const void *buffer, size_t length, int flags);
+#endif
+
#ifdef OPENSERVER6_COMPILE
struct timeval {
long tv_sec;
Modified: branches/marco/ports/vice/src/video/video-resources.c
===================================================================
--- branches/marco/ports/vice/src/video/video-resources.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/video/video-resources.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -600,7 +600,7 @@
lib_free(canvas->videoconfig->external_palette_name);
}
-void video_resources_update_ui(video_canvas_t *canvas)
+static void video_resources_update_ui(video_canvas_t *canvas)
{
int pal_enabled = 0;
int ui_doublescan_enabled, ui_scale2x_enabled;
@@ -627,4 +627,3 @@
ui_enable_chip resources(ui_doublescan_enabled, ui_scale2x_enabled);
*/
}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-30 11:44:58
|
Revision: 18816
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18816&view=rev
Author: amatthies
Date: 2008-05-30 04:45:04 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fixed compiler warnings.
Modified Paths:
--------------
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -185,7 +185,7 @@
BYTE *version_info_buffer = lib_malloc(version_info_size);
if (GetFileVersionInfo(file_name, (DWORD)NULL, version_info_size, (VOID*)version_info_buffer)) {
- if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", &company_name, &company_name_length)) {
+ if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", (void*)&company_name, &company_name_length)) {
if (company_name) {
if (strncmp("Vice Team", company_name, company_name_length) == 0) {
bResult = TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -586,7 +586,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
fullscreen_dialog_end();
SetWindowLong(hwnd, DWL_MSGRESULT, FALSE);
return TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -560,10 +560,10 @@
slider_pos = SendMessage(slider_hwnd[window_index], TBM_GETPOS, 0, 0);
resources_set_int("SoundVolume", 100 - slider_pos);
- if (nmhdr->code == NM_RELEASEDCAPTURE)
+ if (nmhdr->code == (UINT)NM_RELEASEDCAPTURE)
SetFocus(window);
- if (nmhdr->code == NM_CUSTOMDRAW) {
+ if (nmhdr->code == (UINT)NM_CUSTOMDRAW) {
NMCUSTOMDRAW *lpNMCustomDraw = (NMCUSTOMDRAW*)lparam;
#ifndef CDIS_FOCUS
#define CDIS_FOCUS 16
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -218,7 +218,6 @@
/* ------------------------------------------------------------------------ */
static HWND main_hwnd;
-static HWND slider_hwnd;
static int emu_menu;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -669,7 +669,7 @@
{
ret = GetByte(&(pwd->pMonitorDimensions),&pwd->MonitorLen);
- if (pwd->MonitorLen < sizeof(WINDOWPLACEMENT))
+ if (pwd->MonitorLen < (int)sizeof(WINDOWPLACEMENT))
{
ret = WT_END;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -274,7 +274,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_SAT, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -318,7 +318,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_GAM, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -423,7 +423,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
querynewpalette = 1;
if (resources_set_string(current_chip2->res_PaletteFile_name,
palette_file2) < 0) {
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -40,8 +40,8 @@
{
FILE *infile;
int state;
-int res_value;
-int is_idm;
+int res_value = 0;
+int is_idm = 0;
infile = fopen(filename, "rb");
if (infile) {
@@ -159,7 +159,7 @@
}
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
FILE *houtput, *moutput;
int i;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-30 10:13:53
|
Revision: 18815
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18815&view=rev
Author: amatthies
Date: 2008-05-30 03:13:59 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fixed sprite initialization bug for border modes. Added parentheses in vicii_sprites_set_x_position().
Modified Paths:
--------------
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -39,7 +39,7 @@
static void raster_sprite_status_init(raster_sprite_status_t *status,
- unsigned int num_sprites)
+ unsigned int num_sprites, int sprite_offset)
{
status->num_sprites = num_sprites;
status->cache_init_func = raster_sprite_cache_init;
@@ -58,7 +58,7 @@
status->sprite_data_2 = NULL;
}
- raster_sprite_status_reset(status);
+ raster_sprite_status_reset(status, sprite_offset);
}
static void raster_sprite_status_shutdown(raster_sprite_status_t *status,
@@ -71,11 +71,11 @@
}
}
-void raster_sprite_status_new(raster_t *raster, unsigned int num_sprites)
+void raster_sprite_status_new(raster_t *raster, unsigned int num_sprites, int sprite_offset)
{
raster->sprite_status = (raster_sprite_status_t *)lib_malloc(
sizeof(raster_sprite_status_t));
- raster_sprite_status_init(raster->sprite_status, num_sprites);
+ raster_sprite_status_init(raster->sprite_status, num_sprites, sprite_offset);
}
void raster_sprite_status_destroy(raster_t *raster)
@@ -87,7 +87,7 @@
}
}
-void raster_sprite_status_reset(raster_sprite_status_t *status)
+void raster_sprite_status_reset(raster_sprite_status_t *status, int sprite_offset)
{
unsigned int i;
@@ -105,7 +105,7 @@
status->new_sprite_data = status->sprite_data_2;
for (i = 0; i < status->num_sprites; i++)
- raster_sprite_reset(&status->sprites[i]);
+ raster_sprite_reset(&status->sprites[i], sprite_offset);
}
void raster_sprite_status_set_draw_function(raster_sprite_status_t *status,
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -85,9 +85,9 @@
struct raster_s;
extern void raster_sprite_status_new(struct raster_s *raster,
- unsigned int num_sprites);
+ unsigned int num_sprites, int sprite_offset);
extern void raster_sprite_status_destroy(struct raster_s *raster);
-extern void raster_sprite_status_reset(raster_sprite_status_t *status);
+extern void raster_sprite_status_reset(raster_sprite_status_t *status, int sprite_offset);
extern void raster_sprite_status_set_draw_function(
raster_sprite_status_t *status,
raster_sprite_status_draw_function_t function);
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -29,9 +29,9 @@
#include "raster-sprite.h"
-void raster_sprite_reset(raster_sprite_t *s)
+void raster_sprite_reset(raster_sprite_t *s, int sprite_offset)
{
- s->x = 8;
+ s->x = sprite_offset;
s->y = 0;
s->x_expanded = 0;
s->y_expanded = 0;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -71,7 +71,7 @@
typedef struct raster_sprite_s raster_sprite_t;
-extern void raster_sprite_reset(raster_sprite_t *s);
+extern void raster_sprite_reset(raster_sprite_t *s, int sprite_offset);
#endif
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -1170,7 +1170,7 @@
sprite = vicii.raster.sprite_status->sprites + num;
- x_offset = vicii.screen_leftborderwidth - 24;
+ x_offset = vicii_sprite_offset();
/* Handle spritegap in NTSC mode */
if (vicii.sprite_wrap_x > 0x200 && (unsigned int)new_x > 0x187)
@@ -1211,30 +1211,32 @@
sprite->x = vicii.sprite_wrap_x;
} else {
/* display already started on last_pos, change on next fetch */
- if (raster_x + 8 < new_x && sprite->x > raster_x + 8)
+ if (raster_x + 8 < new_x && sprite->x > raster_x + 8) {
/* last line was already drawn */
sprite->x = new_x;
- else
+ } else {
raster_changes_sprites_add_int(&vicii.raster,
SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num),
&sprite->x, new_x);
+ }
}
}
} else {
/* next_pos >= last_pos */
- if (change_pos <= last_pos)
- {
+ if (change_pos <= last_pos) {
/* display not started yet, use next_pos */
sprite->x = new_x;
} else {
- if (change_pos >= next_pos)
- if (raster_x + 8 < sprite->x && new_x > raster_x + 8)
+ if (change_pos >= next_pos) {
+ if (raster_x + 8 < sprite->x && new_x > raster_x + 8) {
/* last line was already drawn */
sprite->x = new_x;
- else
- /* display already started on last_pos, change on next fetch */
- raster_changes_sprites_add_int(&vicii.raster,
- SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num), &sprite->x, new_x);
+ } else {
+ /* display already started on last_pos, change on next fetch */
+ raster_changes_sprites_add_int(&vicii.raster,
+ SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num), &sprite->x, new_x);
+ }
+ }
}
}
raster_changes_sprites_add_int(&vicii.raster,
@@ -1271,3 +1273,7 @@
lib_free(sprline);
}
+int vicii_sprite_offset(void)
+{
+ return vicii.screen_leftborderwidth - 24;
+}
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -49,6 +49,7 @@
extern void vicii_sprites_reset_sprline(void);
extern void vicii_sprites_init_sprline(void);
extern void vicii_sprites_reset_xshift(void);
+extern int vicii_sprite_offset(void);
#endif
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -298,7 +298,7 @@
raster = &vicii.raster;
video_color_set_canvas(raster->canvas);
- raster_sprite_status_new(raster, VICII_NUM_SPRITES);
+ raster_sprite_status_new(raster, VICII_NUM_SPRITES, vicii_sprite_offset());
raster_line_changes_sprite_init(raster);
if (raster_init(raster, VICII_NUM_VMODES) < 0)
@@ -427,7 +427,7 @@
for (i = 0; i <= 0x3f; i++)
vicii_store(i, 0);
- raster_sprite_status_reset(vicii.raster.sprite_status);
+ raster_sprite_status_reset(vicii.raster.sprite_status, vicii_sprite_offset());
}
/* This /should/ put the VIC-II in the same state as after a powerup, if
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-29 12:15:08
|
Revision: 18814
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18814&view=rev
Author: amatthies
Date: 2008-05-29 05:15:14 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Branch for sprite fixes
Added Paths:
-----------
branches/amatthies/v1.22.16-sprites/
Copied: branches/amatthies/v1.22.16-sprites (from rev 18813, tags/v1.22/v1.22.16)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-28 05:55:31
|
Revision: 18813
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18813&view=rev
Author: blackystardust
Date: 2008-05-27 22:55:36 -0700 (Tue, 27 May 2008)
Log Message:
-----------
Fixed some solaris warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/sounddrv/soundsun.c
Modified: branches/marco/ports/vice/src/sounddrv/soundsun.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundsun.c 2008-05-25 23:18:21 UTC (rev 18812)
+++ branches/marco/ports/vice/src/sounddrv/soundsun.c 2008-05-28 05:55:36 UTC (rev 18813)
@@ -155,7 +155,7 @@
static int sun_write(SWORD *pbuf, size_t nr)
{
- int total, i, now;
+ unsigned int total, i, now;
if (sun_8bit)
{
/* XXX: ugly to change contents of the buffer */
@@ -183,7 +183,10 @@
static int sun_bufferspace(void)
{
- int st, size;
+ int st;
+#if defined(__NetBSD__)
+ int size;
+#endif
struct audio_info info;
/* ioctl(fd, AUDIO_GET_STATUS, &info) yields number of played samples
in info.play.samples. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-25 23:18:13
|
Revision: 18812
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18812&view=rev
Author: blackystardust
Date: 2008-05-25 16:18:21 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Fixed some hpux warning/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/sounddrv/soundhpux.c
Modified: branches/marco/ports/vice/src/sounddrv/soundhpux.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundhpux.c 2008-05-25 23:14:26 UTC (rev 18811)
+++ branches/marco/ports/vice/src/sounddrv/soundhpux.c 2008-05-25 23:18:21 UTC (rev 18812)
@@ -35,6 +35,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include "sound.h"
static int hpux_fd = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
19 messages has been excluded from this view by a project administrator.
