Removed an unused table from the XT MFM controller code;

808x prefetch queue is now always cleared on soft reset (as it should be due the changing CS:IP).
This commit is contained in:
OBattler
2019-10-21 03:24:36 +02:00
parent af420d19d3
commit c6ee6f48de
2 changed files with 7 additions and 24 deletions

View File

@@ -9,7 +9,7 @@
* 808x CPU emulation, mostly ported from reenigne's XTCE, which * 808x CPU emulation, mostly ported from reenigne's XTCE, which
* is cycle-accurate. * is cycle-accurate.
* *
* Version: @(#)808x.c 1.0.10 2019/10/20 * Version: @(#)808x.c 1.0.11 2019/10/21
* *
* Authors: Andrew Jenner, <https://www.reenigne.org> * Authors: Andrew Jenner, <https://www.reenigne.org>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -943,7 +943,6 @@ reset_common(int hard)
resetreadlookup(); resetreadlookup();
makemod1table(); makemod1table();
resetmcr(); resetmcr();
pfq_clear();
cpu_set_edx(); cpu_set_edx();
mmu_perm = 4; mmu_perm = 4;
pfq_size = (is8086) ? 6 : 4; pfq_size = (is8086) ? 6 : 4;
@@ -958,7 +957,9 @@ reset_common(int hard)
x86_was_reset = 1; x86_was_reset = 1;
cpu_alt_reset = 0; cpu_alt_reset = 0;
pfq_clear();
prefetching = 1; prefetching = 1;
takeint = 0; takeint = 0;
} }

View File

@@ -41,13 +41,13 @@
* Since all controllers (including the ones made by DTC) use * Since all controllers (including the ones made by DTC) use
* (mostly) the same API, we keep them all in this module. * (mostly) the same API, we keep them all in this module.
* *
* Version: @(#)hdc_st506_xt.c 1.0.16 2019/03/02 * Version: @(#)hdc_st506_xt.c 1.0.17 2019/10/20
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk> * Sarah Walker, <tommowalker@tommowalker.co.uk>
* *
* Copyright 2017-2019 Fred N. van Kempen. * Copyright 2017-2019 Fred N. van Kempen.
* Copyright 2008-2018 Sarah Walker. * Copyright 2008-2019 Sarah Walker.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -289,24 +289,6 @@ hd_type_t hd_types[4] = {
{ 306, 8, MFM_SECTORS } /* type 13 */ { 306, 8, MFM_SECTORS } /* type 13 */
}; };
hd_type_t wd1002a_wx1_hd_types[8] = {
{ 306, 4, MFM_SECTORS }, /* 1023, ? */
{ 612, 4, MFM_SECTORS }, /* 1023, ? */
{ 612, 2, MFM_SECTORS }, /* 1023, ? */
{ 820, 6, MFM_SECTORS }, /* 934, ? */
{ 1024, 8, MFM_SECTORS }, /* 934, ? */
{ 640, 6, MFM_SECTORS }, /* 939, ? */
{ 733, 5, MFM_SECTORS }, /* 939, ? */
{ 977, 5, MFM_SECTORS } /* 1023, ? */
};
hd_type_t wd1002a_27x_hd_types[4] = {
{ 981, 5, RLL_SECTORS }, /* type 0 */
{ 987, 7, RLL_SECTORS }, /* type 16 */
{ 612, 4, RLL_SECTORS }, /* type 2 */
{ 615, 4, RLL_SECTORS } /* type 13 */
};
#ifdef ENABLE_ST506_XT_LOG #ifdef ENABLE_ST506_XT_LOG
int st506_xt_do_log = ENABLE_ST506_XT_LOG; int st506_xt_do_log = ENABLE_ST506_XT_LOG;