Merge branch '86Box:master' into master

CMakeLists.txt

@@ -153,7 +153,6 @@ cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"
 cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF)
-cmake_dependent_option(MGA "Matrox Mystique graphics adapters" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(PAS16 "Pro Audio Spectrum 16" ON "DEV_BRANCH" OFF)
@@ -197,7 +196,7 @@ if(NOT EMU_BUILD_NUM)
  set(EMU_BUILD_NUM 0)
 endif()
 if(NOT EMU_COPYRIGHT_YEAR)
- set(EMU_COPYRIGHT_YEAR 2023)
+ set(EMU_COPYRIGHT_YEAR 2024)
 endif()
 
 add_subdirectory(src)

debian/control

@@ -1,18 +1,21 @@
 Source: 86box
 Section: otherosfs
 Priority: optional
-Maintainer: Mariusz Kurek <mariuszkurek@protonmail.com>
+Maintainer: Jasmine Iwanek <jriwanek@gmail.com>
 Build-Depends: cmake (>= 3.21),
  debhelper-compat (= 13),
  libevdev-dev,
+ libfluidsynth-dev,
  libfreetype-dev,
  libopenal-dev,
  libqt5opengl5-dev,
  librtmidi-dev,
  libsdl2-dev,
  libslirp-dev,
+ libxkbcommon-x11-dev,
  ninja-build,
- qttools5-dev
+ qttools5-dev,
+ qtbase5-private-dev
 Standards-Version: 4.6.0
 Homepage: https://86box.net/
 #Vcs-Browser: https://salsa.debian.org/debian/86box
@@ -26,4 +29,6 @@ Depends: ${shlibs:Depends},
  sse2-support [i386]
 Recommends: libpcap0.8-dev
 Description: An emulator for classic IBM PC clones
-#TODO: insert long description, indented with spaces
+ 86Box is a low level x86 emulator that runs older operating systems and software
+ designed for IBM PC systems and compatibles from 1981 through
+ fairly recent system designs based on the PCI bus.

debian/copyright

@@ -8,7 +8,8 @@ Copyright: <years> <put author's name and email here>
 License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2022 Mariusz Kurek <mariuszkurek@protonmail.com>
+Copyright: 2023 Jasmine Iwanek <jriwanek@gmail.com>
+ 2022 Lili Kurek <lili@lili.lgbt>
 License: GPL-2.0+
 
 License: GPL-2.0+

debian/rules

@@ -25,7 +25,10 @@ endif
  dh $@ --buildsystem cmake+ninja
 
 override_dh_auto_configure:
- dh_auto_configure --buildsystem cmake+ninja -- --preset regular --toolchain $(TOOLCHAIN) -DNEW_DYNAREC=$(NDR)
+ dh_auto_configure --buildsystem cmake+ninja -- --preset regular --toolchain $(TOOLCHAIN) -DNEW_DYNAREC=$(NDR) -B .
+
+override_dh_auto_build:
+ dh_auto_build --buildsystem cmake+ninja
 
 override_dh_auto_test:
 

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

src/86box.c

@@ -543,7 +543,9 @@ pc_init(int argc, char *argv[])
  printf("-N or --noconfirm - do not ask for confirmation on quit\n");
  printf("-P or --vmpath path - set 'path' to be root for vm\n");
  printf("-R or --rompath path - set 'path' to be ROM path\n");
+#ifndef USE_SDL_UI
  printf("-S or --settings - show only the settings dialog\n");
+#endif
  printf("-V or --vmname name - overrides the name of the running VM\n");
  printf("-X or --clear what - clears the 'what' (cmos/flash/both)\n");
  printf("-Y or --donothing - do not show any UI or run the emulation\n");
@@ -610,8 +612,10 @@ pc_init(int argc, char *argv[])
  goto usage;
 
  strcpy(vm_name, argv[++c]);
+#ifndef USE_SDL_UI
  } else if (!strcasecmp(argv[c], "--settings") || !strcasecmp(argv[c], "-S")) {
  settings_only = 1;
+#endif
  } else if (!strcasecmp(argv[c], "--noconfirm") || !strcasecmp(argv[c], "-N")) {
  confirm_exit_cmdl = 0;
  } else if (!strcasecmp(argv[c], "--missing") || !strcasecmp(argv[c], "-M")) {
@@ -1160,9 +1164,6 @@ pc_reset_hard_init(void)
  * that will be a call to device_reset_all() later !
  */
 
- if (joystick_type)
- gameport_update_joystick_type();
-
  /* Reset and reconfigure the Sound Card layer. */
  sound_card_reset();
 
@@ -1206,10 +1207,13 @@ pc_reset_hard_init(void)
  /* Reset any ISA RTC cards. */
  isartc_reset();
 
- /* Initialize the Voodoo cards here inorder to minmize
+ /* Initialize the Voodoo cards here inorder to minimize
  the chances of the SCSI controller ending up on the bridge. */
  video_voodoo_init();
 
+ if (joystick_type)
+ gameport_update_joystick_type(); /* installs game port if no device provides one, must be late */
+
  ui_sb_update_panes();
 
  if (config_changed) {
@@ -1588,10 +1592,10 @@ do_pause(int p)
 {
  int old_p = dopause;
 
- if (p && !old_p)
+ if ((p == 1) && !old_p)
  do_pause_ack = p;
- dopause = p;
- if (p && !old_p) {
+ dopause = !!p;
+ if ((p == 1) && !old_p) {
  while (!atomic_load(&pause_ack))
  ;
  }

src/CMakeLists.txt

@@ -229,5 +229,6 @@ if (QT)
 elseif(WIN32)
  add_subdirectory(win)
 else()
+ add_compile_definitions(USE_SDL_UI)
  add_subdirectory(unix)
 endif()

src/acpi.c

@@ -723,7 +723,8 @@ acpi_reg_write_common_regs(UNUSED(int size), uint16_t addr, uint8_t val, void *p
 
  /* Since the UI doesn't have a power button at the moment, pause emulation,
  then trigger a resume event so that the system resumes after unpausing. */
- plat_pause(1);
+ plat_pause(2); /* 2 means do not wait for pause as
+ we're already in the CPU thread. */
  timer_set_delay_u64(&dev->resume_timer, 50 * TIMER_USEC);
  }
  }

src/cdrom/cdrom.c

@@ -614,8 +614,14 @@ cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit)
  break;
  }
 
- /* Unlike standard commands, if there's a data track on an Audio CD (mixed mode)
- the playback continues with the audio muted (Toshiba CD-ROM SCSI-2 manual reference). */
+ /* Do this at this point, since it's at this point that we know the
+ actual LBA position to start playing from. */
+ if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
+ cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
+ cdrom_stop(dev);
+ return 0;
+ }
+
  dev->cd_buflen = 0;
  dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_PAUSED;
  return 1;
@@ -641,6 +647,14 @@ cdrom_audio_track_search_pioneer(cdrom_t *dev, uint32_t pos, uint8_t playbit)
 
  dev->seek_pos = pos;
 
+ /* Do this at this point, since it's at this point that we know the
+ actual LBA position to start playing from. */
+ if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
+ cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
+ cdrom_stop(dev);
+ return 0;
+ }
+
  dev->cd_buflen = 0;
  dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_PAUSED;
  return 1;
@@ -705,8 +719,14 @@ cdrom_audio_play_toshiba(cdrom_t *dev, uint32_t pos, int type)
 
  cdrom_log("Toshiba/NEC Play Audio: MSF = %06x, type = %02x, cdstatus = %02x\n", pos, type, dev->cd_status);
 
- /* Unlike standard commands, if there's a data track on an Audio CD (mixed mode)
- the playback continues with the audio muted (Toshiba CD-ROM SCSI-2 manual reference). */
+ /* Do this at this point, since it's at this point that we know the
+ actual LBA position to start playing from. */
+ if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
+ cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
+ cdrom_stop(dev);
+ return 0;
+ }
+
  dev->cd_buflen = 0;
  dev->cd_status = CD_STATUS_PLAYING;
  return 1;

src/chipset/ali1543.c

@@ -489,12 +489,10 @@ static void
 ali5229_ide_irq_handler(ali1543_t *dev)
 {
  int ctl = 0;
- int ch = 0;
  int bit = 0;
 
  if (dev->ide_conf[0x52] & 0x10) {
  ctl ^= 1;
- ch ^= 1;
  bit ^= 5;
  }
 
@@ -984,7 +982,7 @@ static void
 ali7101_write(int func, int addr, uint8_t val, void *priv)
 {
  ali1543_t *dev = (ali1543_t *) priv;
- ali1543_log("M7101: dev->pmu_conf[%02x] = %02x\n", addr, val);
+ ali1543_log("M7101: [W] dev->pmu_conf[%02x] = %02x\n", addr, val);
 
  if (func > 0)
  return;
@@ -1408,65 +1406,78 @@ ali7101_read(int func, int addr, void *priv)
  uint8_t ret = 0xff;
 
  if (dev->pmu_dev_enable && (func == 0)) {
- if ((dev->pmu_conf[0xc9] & 0x01) && (addr >= 0x40) && (addr != 0xc9))
- return 0xff;
-
- /* TODO: C4, C5 = GPIREG (masks: 0D, 0E) */
- switch (addr) {
- default:
- ret = dev->pmu_conf[addr];
- break;
- case 0x42:
- ret = (dev->pmu_conf[addr] & 0xf7) | (nvr_smi_status(dev->nvr) ? 0x08 : 0x00);
- break;
- case 0x43:
- ret = acpi_ali_soft_smi_status_read(dev->acpi) ? 0x10 : 0x00;
- break;
- case 0x7f:
- ret = 0x80;
- break;
- case 0xbc:
- ret = inb(0x70);
- break;
- }
-
- if (dev->pmu_conf[0x77] & 0x10) {
+ if (!(dev->pmu_conf[0xc9] & 0x01) || (addr < 0x40) || (addr == 0xc9)) {
+ /* TODO: C4, C5 = GPIREG (masks: 0D, 0E) */
  switch (addr) {
- case 0x42:
- dev->pmu_conf[addr] &= 0xe0;
- break;
- case 0x43:
- dev->pmu_conf[addr] &= 0xef;
- acpi_ali_soft_smi_status_write(dev->acpi, 0);
+ default:
+ ret = dev->pmu_conf[addr];
  break;
-
- case 0x48:
- dev->pmu_conf[addr] = 0x00;
+ case 0x10 ... 0x13:
+ if (dev->pmu_conf[0x5b] & 0x02)
+ ret = 0x00;
+ else
+ ret = dev->pmu_conf[addr];
  break;
- case 0x49:
- dev->pmu_conf[addr] &= 0x60;
+ case 0x14 ... 0x17:
+ if (dev->pmu_conf[0x5b] & 0x04)
+ ret = 0x00;
+ else
+ ret = dev->pmu_conf[addr];
  break;
- case 0x4a:
- dev->pmu_conf[addr] &= 0xc7;
+ case 0x42:
+ ret = (dev->pmu_conf[addr] & 0xf7) | (nvr_smi_status(dev->nvr) ? 0x08 : 0x00);
  break;
-
- case 0x4e:
- dev->pmu_conf[addr] &= 0xfa;
+ case 0x43:
+ ret = acpi_ali_soft_smi_status_read(dev->acpi) ? 0x10 : 0x00;
  break;
- case 0x4f:
- dev->pmu_conf[addr] &= 0xfe;
+ case 0x7f:
+ ret = 0x80;
  break;
-
- case 0x74:
- dev->pmu_conf[addr] &= 0xcc;
+ case 0xbc:
+ ret = inb(0x70);
  break;
+ }
 
- default:
- break;
+ if (dev->pmu_conf[0x77] & 0x10) {
+ switch (addr) {
+ case 0x42:
+ dev->pmu_conf[addr] &= 0xe0;
+ break;
+ case 0x43:
+ dev->pmu_conf[addr] &= 0xef;
+ acpi_ali_soft_smi_status_write(dev->acpi, 0);
+ break;
+
+ case 0x48:
+ dev->pmu_conf[addr] = 0x00;
+ break;
+ case 0x49:
+ dev->pmu_conf[addr] &= 0x60;
+ break;
+ case 0x4a:
+ dev->pmu_conf[addr] &= 0xc7;
+ break;
+
+ case 0x4e:
+ dev->pmu_conf[addr] &= 0xfa;
+ break;
+ case 0x4f:
+ dev->pmu_conf[addr] &= 0xfe;
+ break;
+
+ case 0x74:
+ dev->pmu_conf[addr] &= 0xcc;
+ break;
+
+ default:
+ break;
+ }
  }
  }
  }
 
+ ali1543_log("M7101: [R] dev->pmu_conf[%02x] = %02x\n", addr, ret);
+
  return ret;
 }
 

src/chipset/intel_piix.c

@@ -1006,11 +1006,11 @@ piix_write(int func, int addr, uint8_t val, void *priv)
  break;
  case 0xc0:
  if (dev->type <= 4)
- fregs[0xc0] = (fregs[0xc0] & ~(val & 0xbf)) | (val & 0x20);
+ fregs[0xc0] = (fregs[0xc0] & 0x40) | (val & 0xbf);
  break;
  case 0xc1:
  if (dev->type <= 4)
- fregs[0xc1] &= ~val;
+ fregs[0xc1] = (fregs[0xc0] & ~(val & 0x8f)) | (val & 0x20);
  break;
  case 0xff:
  if (dev->type == 4) {

src/codegen_new/codegen_backend_x86-64.c

@@ -73,7 +73,7 @@ static void
 build_load_routine(codeblock_t *block, int size, int is_float)
 {
  uint8_t *branch_offset;
- uint8_t *misaligned_offset;
+ uint8_t *misaligned_offset = NULL;
 
  /*In - ESI = address
  Out - ECX = data, ESI = abrt*/
@@ -161,7 +161,7 @@ static void
 build_store_routine(codeblock_t *block, int size, int is_float)
 {
  uint8_t *branch_offset;
- uint8_t *misaligned_offset;
+ uint8_t *misaligned_offset = NULL;
 
  /*In - ECX = data, ESI = address
  Out - ESI = abrt