valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

disable vcpi if no extended memory available (as no descriptor tables can be set up)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3432
This commit is contained in:
Sebastian Strohhäcker 2009-06-24 17:44:52 +00:00
parent 704221c89d
commit 31f6dccfa0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ints/ems.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: ems.cpp,v 1.63 2009-06-06 21:52:09 c2woody Exp $ */
/* $Id: ems.cpp,v 1.64 2009-06-24 17:44:52 c2woody Exp $ */
#include <string.h>
#include <stdlib.h>
@ -672,7 +672,7 @@ static Bitu INT67_Handler(void) {
reg_ah=EMM_NO_ERROR;
break;
case 0x42: /* Get number of pages */
reg_dx=MEM_TotalPages()/4; //Not entirely correct but okay
reg_dx=(Bit16u)(MEM_TotalPages()/4); //Not entirely correct but okay
reg_bx=EMM_GetFreePages();
reg_ah=EMM_NO_ERROR;
break;
@ -1175,13 +1175,16 @@ static Bitu V86_Monitor() {
}
static void SetupVCPI() {
vcpi.enabled=false;
/* Allocate one EMS-page for private VCPI-data in memory beyond 1MB */
if (EMM_AllocateMemory(1,vcpi.ems_handle,false) != EMM_NO_ERROR) return;
vcpi.enabled=true;
vcpi.pic1_remapping=0x08; // master PIC base
vcpi.pic2_remapping=0x70; // slave PIC base
/* Allocate one EMS-page for private VCPI-data in memory beyond 1MB */
EMM_AllocateMemory(1,vcpi.ems_handle,false);
vcpi.private_area=emm_handles[vcpi.ems_handle].mem<<12;
/* GDT */
@ -1324,6 +1327,8 @@ public:
/* Initialize private data area and set up descriptor tables */
SetupVCPI();
if (!vcpi.enabled) return;
/* Install v86-callback that handles interrupts occuring
in v86 mode, including protection fault exceptions */
call_v86mon.Install(&V86_Monitor,CB_IRET,"V86 Monitor");
@ -1381,7 +1386,7 @@ public:
/* Clear handle and page tables */
//TODO
if (!ENABLE_VCPI) return;
if ((!ENABLE_VCPI) || (!vcpi.enabled)) return;
/* Free private data area in expanded memory */
EMM_ReleaseMemory(vcpi.ems_handle);