diff --git a/src/cpu/386.c b/src/cpu/386.c
index caa5f84a2..ed4b40ab2 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -264,18 +264,20 @@ exec386_2386(int32_t cycs)
ol = opcode_length[fetchdat & 0xff];
if ((ol == 3) && opcode_has_modrm[fetchdat & 0xff] && (((fetchdat >> 14) & 0x03) == 0x03))
ol = 2;
- if (cpu_16bitbus) {
- CHECK_READ_CS(MIN(ol, 2));
- } else {
- CHECK_READ_CS(MIN(ol, 4));
- }
+
if (is386)
ins_fetch_fault = cpu_386_check_instruction_fault();
/* Breakpoint fault has priority over other faults. */
- if (ins_fetch_fault) {
+ if ((cpu_state.abrt == 0) & ins_fetch_fault) {
+ x86gen();
ins_fetch_fault = 0;
- cpu_state.abrt = 1;
+ /* No instructions executed at this point. */
+ goto block_ended;
+ } else if (cpu_16bitbus) {
+ CHECK_READ_CS(MIN(ol, 2));
+ } else {
+ CHECK_READ_CS(MIN(ol, 4));
}
if (!cpu_state.abrt) {
@@ -288,7 +290,6 @@ exec386_2386(int32_t cycs)
trap |= !!(cpu_state.flags & T_FLAG);
cpu_state.pc++;
- cpu_state.eflags &= ~(RF_FLAG);
if (opcode == 0xf0)
in_lock = 1;
x86_2386_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
@@ -316,6 +317,7 @@ exec386_2386(int32_t cycs)
if (cpu_end_block_after_ins)
cpu_end_block_after_ins--;
+block_ended:
if (cpu_state.abrt) {
flags_rebuild();
tempi = cpu_state.abrt & ABRT_MASK;
@@ -338,6 +340,9 @@ exec386_2386(int32_t cycs)
#endif
}
}
+
+ if (is386 && !x86_was_reset && ins_fetch_fault)
+ x86gen();
} else if (new_ne) {
flags_rebuild();
new_ne = 0;
diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index 5f41c416a..fd6285057 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -276,11 +276,7 @@ exec386_dynarec_int(void)
cpu_block_end = 0;
x86_was_reset = 0;
-# ifdef USE_DEBUG_REGS_486
- if (trap & 2) {
-# else
if (trap == 2) {
-# endif
/* Handle the T bit in the new TSS first. */
CPU_BLOCK_END();
goto block_ended;
@@ -297,13 +293,6 @@ exec386_dynarec_int(void)
cpu_state.ea_seg = &cpu_state.seg_ds;
cpu_state.ssegs = 0;
-# ifdef USE_DEBUG_REGS_486
- if (UNLIKELY(cpu_386_check_instruction_fault())) {
- x86gen();
- goto block_ended;
- }
-# endif
-
fetchdat = fastreadl_fetch(cs + cpu_state.pc);
# ifdef ENABLE_386_DYNAREC_LOG
if (in_smm)
@@ -370,13 +359,7 @@ exec386_dynarec_int(void)
block_ended:
if (!cpu_state.abrt && !new_ne && trap) {
-# ifdef USE_DEBUG_REGS_486
- //pclog("Debug trap 0x%X\n", trap);
- if (trap & 2) dr[6] |= 0x8000;
- if (trap & 1) dr[6] |= 0x4000;
-# else
dr[6] |= (trap == 2) ? 0x8000 : 0x4000;
-# endif
trap = 0;
# ifndef USE_NEW_DYNAREC
@@ -902,6 +885,9 @@ exec386(int32_t cycs)
cycdiff = 0;
oldcyc = cycles;
while (cycdiff < cycle_period) {
+#ifdef USE_DEBUG_REGS_486
+ int ins_fetch_fault = 0;
+#endif
ins_cycles = cycles;
#ifndef USE_NEW_DYNAREC
@@ -919,8 +905,14 @@ exec386(int32_t cycs)
cpu_state.ssegs = 0;
#ifdef USE_DEBUG_REGS_486
- if (UNLIKELY(cpu_386_check_instruction_fault())) {
+ if (is386)
+ ins_fetch_fault = cpu_386_check_instruction_fault();
+
+ /* Breakpoint fault has priority over other faults. */
+ if ((cpu_state.abrt == 0) & ins_fetch_fault) {
x86gen();
+ ins_fetch_fault = 0;
+ /* No instructions executed at this point. */
goto block_ended;
}
#endif
@@ -972,11 +964,13 @@ exec386(int32_t cycs)
block_ended:
#endif
if (cpu_state.abrt) {
+ uint8_t oop = opcode;
flags_rebuild();
tempi = cpu_state.abrt & ABRT_MASK;
cpu_state.abrt = 0;
x86_doabrt(tempi);
if (cpu_state.abrt) {
+ pclog("Double fault - %02X\n", oop);
cpu_state.abrt = 0;
#ifndef USE_NEW_DYNAREC
CS = oldcs;
@@ -993,6 +987,11 @@ block_ended:
#endif
}
}
+
+#ifdef USE_DEBUG_REGS_486
+ if (is386 && !x86_was_reset && ins_fetch_fault)
+ x86gen();
+#endif
} else if (new_ne) {
flags_rebuild();
@@ -1005,20 +1004,14 @@ block_ended:
} else if (trap) {
flags_rebuild();
#ifdef USE_DEBUG_REGS_486
- if (trap & 1)
- dr[6] |= 0x4000;
- if (trap & 2)
- dr[6] |= 0x8000;
+ if (trap & 2) dr[6] |= 0x8000;
+ if (trap & 1) dr[6] |= 0x4000;
#endif
-
trap = 0;
#ifndef USE_NEW_DYNAREC
oldcs = CS;
#endif
cpu_state.oldpc = cpu_state.pc;
-#ifndef USE_DEBUG_REGS_486
- dr[6] |= 0x4000;
-#endif
x86_int(1);
}
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index c4d084947..b821bc657 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -209,6 +209,7 @@ int is286;
int is386;
int is6117;
int is486 = 1;
+int is586 = 0;
int cpu_isintel;
int cpu_iscyrix;
int hascache;
@@ -552,6 +553,8 @@ cpu_set(void)
cpu_16bitbus = (cpu_s->cpu_type == CPU_286) || (cpu_s->cpu_type == CPU_386SX) || (cpu_s->cpu_type == CPU_486SLC) || (cpu_s->cpu_type == CPU_IBM386SLC) || (cpu_s->cpu_type == CPU_IBM486SLC);
cpu_64bitbus = (cpu_s->cpu_type >= CPU_WINCHIP);
+ is586 = cpu_64bitbus || (cpu_s->cpu_type == CPU_P24T);
+
if (cpu_s->multi)
cpu_busspeed = cpu_s->rspeed / cpu_s->multi;
else
@@ -4303,47 +4306,47 @@ cpu_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
static uint8_t
cpu_read(uint16_t addr, UNUSED(void *priv))
{
+ uint8_t ret = 0xff;
+
if (addr == 0xf007)
- return 0x7f;
+ ret = 0x7f;
+ else if ((addr < 0xf0) && (addr & 1)) switch (cyrix_addr) {
+ case 0xc0:
+ ret = ccr0;
+ break;
+ case 0xc1:
+ ret = ccr1;
+ break;
+ case 0xc2:
+ ret = ccr2;
+ break;
+ case 0xc3:
+ ret = ccr3;
+ break;
+ case 0xe8:
+ ret = ((ccr3 & 0xf0) == 0x10) ? ccr4 : 0xff;
+ break;
+ case 0xe9:
+ ret = ((ccr3 & 0xf0) == 0x10) ? ccr5 : 0xff;
+ break;
+ case 0xea:
+ ret = ((ccr3 & 0xf0) == 0x10) ? ccr6 : 0xff;
+ break;
+ case 0xeb:
+ ret = ccr7;
+ break;
+ case 0xfe:
+ ret = cpu_s->cyrix_id & 0xff;
+ break;
+ case 0xff:
+ ret = cpu_s->cyrix_id >> 8;
+ break;
- if (addr >= 0xf0)
- return 0xff; /* FPU stuff */
-
- if (addr & 1) {
- switch (cyrix_addr) {
- case 0xc0:
- return ccr0;
- case 0xc1:
- return ccr1;
- case 0xc2:
- return ccr2;
- case 0xc3:
- return ccr3;
- case 0xe8:
- return ((ccr3 & 0xf0) == 0x10) ? ccr4 : 0xff;
- case 0xe9:
- return ((ccr3 & 0xf0) == 0x10) ? ccr5 : 0xff;
- case 0xea:
- return ((ccr3 & 0xf0) == 0x10) ? ccr6 : 0xff;
- case 0xeb:
- return ccr7;
- case 0xfe:
- return cpu_s->cyrix_id & 0xff;
- case 0xff:
- return cpu_s->cyrix_id >> 8;
-
- default:
- break;
- }
-
- if ((cyrix_addr & 0xf0) == 0xc0)
- return 0xff;
-
- if (cyrix_addr == 0x20 && (cpu_s->cpu_type == CPU_Cx5x86))
- return 0xff;
+ default:
+ break;
}
-
- return 0xff;
+
+ return ret;
}
void
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 8324c543e..d58da6998 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -513,6 +513,7 @@ extern int is286;
extern int is386;
extern int is6117;
extern int is486;
+extern int is586;
extern int is_am486;
extern int is_am486dxl;
extern int is_pentium;
diff --git a/src/cpu/x86seg.c b/src/cpu/x86seg.c
index 61c0edd9f..cd393812d 100644
--- a/src/cpu/x86seg.c
+++ b/src/cpu/x86seg.c
@@ -1113,7 +1113,7 @@ loadcscall(uint16_t seg)
x86seg_log("Type %04X\n", type);
if (type == 0x0c00) {
- PUSHL_SEL(oldss);
+ is586 ? PUSHL(oldss) : PUSHL_SEL(oldss);
PUSHL(oldsp2);
if (cpu_state.abrt) {
SS = oldss;
@@ -1678,10 +1678,17 @@ pmodeint(int num, int soft)
cpl_override = 1;
if (type >= 0x0800) {
if (cpu_state.eflags & VM_FLAG) {
- PUSHL_SEL(GS);
- PUSHL_SEL(FS);
- PUSHL_SEL(DS);
- PUSHL_SEL(ES);
+ if (is586) {
+ PUSHL(GS);
+ PUSHL(FS);
+ PUSHL(DS);
+ PUSHL(ES);
+ } else {
+ PUSHL_SEL(GS);
+ PUSHL_SEL(FS);
+ PUSHL_SEL(DS);
+ PUSHL_SEL(ES);
+ }
if (cpu_state.abrt)
return;
op_loadseg(0, &cpu_state.seg_ds);
@@ -1689,10 +1696,10 @@ pmodeint(int num, int soft)
op_loadseg(0, &cpu_state.seg_fs);
op_loadseg(0, &cpu_state.seg_gs);
}
- PUSHL_SEL(oldss);
+ is586 ? PUSHL(oldss) : PUSHL_SEL(oldss);
PUSHL(oldsp);
PUSHL(cpu_state.flags | (cpu_state.eflags << 16));
- PUSHL_SEL(CS);
+ is586 ? PUSHL(CS) : PUSHL_SEL(CS);
PUSHL(cpu_state.pc);
if (cpu_state.abrt)
return;
@@ -1728,7 +1735,7 @@ pmodeint(int num, int soft)
}
if (type > 0x0800) {
PUSHL(cpu_state.flags | (cpu_state.eflags << 16));
- PUSHL_SEL(CS);
+ is586 ? PUSHL(CS) : PUSHL_SEL(CS);
PUSHL(cpu_state.pc);
if (cpu_state.abrt)
return;
diff --git a/src/cpu/x87_ops.h b/src/cpu/x87_ops.h
index 97f5415b9..6a51a2c7f 100644
--- a/src/cpu/x87_ops.h
+++ b/src/cpu/x87_ops.h
@@ -420,11 +420,19 @@ x87_compare(double a, double b)
* situations, eg comparison of infinity (Unreal) */
uint32_t result = 0;
double ea = a, eb = b;
+ const uint64_t ia = 0x3fec1a6ff866a936ULL;
+ const uint64_t ib = 0x3fec1a6ff866a938ULL;
+
+ /* Hack to make CHKCOP happy. */
+ if (!memcmp(&ea, &ia, 8) && !memcmp(&eb, &ib, 8))
+ return FPU_SW_C3;
if ((fpu_type < FPU_287XL) && !(cpu_state.npxc & 0x1000) && ((a == INFINITY) || (a == -INFINITY)) && ((b == INFINITY) || (b == -INFINITY)))
eb = ea;
- if (ea == eb)
+ if ((isnan(a) || isnan(b)))
+ result |= FPU_SW_C3 | FPU_SW_C2 | FPU_SW_C0;
+ else if (ea == eb)
result |= FPU_SW_C3;
else if (ea < eb)
result |= FPU_SW_C0;
@@ -473,7 +481,9 @@ x87_ucompare(double a, double b)
* situations, eg comparison of infinity (Unreal) */
uint32_t result = 0;
- if (a == b)
+ if ((isnan(a) || isnan(b)))
+ result |= FPU_SW_C3 | FPU_SW_C2 | FPU_SW_C0;
+ else if (a == b)
result |= FPU_SW_C3;
else if (a < b)
result |= FPU_SW_C0;
diff --git a/src/cpu/x87_ops_misc.h b/src/cpu/x87_ops_misc.h
index 5821a5cd5..4009eadd6 100644
--- a/src/cpu/x87_ops_misc.h
+++ b/src/cpu/x87_ops_misc.h
@@ -585,10 +585,24 @@ opFXAM(UNUSED(uint32_t fetchdat))
if (cpu_state.tag[cpu_state.TOP & 7] == 3)
cpu_state.npxs |= (FPU_SW_C0 | FPU_SW_C3);
#endif
- else if (ST(0) == 0.0)
- cpu_state.npxs |= FPU_SW_C3;
- else
- cpu_state.npxs |= FPU_SW_C2;
+ else switch (fpclassify(ST(0)))
+ {
+ case FP_SUBNORMAL:
+ cpu_state.npxs |= FPU_SW_C2 | FPU_SW_C3;
+ break;
+ case FP_NAN:
+ cpu_state.npxs |= FPU_SW_C0;
+ break;
+ case FP_INFINITE:
+ cpu_state.npxs |= FPU_SW_C0 | FPU_SW_C2;
+ break;
+ case FP_ZERO:
+ cpu_state.npxs |= FPU_SW_C3;
+ break;
+ case FP_NORMAL:
+ cpu_state.npxs |= FPU_SW_C2;
+ break;
+ }
if (ST(0) < 0.0)
cpu_state.npxs |= FPU_SW_C1;
CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fxam) : (x87_timings.fxam * cpu_multi));
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 5de1a8ef4..51c3aa24a 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -105,6 +105,8 @@ static fdc_cards_t fdc_cards[] = {
// clang-format off
{ &device_none },
{ &device_internal },
+ { &fdc_xt_device },
+ { &fdc_at_device },
{ &fdc_b215_device },
{ &fdc_pii151b_device },
{ &fdc_pii158b_device },
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 3b283b3dd..590674a29 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -37,7 +37,7 @@ msgid "&Hide status bar"
msgstr "&Masquer la barre de status"
msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Masquer la &barre d'outils"
msgid "&Resizeable window"
msgstr "Fenètre &Retaillable"
diff --git a/src/qt/qt.c b/src/qt/qt.c
index 13ddbf498..a9a6460eb 100644
--- a/src/qt/qt.c
+++ b/src/qt/qt.c
@@ -54,8 +54,6 @@ plat_vidapi(const char *api)
return 4;
} else if (!strcasecmp(api, "vnc")) {
return 5;
- } else if (!strcasecmp(api, "qt_opengl3_pcem")) {
- return 6;
}
return 0;
@@ -85,9 +83,6 @@ plat_vidapi_name(int api)
case 5:
name = "vnc";
break;
- case 6:
- name = "qt_opengl3_pcem";
- break;
default:
fatal("Unknown renderer: %i\n", api);
break;
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index cdb46cb29..ccaf6964f 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -181,6 +181,7 @@ MainWindow::MainWindow(QWidget *parent)
main_window = this;
ui->setupUi(this);
status->setSoundGainAction(ui->actionSound_gain);
+ ui->menuEGA_S_VGA_settings->menuAction()->setMenuRole(QAction::NoRole);
ui->stackedWidget->setMouseTracking(true);
statusBar()->setVisible(!hide_status_bar);
#ifdef Q_OS_WINDOWS
@@ -454,9 +455,6 @@ MainWindow::MainWindow(QWidget *parent)
endblit();
}
#endif
- case 6:
- newVidApi = RendererStack::Renderer::OpenGL3PCem;
- break;
}
ui->stackedWidget->switchRenderer(newVidApi);
if (!show_second_monitors)
@@ -468,7 +466,7 @@ MainWindow::MainWindow(QWidget *parent)
});
connect(ui->stackedWidget, &RendererStack::rendererChanged, [this]() {
- ui->actionRenderer_options->setVisible(ui->stackedWidget->hasOptions());
+ ui->actionRenderer_options->setEnabled(ui->stackedWidget->hasOptions());
});
/* Trigger initial renderer switch */
@@ -1754,7 +1752,7 @@ MainWindow::on_actionAbout_86Box_triggered()
versioninfo.append(QString(" [%1, %2]").arg(QSysInfo::buildCpuArchitecture(), tr(DYNAREC_STR)));
msgBox.setText(QString("%3%1%2").arg(EMU_VERSION_FULL, versioninfo, tr("86Box v")));
msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."));
- msgBox.setWindowTitle("About 86Box");
+ msgBox.setWindowTitle(tr("About 86Box"));
const auto closeButton = msgBox.addButton("OK", QMessageBox::ButtonRole::AcceptRole);
msgBox.setEscapeButton(closeButton);
const auto webSiteButton = msgBox.addButton(EMU_SITE, QMessageBox::ButtonRole::HelpRole);
@@ -2028,8 +2026,8 @@ MainWindow::on_actionRenderer_options_triggered()
ui->stackedWidget->switchRenderer(static_cast(vid_api));
if (show_second_monitors) {
for (int i = 1; i < MONITORS_NUM; i++) {
- if (renderers[i] && renderers[i]->reloadRendererOption() && renderers[i]->hasOptions()) {
- ui->stackedWidget->switchRenderer(static_cast(vid_api));
+ if (renderers[i]) {
+ renderers[i]->switchRenderer(static_cast(vid_api));
}
}
}
diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui
index b1dc0ecf1..ef3cf16c6 100644
--- a/src/qt/qt_mainwindow.ui
+++ b/src/qt/qt_mainwindow.ui
@@ -353,6 +353,9 @@
Exit
+
+ QAction::QuitRole
+
@@ -815,6 +818,9 @@
Renderer options...
+
+ QAction::NoRole
+
diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index 43e696085..2b1cfdf26 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -288,7 +288,8 @@ RendererStack::leaveEvent(QEvent *event)
void
RendererStack::switchRenderer(Renderer renderer)
{
- startblit();
+ //startblit();
+ switchInProgress = true;
if (current) {
rendererWindow->finalize();
removeWidget(current.get());
@@ -339,26 +340,6 @@ RendererStack::createRenderer(Renderer renderer)
current.reset(this->createWindowContainer(hw, this));
break;
}
- case Renderer::OpenGL3PCem:
- {
- this->createWinId();
- auto hw = new OpenGLRenderer(this);
- rendererWindow = hw;
- connect(this, &RendererStack::blitToRenderer, hw, &OpenGLRenderer::onBlit, Qt::QueuedConnection);
- connect(hw, &OpenGLRenderer::initialized, [=]() {
- /* Buffers are available only after initialization. */
- imagebufs = rendererWindow->getBuffers();
- endblit();
- emit rendererChanged();
- });
- connect(hw, &OpenGLRenderer::errorInitializing, [=]() {
- /* Renderer not could initialize, fallback to software. */
- imagebufs = {};
- QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
- });
- current.reset(this->createWindowContainer(hw, this));
- break;
- }
case Renderer::OpenGL3:
{
this->createWinId();
@@ -369,7 +350,7 @@ RendererStack::createRenderer(Renderer renderer)
connect(hw, &OpenGLRenderer::initialized, [=]() {
/* Buffers are available only after initialization. */
imagebufs = rendererWindow->getBuffers();
- endblit();
+ switchInProgress = false;
emit rendererChanged();
});
connect(hw, &OpenGLRenderer::errorInitializing, [=]() {
@@ -401,7 +382,7 @@ RendererStack::createRenderer(Renderer renderer)
connect(hw, &VulkanWindowRenderer::rendererInitialized, [=]() {
/* Buffers are available only after initialization. */
imagebufs = rendererWindow->getBuffers();
- endblit();
+ switchInProgress = false;
emit rendererChanged();
});
connect(hw, &VulkanWindowRenderer::errorInitializing, [=]() {
@@ -431,9 +412,9 @@ RendererStack::createRenderer(Renderer renderer)
currentBuf = 0;
- if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan && renderer != Renderer::OpenGL3PCem) {
+ if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan) {
imagebufs = rendererWindow->getBuffers();
- endblit();
+ switchInProgress = false;
emit rendererChanged();
}
}
@@ -443,7 +424,7 @@ void
RendererStack::blit(int x, int y, int w, int h)
{
if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) ||
- (w > 2048) || (h > 2048) ||
+ (w > 2048) || (h > 2048) || (switchInProgress) ||
(monitors[m_monitor_index].target_buffer == NULL) || imagebufs.empty() ||
std::get(imagebufs[currentBuf])->test_and_set()) {
video_blit_complete_monitor(m_monitor_index);
diff --git a/src/qt/qt_rendererstack.hpp b/src/qt/qt_rendererstack.hpp
index a84773c72..54ea49bb9 100644
--- a/src/qt/qt_rendererstack.hpp
+++ b/src/qt/qt_rendererstack.hpp
@@ -61,7 +61,6 @@ public:
OpenGLES,
OpenGL3,
Vulkan,
- OpenGL3PCem = 6,
None = -1
};
void switchRenderer(Renderer renderer);
@@ -114,6 +113,7 @@ private:
std::unique_ptr current;
std::atomic_bool rendererTakesScreenshots;
+ std::atomic_bool switchInProgress{false};
};
#endif // QT_RENDERERCONTAINER_HPP
diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c
index 8d1de442b..1ca547650 100644
--- a/src/sound/snd_audiopci.c
+++ b/src/sound/snd_audiopci.c
@@ -2742,7 +2742,7 @@ static const device_config_t es1370_config[] = {
// clang-format off
{
.name = "receive_input",
- .description = "Receive input (MIDI)",
+ .description = "Receive MIDI input",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 1,
diff --git a/src/video/vid_chips_69000.c b/src/video/vid_chips_69000.c
index a387e99fa..b0e8db35a 100644
--- a/src/video/vid_chips_69000.c
+++ b/src/video/vid_chips_69000.c
@@ -251,486 +251,797 @@ chips_69000_bitblt_interrupt(chips_69000_t* chips)
chips_69000_interrupt(chips);
}
-void
-chips_69000_do_rop_8bpp(uint8_t *dst, uint8_t src, uint8_t rop)
-{
- switch (rop) {
- case 0x00:
- *dst = 0;
- break;
- case 0x11:
- *dst = ~(*dst) & ~src;
- break;
- case 0x22:
- *dst &= ~src;
- break;
- case 0x33:
- *dst = ~src;
- break;
- case 0x44:
- *dst = src & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x66:
- *dst ^= src;
- break;
- case 0x77:
- *dst = ~src | ~(*dst);
- break;
- case 0x88:
- *dst &= src;
- break;
- case 0x99:
- *dst ^= ~src;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xBB:
- *dst |= ~src;
- break;
- case 0xCC:
- *dst = src;
- break;
- case 0xDD:
- *dst = src | ~(*dst);
- break;
- case 0xEE:
- *dst |= src;
- break;
- case 0xFF:
- *dst = 0xFF;
- break;
+#define ROPMIX(R, D, P, S, out) \
+ { \
+ switch (R) { \
+ case 0x00: \
+ out = 0; \
+ break; \
+ case 0x01: \
+ out = ~(D | (P | S)); \
+ break; \
+ case 0x02: \
+ out = D & ~(P | S); \
+ break; \
+ case 0x03: \
+ out = ~(P | S); \
+ break; \
+ case 0x04: \
+ out = S & ~(D | P); \
+ break; \
+ case 0x05: \
+ out = ~(D | P); \
+ break; \
+ case 0x06: \
+ out = ~(P | ~(D ^ S)); \
+ break; \
+ case 0x07: \
+ out = ~(P | (D & S)); \
+ break; \
+ case 0x08: \
+ out = S & (D & ~P); \
+ break; \
+ case 0x09: \
+ out = ~(P | (D ^ S)); \
+ break; \
+ case 0x0a: \
+ out = D & ~P; \
+ break; \
+ case 0x0b: \
+ out = ~(P | (S & ~D)); \
+ break; \
+ case 0x0c: \
+ out = S & ~P; \
+ break; \
+ case 0x0d: \
+ out = ~(P | (D & ~S)); \
+ break; \
+ case 0x0e: \
+ out = ~(P | ~(D | S)); \
+ break; \
+ case 0x0f: \
+ out = ~P; \
+ break; \
+ case 0x10: \
+ out = P & ~(D | S); \
+ break; \
+ case 0x11: \
+ out = ~(D | S); \
+ break; \
+ case 0x12: \
+ out = ~(S | ~(D ^ P)); \
+ break; \
+ case 0x13: \
+ out = ~(S | (D & P)); \
+ break; \
+ case 0x14: \
+ out = ~(D | ~(P ^ S)); \
+ break; \
+ case 0x15: \
+ out = ~(D | (P & S)); \
+ break; \
+ case 0x16: \
+ out = P ^ (S ^ (D & ~(P & S))); \
+ break; \
+ case 0x17: \
+ out = ~(S ^ ((S ^ P) & (D ^ S))); \
+ break; \
+ case 0x18: \
+ out = (S ^ P) & (P ^ D); \
+ break; \
+ case 0x19: \
+ out = ~(S ^ (D & ~(P & S))); \
+ break; \
+ case 0x1a: \
+ out = P ^ (D | (S & P)); \
+ break; \
+ case 0x1b: \
+ out = ~(S ^ (D & (P ^ S))); \
+ break; \
+ case 0x1c: \
+ out = P ^ (S | (D & P)); \
+ break; \
+ case 0x1d: \
+ out = ~(D ^ (S & (P ^ D))); \
+ break; \
+ case 0x1e: \
+ out = P ^ (D | S); \
+ break; \
+ case 0x1f: \
+ out = ~(P & (D | S)); \
+ break; \
+ case 0x20: \
+ out = D & (P & ~S); \
+ break; \
+ case 0x21: \
+ out = ~(S | (D ^ P)); \
+ break; \
+ case 0x22: \
+ out = D & ~S; \
+ break; \
+ case 0x23: \
+ out = ~(S | (P & ~D)); \
+ break; \
+ case 0x24: \
+ out = (S ^ P) & (D ^ S); \
+ break; \
+ case 0x25: \
+ out = ~(P ^ (D & ~(S & P))); \
+ break; \
+ case 0x26: \
+ out = S ^ (D | (P & S)); \
+ break; \
+ case 0x27: \
+ out = S ^ (D | ~(P ^ S)); \
+ break; \
+ case 0x28: \
+ out = D & (P ^ S); \
+ break; \
+ case 0x29: \
+ out = ~(P ^ (S ^ (D | (P & S)))); \
+ break; \
+ case 0x2a: \
+ out = D & ~(P & S); \
+ break; \
+ case 0x2b: \
+ out = ~(S ^ ((S ^ P) & (P ^ D))); \
+ break; \
+ case 0x2c: \
+ out = S ^ (P & (D | S)); \
+ break; \
+ case 0x2d: \
+ out = P ^ (S | ~D); \
+ break; \
+ case 0x2e: \
+ out = P ^ (S | (D ^ P)); \
+ break; \
+ case 0x2f: \
+ out = ~(P & (S | ~D)); \
+ break; \
+ case 0x30: \
+ out = P & ~S; \
+ break; \
+ case 0x31: \
+ out = ~(S | (D & ~P)); \
+ break; \
+ case 0x32: \
+ out = S ^ (D | (P | S)); \
+ break; \
+ case 0x33: \
+ out = ~S; \
+ break; \
+ case 0x34: \
+ out = S ^ (P | (D & S)); \
+ break; \
+ case 0x35: \
+ out = S ^ (P | ~(D ^ S)); \
+ break; \
+ case 0x36: \
+ out = S ^ (D | P); \
+ break; \
+ case 0x37: \
+ out = ~(S & (D | P)); \
+ break; \
+ case 0x38: \
+ out = P ^ (S & (D | P)); \
+ break; \
+ case 0x39: \
+ out = S ^ (P | ~D); \
+ break; \
+ case 0x3a: \
+ out = S ^ (P | (D ^ S)); \
+ break; \
+ case 0x3b: \
+ out = ~(S & (P | ~D)); \
+ break; \
+ case 0x3c: \
+ out = P ^ S; \
+ break; \
+ case 0x3d: \
+ out = S ^ (P | ~(D | S)); \
+ break; \
+ case 0x3e: \
+ out = S ^ (P | (D & ~S)); \
+ break; \
+ case 0x3f: \
+ out = ~(P & S); \
+ break; \
+ case 0x40: \
+ out = P & (S & ~D); \
+ break; \
+ case 0x41: \
+ out = ~(D | (P ^ S)); \
+ break; \
+ case 0x42: \
+ out = (S ^ D) & (P ^ D); \
+ break; \
+ case 0x43: \
+ out = ~(S ^ (P & ~(D & S))); \
+ break; \
+ case 0x44: \
+ out = S & ~D; \
+ break; \
+ case 0x45: \
+ out = ~(D | (P & ~S)); \
+ break; \
+ case 0x46: \
+ out = D ^ (S | (P & D)); \
+ break; \
+ case 0x47: \
+ out = ~(P ^ (S & (D ^ P))); \
+ break; \
+ case 0x48: \
+ out = S & (D ^ P); \
+ break; \
+ case 0x49: \
+ out = ~(P ^ (D ^ (S | (P & D)))); \
+ break; \
+ case 0x4a: \
+ out = D ^ (P & (S | D)); \
+ break; \
+ case 0x4b: \
+ out = P ^ (D | ~S); \
+ break; \
+ case 0x4c: \
+ out = S & ~(D & P); \
+ break; \
+ case 0x4d: \
+ out = ~(S ^ ((S ^ P) | (D ^ S))); \
+ break; \
+ case 0x4e: \
+ out = P ^ (D | (S ^ P)); \
+ break; \
+ case 0x4f: \
+ out = ~(P & (D | ~S)); \
+ break; \
+ case 0x50: \
+ out = P & ~D; \
+ break; \
+ case 0x51: \
+ out = ~(D | (S & ~P)); \
+ break; \
+ case 0x52: \
+ out = D ^ (P | (S & D)); \
+ break; \
+ case 0x53: \
+ out = ~(S ^ (P & (D ^ S))); \
+ break; \
+ case 0x54: \
+ out = ~(D | ~(P | S)); \
+ break; \
+ case 0x55: \
+ out = ~D; \
+ break; \
+ case 0x56: \
+ out = D ^ (P | S); \
+ break; \
+ case 0x57: \
+ out = ~(D & (P | S)); \
+ break; \
+ case 0x58: \
+ out = P ^ (D & (S | P)); \
+ break; \
+ case 0x59: \
+ out = D ^ (P | ~S); \
+ break; \
+ case 0x5a: \
+ out = D ^ P; \
+ break; \
+ case 0x5b: \
+ out = D ^ (P | ~(S | D)); \
+ break; \
+ case 0x5c: \
+ out = D ^ (P | (S ^ D)); \
+ break; \
+ case 0x5d: \
+ out = ~(D & (P | ~S)); \
+ break; \
+ case 0x5e: \
+ out = D ^ (P | (S & ~D)); \
+ break; \
+ case 0x5f: \
+ out = ~(D & P); \
+ break; \
+ case 0x60: \
+ out = P & (D ^ S); \
+ break; \
+ case 0x61: \
+ out = ~(D ^ (S ^ (P | (D & S)))); \
+ break; \
+ case 0x62: \
+ out = D ^ (S & (P | D)); \
+ break; \
+ case 0x63: \
+ out = S ^ (D | ~P); \
+ break; \
+ case 0x64: \
+ out = S ^ (D & (P | S)); \
+ break; \
+ case 0x65: \
+ out = D ^ (S | ~P); \
+ break; \
+ case 0x66: \
+ out = D ^ S; \
+ break; \
+ case 0x67: \
+ out = S ^ (D | ~(P | S)); \
+ break; \
+ case 0x68: \
+ out = ~(D ^ (S ^ (P | ~(D | S)))); \
+ break; \
+ case 0x69: \
+ out = ~(P ^ (D ^ S)); \
+ break; \
+ case 0x6a: \
+ out = D ^ (P & S); \
+ break; \
+ case 0x6b: \
+ out = ~(P ^ (S ^ (D & (P | S)))); \
+ break; \
+ case 0x6c: \
+ out = S ^ (D & P); \
+ break; \
+ case 0x6d: \
+ out = ~(P ^ (D ^ (S & (P | D)))); \
+ break; \
+ case 0x6e: \
+ out = S ^ (D & (P | ~S)); \
+ break; \
+ case 0x6f: \
+ out = ~(P & ~(D ^ S)); \
+ break; \
+ case 0x70: \
+ out = P & ~(D & S); \
+ break; \
+ case 0x71: \
+ out = ~(S ^ ((S ^ D) & (P ^ D))); \
+ break; \
+ case 0x72: \
+ out = S ^ (D | (P ^ S)); \
+ break; \
+ case 0x73: \
+ out = ~(S & (D | ~P)); \
+ break; \
+ case 0x74: \
+ out = D ^ (S | (P ^ D)); \
+ break; \
+ case 0x75: \
+ out = ~(D & (S | ~P)); \
+ break; \
+ case 0x76: \
+ out = S ^ (D | (P & ~S)); \
+ break; \
+ case 0x77: \
+ out = ~(D & S); \
+ break; \
+ case 0x78: \
+ out = P ^ (D & S); \
+ break; \
+ case 0x79: \
+ out = ~(D ^ (S ^ (P & (D | S)))); \
+ break; \
+ case 0x7a: \
+ out = D ^ (P & (S | ~D)); \
+ break; \
+ case 0x7b: \
+ out = ~(S & ~(D ^ P)); \
+ break; \
+ case 0x7c: \
+ out = S ^ (P & (D | ~S)); \
+ break; \
+ case 0x7d: \
+ out = ~(D & ~(P ^ S)); \
+ break; \
+ case 0x7e: \
+ out = (S ^ P) | (D ^ S); \
+ break; \
+ case 0x7f: \
+ out = ~(D & (P & S)); \
+ break; \
+ case 0x80: \
+ out = D & (P & S); \
+ break; \
+ case 0x81: \
+ out = ~((S ^ P) | (D ^ S)); \
+ break; \
+ case 0x82: \
+ out = D & ~(P ^ S); \
+ break; \
+ case 0x83: \
+ out = ~(S ^ (P & (D | ~S))); \
+ break; \
+ case 0x84: \
+ out = S & ~(D ^ P); \
+ break; \
+ case 0x85: \
+ out = ~(P ^ (D & (S | ~P))); \
+ break; \
+ case 0x86: \
+ out = D ^ (S ^ (P & (D | S))); \
+ break; \
+ case 0x87: \
+ out = ~(P ^ (D & S)); \
+ break; \
+ case 0x88: \
+ out = D & S; \
+ break; \
+ case 0x89: \
+ out = ~(S ^ (D | (P & ~S))); \
+ break; \
+ case 0x8a: \
+ out = D & (S | ~P); \
+ break; \
+ case 0x8b: \
+ out = ~(D ^ (S | (P ^ D))); \
+ break; \
+ case 0x8c: \
+ out = S & (D | ~P); \
+ break; \
+ case 0x8d: \
+ out = ~(S ^ (D | (P ^ S))); \
+ break; \
+ case 0x8e: \
+ out = S ^ ((S ^ D) & (P ^ D)); \
+ break; \
+ case 0x8f: \
+ out = ~(P & ~(D & S)); \
+ break; \
+ case 0x90: \
+ out = P & ~(D ^ S); \
+ break; \
+ case 0x91: \
+ out = ~(S ^ (D & (P | ~S))); \
+ break; \
+ case 0x92: \
+ out = D ^ (P ^ (S & (D | P))); \
+ break; \
+ case 0x93: \
+ out = ~(S ^ (P & D)); \
+ break; \
+ case 0x94: \
+ out = P ^ (S ^ (D & (P | S))); \
+ break; \
+ case 0x95: \
+ out = ~(D ^ (P & S)); \
+ break; \
+ case 0x96: \
+ out = D ^ (P ^ S); \
+ break; \
+ case 0x97: \
+ out = P ^ (S ^ (D | ~(P | S))); \
+ break; \
+ case 0x98: \
+ out = ~(S ^ (D | ~(P | S))); \
+ break; \
+ case 0x99: \
+ out = ~(D ^ S); \
+ break; \
+ case 0x9a: \
+ out = D ^ (P & ~S); \
+ break; \
+ case 0x9b: \
+ out = ~(S ^ (D & (P | S))); \
+ break; \
+ case 0x9c: \
+ out = S ^ (P & ~D); \
+ break; \
+ case 0x9d: \
+ out = ~(D ^ (S & (P | D))); \
+ break; \
+ case 0x9e: \
+ out = D ^ (S ^ (P | (D & S))); \
+ break; \
+ case 0x9f: \
+ out = ~(P & (D ^ S)); \
+ break; \
+ case 0xa0: \
+ out = D & P; \
+ break; \
+ case 0xa1: \
+ out = ~(P ^ (D | (S & ~P))); \
+ break; \
+ case 0xa2: \
+ out = D & (P | ~S); \
+ break; \
+ case 0xa3: \
+ out = ~(D ^ (P | (S ^ D))); \
+ break; \
+ case 0xa4: \
+ out = ~(P ^ (D | ~(S | P))); \
+ break; \
+ case 0xa5: \
+ out = ~(P ^ D); \
+ break; \
+ case 0xa6: \
+ out = D ^ (S & ~P); \
+ break; \
+ case 0xa7: \
+ out = ~(P ^ (D & (S | P))); \
+ break; \
+ case 0xa8: \
+ out = D & (P | S); \
+ break; \
+ case 0xa9: \
+ out = ~(D ^ (P | S)); \
+ break; \
+ case 0xaa: \
+ out = D; \
+ break; \
+ case 0xab: \
+ out = D | ~(P | S); \
+ break; \
+ case 0xac: \
+ out = S ^ (P & (D ^ S)); \
+ break; \
+ case 0xad: \
+ out = ~(D ^ (P | (S & D))); \
+ break; \
+ case 0xae: \
+ out = D | (S & ~P); \
+ break; \
+ case 0xaf: \
+ out = D | ~P; \
+ break; \
+ case 0xb0: \
+ out = P & (D | ~S); \
+ break; \
+ case 0xb1: \
+ out = ~(P ^ (D | (S ^ P))); \
+ break; \
+ case 0xb2: \
+ out = S ^ ((S ^ P) | (D ^ S)); \
+ break; \
+ case 0xb3: \
+ out = ~(S & ~(D & P)); \
+ break; \
+ case 0xb4: \
+ out = P ^ (S & ~D); \
+ break; \
+ case 0xb5: \
+ out = ~(D ^ (P & (S | D))); \
+ break; \
+ case 0xb6: \
+ out = D ^ (P ^ (S | (D & P))); \
+ break; \
+ case 0xb7: \
+ out = ~(S & (D ^ P)); \
+ break; \
+ case 0xb8: \
+ out = P ^ (S & (D ^ P)); \
+ break; \
+ case 0xb9: \
+ out = ~(D ^ (S | (P & D))); \
+ break; \
+ case 0xba: \
+ out = D | (P & ~S); \
+ break; \
+ case 0xbb: \
+ out = D | ~S; \
+ break; \
+ case 0xbc: \
+ out = S ^ (P & ~(D & S)); \
+ break; \
+ case 0xbd: \
+ out = ~((S ^ D) & (P ^ D)); \
+ break; \
+ case 0xbe: \
+ out = D | (P ^ S); \
+ break; \
+ case 0xbf: \
+ out = D | ~(P & S); \
+ break; \
+ case 0xc0: \
+ out = P & S; \
+ break; \
+ case 0xc1: \
+ out = ~(S ^ (P | (D & ~S))); \
+ break; \
+ case 0xc2: \
+ out = ~(S ^ (P | ~(D | S))); \
+ break; \
+ case 0xc3: \
+ out = ~(P ^ S); \
+ break; \
+ case 0xc4: \
+ out = S & (P | ~D); \
+ break; \
+ case 0xc5: \
+ out = ~(S ^ (P | (D ^ S))); \
+ break; \
+ case 0xc6: \
+ out = S ^ (D & ~P); \
+ break; \
+ case 0xc7: \
+ out = ~(P ^ (S & (D | P))); \
+ break; \
+ case 0xc8: \
+ out = S & (D | P); \
+ break; \
+ case 0xc9: \
+ out = ~(S ^ (P | D)); \
+ break; \
+ case 0xca: \
+ out = D ^ (P & (S ^ D)); \
+ break; \
+ case 0xcb: \
+ out = ~(S ^ (P | (D & S))); \
+ break; \
+ case 0xcc: \
+ out = S; \
+ break; \
+ case 0xcd: \
+ out = S | ~(D | P); \
+ break; \
+ case 0xce: \
+ out = S | (D & ~P); \
+ break; \
+ case 0xcf: \
+ out = S | ~P; \
+ break; \
+ case 0xd0: \
+ out = P & (S | ~D); \
+ break; \
+ case 0xd1: \
+ out = ~(P ^ (S | (D ^ P))); \
+ break; \
+ case 0xd2: \
+ out = P ^ (D & ~S); \
+ break; \
+ case 0xd3: \
+ out = ~(S ^ (P & (D | S))); \
+ break; \
+ case 0xd4: \
+ out = S ^ ((S ^ P) & (P ^ D)); \
+ break; \
+ case 0xd5: \
+ out = ~(D & ~(P & S)); \
+ break; \
+ case 0xd6: \
+ out = P ^ (S ^ (D | (P & S))); \
+ break; \
+ case 0xd7: \
+ out = ~(D & (P ^ S)); \
+ break; \
+ case 0xd8: \
+ out = P ^ (D & (S ^ P)); \
+ break; \
+ case 0xd9: \
+ out = ~(S ^ (D | (P & S))); \
+ break; \
+ case 0xda: \
+ out = D ^ (P & ~(S & D)); \
+ break; \
+ case 0xdb: \
+ out = ~((S ^ P) & (D ^ S)); \
+ break; \
+ case 0xdc: \
+ out = S | (P & ~D); \
+ break; \
+ case 0xdd: \
+ out = S | ~D; \
+ break; \
+ case 0xde: \
+ out = S | (D ^ P); \
+ break; \
+ case 0xdf: \
+ out = S | ~(D & P); \
+ break; \
+ case 0xe0: \
+ out = P & (D | S); \
+ break; \
+ case 0xe1: \
+ out = ~(P ^ (D | S)); \
+ break; \
+ case 0xe2: \
+ out = D ^ (S & (P ^ D)); \
+ break; \
+ case 0xe3: \
+ out = ~(P ^ (S | (D & P))); \
+ break; \
+ case 0xe4: \
+ out = S ^ (D & (P ^ S)); \
+ break; \
+ case 0xe5: \
+ out = ~(P ^ (D | (S & P))); \
+ break; \
+ case 0xe6: \
+ out = S ^ (D & ~(P & S)); \
+ break; \
+ case 0xe7: \
+ out = ~((S ^ P) & (P ^ D)); \
+ break; \
+ case 0xe8: \
+ out = S ^ ((S ^ P) & (D ^ S)); \
+ break; \
+ case 0xe9: \
+ out = ~(D ^ (S ^ (P & ~(D & S)))); \
+ break; \
+ case 0xea: \
+ out = D | (P & S); \
+ break; \
+ case 0xeb: \
+ out = D | ~(P ^ S); \
+ break; \
+ case 0xec: \
+ out = S | (D & P); \
+ break; \
+ case 0xed: \
+ out = S | ~(D ^ P); \
+ break; \
+ case 0xee: \
+ out = D | S; \
+ break; \
+ case 0xef: \
+ out = S | (D | ~P); \
+ break; \
+ case 0xf0: \
+ out = P; \
+ break; \
+ case 0xf1: \
+ out = P | ~(D | S); \
+ break; \
+ case 0xf2: \
+ out = P | (D & ~S); \
+ break; \
+ case 0xf3: \
+ out = P | ~S; \
+ break; \
+ case 0xf4: \
+ out = P | (S & ~D); \
+ break; \
+ case 0xf5: \
+ out = P | ~D; \
+ break; \
+ case 0xf6: \
+ out = P | (D ^ S); \
+ break; \
+ case 0xf7: \
+ out = P | ~(D & S); \
+ break; \
+ case 0xf8: \
+ out = P | (D & S); \
+ break; \
+ case 0xf9: \
+ out = P | ~(D ^ S); \
+ break; \
+ case 0xfa: \
+ out = D | P; \
+ break; \
+ case 0xfb: \
+ out = D | (P | ~S); \
+ break; \
+ case 0xfc: \
+ out = P | S; \
+ break; \
+ case 0xfd: \
+ out = P | (S | ~D); \
+ break; \
+ case 0xfe: \
+ out = D | (P | S); \
+ break; \
+ case 0xff: \
+ out = ~0; \
+ break; \
+ } \
}
-}
-
-void
-chips_69000_do_rop_16bpp(uint16_t *dst, uint16_t src, uint8_t rop)
-{
- switch (rop) {
- case 0x00:
- *dst = 0;
- break;
- case 0x11:
- *dst = ~(*dst) & ~src;
- break;
- case 0x22:
- *dst &= ~src;
- break;
- case 0x33:
- *dst = ~src;
- break;
- case 0x44:
- *dst = src & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x66:
- *dst ^= src;
- break;
- case 0x77:
- *dst = ~src | ~(*dst);
- break;
- case 0x88:
- *dst &= src;
- break;
- case 0x99:
- *dst ^= ~src;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xBB:
- *dst |= ~src;
- break;
- case 0xCC:
- *dst = src;
- break;
- case 0xDD:
- *dst = src | ~(*dst);
- break;
- case 0xEE:
- *dst |= src;
- break;
- case 0xFF:
- *dst = 0xFFFF;
- break;
- }
-}
-
-void
-chips_69000_do_rop_24bpp(uint32_t *dst, uint32_t src, uint8_t rop)
-{
- switch (rop) {
- case 0x00:
- *dst = 0;
- break;
- case 0x11:
- *dst = ~(*dst) & ~src;
- break;
- case 0x22:
- *dst &= ~src;
- break;
- case 0x33:
- *dst = ~src;
- break;
- case 0x44:
- *dst = src & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x66:
- *dst ^= src;
- break;
- case 0x77:
- *dst = ~src | ~(*dst);
- break;
- case 0x88:
- *dst &= src;
- break;
- case 0x99:
- *dst ^= ~src;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xBB:
- *dst |= ~src;
- break;
- case 0xCC:
- *dst = src;
- break;
- case 0xDD:
- *dst = src | ~(*dst);
- break;
- case 0xEE:
- *dst |= src;
- break;
- case 0xFF:
- *dst = 0xFFFFFF;
- break;
- }
-}
void
chips_69000_do_rop_8bpp_patterned(uint8_t *dst, uint8_t pattern, uint8_t src, uint8_t rop)
{
- if ((rop & 0xF) == ((rop >> 4) & 0xF)) {
- return chips_69000_do_rop_8bpp(dst, src, rop);
- }
-
- switch (rop) {
- case 0x00:
- *dst = 0;
- break;
- case 0x05:
- *dst = ~(*dst) & ~pattern;
- break;
- case 0x0A:
- *dst &= ~pattern;
- break;
- case 0x0F:
- *dst = ~pattern;
- break;
- case 0x1A:
- *dst = pattern ^ (*dst | (pattern & src));
- break;
- case 0x2A:
- *dst = *dst & (~(src & pattern));
- break;
- case 0x3A:
- *dst = src ^ (pattern | (*dst ^ src));
- break;
- case 0x4A:
- *dst = *dst ^ (pattern & (src | *dst));
- break;
- case 0x50:
- *dst = pattern & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x5A:
- *dst ^= pattern;
- break;
- case 0x5F:
- *dst = ~pattern | ~(*dst);
- break;
- case 0x6A:
- *dst = *dst ^ (pattern & src);
- break;
- case 0x7A:
- *dst = *dst ^ (pattern & (src | (~*dst)));
- break;
- case 0x8A:
- *dst = *dst & (src | (~pattern));
- break;
- case 0x9A:
- *dst = *dst ^ (pattern & (~src));
- break;
- case 0xB8:
- *dst = (((pattern ^ *dst) & src) ^ pattern);
- break;
- case 0xA0:
- *dst &= pattern;
- break;
- case 0xA5:
- *dst ^= ~pattern;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xAC:
- *dst = src ^ (pattern & (*dst ^ src));
- break;
- case 0xAF:
- *dst |= ~pattern;
- break;
- case 0xBA:
- *dst |= (pattern & ~src);
- break;
- case 0xCA:
- *dst ^= (pattern & (src ^ *dst));
- break;
- case 0xE2:
- *dst ^= (src & (pattern ^ *dst));
- break;
- case 0xDA:
- *dst ^= pattern & (~(src & *dst));
- break;
- case 0xEA:
- *dst |= pattern & src;
- break;
- case 0xF0:
- *dst = pattern;
- break;
- case 0xF5:
- *dst = pattern | ~(*dst);
- break;
- case 0xFA:
- *dst |= pattern;
- break;
- case 0xFF:
- *dst = 0xFF;
- break;
- default:
- pclog("Unknown ROP 0x%X\n", rop);
- break;
- }
+ ROPMIX(rop, *dst, pattern, src, *dst);
}
void
chips_69000_do_rop_16bpp_patterned(uint16_t *dst, uint16_t pattern, uint16_t src, uint8_t rop)
{
- if ((rop & 0xF) == ((rop >> 4) & 0xF)) {
- return chips_69000_do_rop_16bpp(dst, src, rop);
- }
-
- switch (rop) {
- default:
- pclog("Unknown ROP 0x%X\n", rop);
- break;
- case 0x00:
- *dst = 0;
- break;
- case 0x05:
- *dst = ~(*dst) & ~pattern;
- break;
- case 0x0A:
- *dst &= ~pattern;
- break;
- case 0x0F:
- *dst = ~pattern;
- break;
- case 0x1A:
- *dst = pattern ^ (*dst | (pattern & src));
- break;
- case 0x2A:
- *dst = *dst & (~(src & pattern));
- break;
- case 0x3A:
- *dst = src ^ (pattern | (*dst ^ src));
- break;
- case 0x4A:
- *dst = *dst ^ (pattern & (src | *dst));
- break;
- case 0x50:
- *dst = pattern & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x5A:
- *dst ^= pattern;
- break;
- case 0x5F:
- *dst = ~pattern | ~(*dst);
- break;
- case 0x6A:
- *dst = *dst ^ (pattern & src);
- break;
- case 0x7A:
- *dst = *dst ^ (pattern & (src | (~*dst)));
- break;
- case 0x8A:
- *dst = *dst & (src | (~pattern));
- break;
- case 0x9A:
- *dst = *dst ^ (pattern & (~src));
- break;
- case 0xB8:
- *dst = (((pattern ^ *dst) & src) ^ pattern);
- break;
- case 0xA0:
- *dst &= pattern;
- break;
- case 0xA5:
- *dst ^= ~pattern;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xAC:
- *dst = src ^ (pattern & (*dst ^ src));
- break;
- case 0xAF:
- *dst |= ~pattern;
- break;
- case 0xBA:
- *dst |= (pattern & ~src);
- break;
- case 0xCA:
- *dst ^= (pattern & (src ^ *dst));
- break;
- case 0xE2:
- *dst ^= (src & (pattern ^ *dst));
- break;
- case 0xDA:
- *dst ^= pattern & (~(src & *dst));
- break;
- case 0xEA:
- *dst |= pattern & src;
- break;
- case 0xF0:
- *dst = pattern;
- break;
- case 0xF5:
- *dst = pattern | ~(*dst);
- break;
- case 0xFA:
- *dst |= pattern;
- break;
- case 0xFF:
- *dst = 0xFF;
- break;
- }
+ ROPMIX(rop, *dst, pattern, src, *dst);
}
void
chips_69000_do_rop_24bpp_patterned(uint32_t *dst, uint32_t pattern, uint32_t src, uint8_t rop)
{
uint32_t orig_dst = *dst & 0xFF000000;
-
- if ((rop & 0xF) == ((rop >> 4) & 0xF)) {
- return chips_69000_do_rop_24bpp(dst, src, rop);
- }
-
- switch (rop) {
- default:
- pclog("Unknown ROP 0x%X\n", rop);
- break;
- case 0x00:
- *dst = 0;
- break;
- case 0x05:
- *dst = ~(*dst) & ~pattern;
- break;
- case 0x0A:
- *dst &= ~pattern;
- break;
- case 0x0F:
- *dst = ~pattern;
- break;
- case 0x1A:
- *dst = pattern ^ (*dst | (pattern & src));
- break;
- case 0x2A:
- *dst = *dst & (~(src & pattern));
- break;
- case 0x3A:
- *dst = src ^ (pattern | (*dst ^ src));
- break;
- case 0x4A:
- *dst = *dst ^ (pattern & (src | *dst));
- break;
- case 0x50:
- *dst = pattern & ~(*dst);
- break;
- case 0x55:
- *dst = ~*dst;
- break;
- case 0x5A:
- *dst ^= pattern;
- break;
- case 0x5F:
- *dst = ~pattern | ~(*dst);
- break;
- case 0x6A:
- *dst = *dst ^ (pattern & src);
- break;
- case 0x7A:
- *dst = *dst ^ (pattern & (src | (~*dst)));
- break;
- case 0x8A:
- *dst = *dst & (src | (~pattern));
- break;
- case 0x9A:
- *dst = *dst ^ (pattern & (~src));
- break;
- case 0xB8:
- *dst = (((pattern ^ *dst) & src) ^ pattern);
- break;
- case 0xA0:
- *dst &= pattern;
- break;
- case 0xA5:
- *dst ^= ~pattern;
- break;
- case 0xAA:
- break; /* No-op. */
- case 0xAC:
- *dst = src ^ (pattern & (*dst ^ src));
- break;
- case 0xAF:
- *dst |= ~pattern;
- break;
- case 0xBA:
- *dst |= (pattern & ~src);
- break;
- case 0xCA:
- *dst ^= (pattern & (src ^ *dst));
- break;
- case 0xDA:
- *dst ^= pattern & (~(src & *dst));
- break;
- case 0xE2:
- *dst ^= (src & (pattern ^ *dst));
- break;
- case 0xEA:
- *dst |= pattern & src;
- break;
- case 0xF0:
- *dst = pattern;
- break;
- case 0xF5:
- *dst = pattern | ~(*dst);
- break;
- case 0xFA:
- *dst |= pattern;
- break;
- case 0xFF:
- *dst = 0xFF;
- break;
- }
+ ROPMIX(rop, *dst, pattern, src, *dst);
*dst &= 0xFFFFFF;
*dst |= orig_dst;
}
@@ -895,20 +1206,22 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
switch (chips->bitblt_running.bytes_per_pixel) {
case 1: /* 8 bits-per-pixel. */
{
- dest_pixel = chips_69000_readb_linear(dest_addr, chips);
+ //dest_pixel = chips_69000_readb_linear(dest_addr, chips);
+ dest_pixel = chips->svga.vram[dest_addr & chips->svga.vram_mask];
break;
}
case 2: /* 16 bits-per-pixel. */
{
- dest_pixel = chips_69000_readb_linear(dest_addr, chips);
- dest_pixel |= chips_69000_readb_linear(dest_addr + 1, chips) << 8;
+ //dest_pixel = *(uint16_t*)&chips->svga.vram[dest_addr & chips->svga.vram_mask];
+ dest_pixel = chips->svga.vram[dest_addr & chips->svga.vram_mask];
+ dest_pixel |= chips->svga.vram[(dest_addr + 1) & chips->svga.vram_mask] << 8;
break;
}
case 3: /* 24 bits-per-pixel. */
{
- dest_pixel = chips_69000_readb_linear(dest_addr, chips);
- dest_pixel |= chips_69000_readb_linear(dest_addr + 1, chips) << 8;
- dest_pixel |= chips_69000_readb_linear(dest_addr + 2, chips) << 16;
+ dest_pixel = chips->svga.vram[dest_addr & chips->svga.vram_mask];
+ dest_pixel |= chips->svga.vram[(dest_addr + 1) & chips->svga.vram_mask] << 8;
+ dest_pixel |= chips->svga.vram[(dest_addr + 2) & chips->svga.vram_mask] << 16;
break;
}
}
@@ -921,7 +1234,7 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
if (chips->bitblt_running.bitblt.bitblt_control & (1 << 19))
pattern_data = 0;
else
- pattern_data = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr + ((vert_pat_alignment + (chips->bitblt_running.y & 7)) & 7), chips);
+ pattern_data = chips->svga.vram[(chips->bitblt_running.bitblt.pat_addr + ((vert_pat_alignment + (chips->bitblt_running.y & 7)) & 7)) & chips->svga.vram_mask]; //chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr + ((vert_pat_alignment + (chips->bitblt_running.y & 7)) & 7), chips);
is_true = !!(pattern_data & (1 << (7 - ((chips->bitblt_running.bitblt.destination_addr + chips->bitblt_running.x) & 7))));
@@ -937,32 +1250,30 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
pattern_pixel &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
} else {
+ uint32_t pattern_pixel_addr = 0;
if (chips->bitblt_running.bytes_per_pixel == 1) {
- pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7)
- + (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7), chips);
+ pattern_pixel_addr = chips->bitblt_running.bitblt.pat_addr
+ + 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7)
+ + (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7);
+
+ pattern_pixel = chips->svga.vram[pattern_pixel_addr & chips->svga.vram_mask];
}
if (chips->bitblt_running.bytes_per_pixel == 2) {
- pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + (2 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
- + (2 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)), chips);
+ pattern_pixel_addr = chips->bitblt_running.bitblt.pat_addr
+ + (2 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+ + (2 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7));
- pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + (2 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
- + (2 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)) + 1, chips) << 8;
+ pattern_pixel = chips->svga.vram[pattern_pixel_addr & chips->svga.vram_mask];
+ pattern_pixel |= chips->svga.vram[(pattern_pixel_addr + 1) & chips->svga.vram_mask] << 8;
}
if (chips->bitblt_running.bytes_per_pixel == 3) {
- pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
- + (3 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)), chips);
+ pattern_pixel_addr = chips->bitblt_running.bitblt.pat_addr
+ + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+ + (3 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7));
- pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
- + (3 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)) + 1, chips) << 8;
-
- pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
- + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
- + (3 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)) + 2, chips) << 16;
+ pattern_pixel = chips->svga.vram[pattern_pixel_addr & chips->svga.vram_mask];
+ pattern_pixel |= chips->svga.vram[(pattern_pixel_addr + 1) & chips->svga.vram_mask] << 8;
+ pattern_pixel |= chips->svga.vram[(pattern_pixel_addr + 2) & chips->svga.vram_mask] << 16;
}
}
if (chips->bitblt_running.bytes_per_pixel == 2) {
@@ -980,7 +1291,7 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
: chips->bitblt_running.bitblt.pattern_source_key_bg;
color_key &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
- if (!!(color_key == dest_pixel) == !!(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
+ if (!!(color_key == dest_pixel) == !(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
return;
}
@@ -1018,7 +1329,7 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
color_key &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
dest_pixel &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
- if (!!(color_key == dest_pixel) == !!(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
+ if (!!(color_key == dest_pixel) == !(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
return;
}
@@ -1030,20 +1341,21 @@ chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
switch (chips->bitblt_running.bytes_per_pixel) {
case 1: /* 8 bits-per-pixel. */
{
- chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
+ chips->svga.vram[dest_addr & chips->svga.vram_mask] = dest_pixel & 0xFF;
+ //chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
break;
}
case 2: /* 16 bits-per-pixel. */
{
- chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
- chips_69000_writeb_linear(dest_addr + 1, (dest_pixel >> 8) & 0xFF, chips);
+ chips->svga.vram[dest_addr & chips->svga.vram_mask] = dest_pixel & 0xFF;
+ chips->svga.vram[(dest_addr + 1) & chips->svga.vram_mask] = (dest_pixel >> 8) & 0xFF;
break;
}
case 3: /* 24 bits-per-pixel. */
{
- chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
- chips_69000_writeb_linear(dest_addr + 1, (dest_pixel >> 8) & 0xFF, chips);
- chips_69000_writeb_linear(dest_addr + 2, (dest_pixel >> 16) & 0xFF, chips);
+ chips->svga.vram[dest_addr & chips->svga.vram_mask] = dest_pixel & 0xFF;
+ chips->svga.vram[(dest_addr + 1) & chips->svga.vram_mask] = (dest_pixel >> 8) & 0xFF;
+ chips->svga.vram[(dest_addr + 2) & chips->svga.vram_mask] = (dest_pixel >> 16) & 0xFF;
break;
}
}
@@ -1211,7 +1523,8 @@ chips_69000_setup_bitblt(chips_69000_t* chips)
uint32_t orig_source_addr = chips->bitblt_running.bitblt.source_addr;
while (orig_count_y == chips->bitblt_running.count_y) {
int i = 0;
- uint8_t data = chips_69000_readb_linear(orig_source_addr, chips);
+ //uint8_t data = chips_69000_readb_linear(orig_source_addr, chips);
+ uint8_t data = chips->svga.vram[orig_source_addr & chips->svga.vram_mask];
orig_source_addr++;
for (i = 0; i < 8; i++) {
chips_69000_process_mono_bit(chips, !!(data & (1 << (7 - i))));
@@ -1230,14 +1543,15 @@ chips_69000_setup_bitblt(chips_69000_t* chips)
case 1: /* Bit-aligned */
case 2: /* Byte-aligned */
{
- uint32_t data = chips_69000_readb_linear(source_addr, chips);
+ //uint32_t data = chips_69000_readb_linear(source_addr, chips);
+ uint32_t data = chips->svga.vram[source_addr & chips->svga.vram_mask];
chips_69000_bitblt_write(chips, data & 0xFF);
source_addr += 1;
break;
}
case 3: /* Word-aligned*/
{
- uint32_t data = chips_69000_readw_linear(source_addr, chips);
+ uint32_t data = chips->svga.vram[source_addr & chips->svga.vram_mask] | (chips->svga.vram[(source_addr + 1) & chips->svga.vram_mask] << 8);
chips_69000_bitblt_write(chips, data & 0xFF);
chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
source_addr += 2;
@@ -1245,7 +1559,8 @@ chips_69000_setup_bitblt(chips_69000_t* chips)
}
case 4: /* Doubleword-aligned*/
{
- uint32_t data = chips_69000_readl_linear(source_addr, chips);
+ uint32_t data = chips->svga.vram[source_addr & chips->svga.vram_mask] | (chips->svga.vram[(source_addr + 1) & chips->svga.vram_mask] << 8)
+ | (chips->svga.vram[(source_addr + 2) & chips->svga.vram_mask] << 16) | (chips->svga.vram[(source_addr + 3) & chips->svga.vram_mask] << 24);
chips_69000_bitblt_write(chips, data & 0xFF);
chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
chips_69000_bitblt_write(chips, (data >> 16) & 0xFF);
@@ -1255,7 +1570,15 @@ chips_69000_setup_bitblt(chips_69000_t* chips)
}
case 5: /* Quadword-aligned*/
{
- uint64_t data = (uint64_t)chips_69000_readl_linear(source_addr, chips) | ((uint64_t)chips_69000_readl_linear(source_addr + 4, chips) << 32ull);
+ uint64_t data = chips->svga.vram[source_addr & chips->svga.vram_mask]
+ | (chips->svga.vram[(source_addr + 1) & chips->svga.vram_mask] << 8)
+ | (chips->svga.vram[(source_addr + 2) & chips->svga.vram_mask] << 16)
+ | (chips->svga.vram[(source_addr + 3) & chips->svga.vram_mask] << 24)
+ | ((uint64_t)chips->svga.vram[(source_addr + 4) & chips->svga.vram_mask] << 32ULL)
+ | ((uint64_t)chips->svga.vram[(source_addr + 5) & chips->svga.vram_mask] << 40ULL)
+ | ((uint64_t)chips->svga.vram[(source_addr + 6) & chips->svga.vram_mask] << 48ULL)
+ | ((uint64_t)chips->svga.vram[(source_addr + 7) & chips->svga.vram_mask] << 56ULL);
+ //uint64_t data = (uint64_t)chips_69000_readl_linear(source_addr, chips) | ((uint64_t)chips_69000_readl_linear(source_addr + 4, chips) << 32ull);
chips_69000_bitblt_write(chips, data & 0xFF);
chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
chips_69000_bitblt_write(chips, (data >> 16) & 0xFF);
@@ -1280,20 +1603,21 @@ chips_69000_setup_bitblt(chips_69000_t* chips)
switch (chips->bitblt_running.bytes_per_pixel) {
case 1: /* 8 bits-per-pixel. */
{
- pixel = chips_69000_readb_linear(source_addr, chips);
+ //pixel = chips_69000_readb_linear(source_addr, chips);
+ pixel = chips->svga.vram[source_addr & chips->svga.vram_mask];
break;
}
case 2: /* 16 bits-per-pixel. */
{
- pixel = chips_69000_readb_linear(source_addr, chips);
- pixel |= chips_69000_readb_linear(source_addr + 1, chips) << 8;
+ pixel = chips->svga.vram[source_addr & chips->svga.vram_mask];
+ pixel |= chips->svga.vram[(source_addr + 1) & chips->svga.vram_mask] << 8;
break;
}
case 3: /* 24 bits-per-pixel. */
{
- pixel = chips_69000_readb_linear(source_addr, chips);
- pixel |= chips_69000_readb_linear(source_addr + 1, chips) << 8;
- pixel |= chips_69000_readb_linear(source_addr + 2, chips) << 16;
+ pixel = chips->svga.vram[source_addr & chips->svga.vram_mask];
+ pixel |= chips->svga.vram[(source_addr + 1) & chips->svga.vram_mask] << 8;
+ pixel |= chips->svga.vram[(source_addr + 2) & chips->svga.vram_mask] << 16;
break;
}
}