From 2c912695745afc0e9088ebba38c6043c8bf78626 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Mon, 30 Aug 2010 23:36:35 +0300 Subject: [PATCH] Don't crash if VBE register #10 is poked --- Changelog.utf8 | 1 + org/jpc/emulator/pci/peripheral/VGACard.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.utf8 b/Changelog.utf8 index e6bdb1f..083ba2a 100644 --- a/Changelog.utf8 +++ b/Changelog.utf8 @@ -54,6 +54,7 @@ Changes since JPC-RR Release 10.5: - Merge r10 maint fixes. - Fix some save/movie handling bugs in Lua. - Show what keyedge timing is if its incorrect (makes hexing easier). +- Don't crash if VBE register #10 is poked. Changes since JPC-RR Release 10.16: =================================== diff --git a/org/jpc/emulator/pci/peripheral/VGACard.java b/org/jpc/emulator/pci/peripheral/VGACard.java index 19a175d..dc1fcc8 100644 --- a/org/jpc/emulator/pci/peripheral/VGACard.java +++ b/org/jpc/emulator/pci/peripheral/VGACard.java @@ -911,7 +911,7 @@ public class VGACard extends AbstractPCIDevice implements IOPortCapable, TimerRe private final void vbeIOPortWriteData(int data) { - if(vbeIndex <= VBE_DISPI_INDEX_NB) { + if(vbeIndex < VBE_DISPI_INDEX_NB) { switch(vbeIndex) { case VBE_DISPI_INDEX_ID: if(data == VBE_DISPI_ID0 || data == VBE_DISPI_ID1 || data == VBE_DISPI_ID2) @@ -1042,7 +1042,7 @@ public class VGACard extends AbstractPCIDevice implements IOPortCapable, TimerRe private final int vbeIOPortReadData() { - if(vbeIndex <= VBE_DISPI_INDEX_NB) { + if(vbeIndex < VBE_DISPI_INDEX_NB) { return vbeRegs[vbeIndex]; } else { return 0; -- 2.11.4.GIT