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

correct all unintentional changes

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1314
This commit is contained in:
Peter Veenstra 2003-10-14 08:38:36 +00:00
parent 5e13e5c0e4
commit c36318f721
11 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/callback.h
View file

@ -24,7 +24,7 @@
typedef Bitu (*CallBack_Handler)(void);
extern CallBack_Handler CallBack_Handlers[];
enum { CB_RETF,CB_IRET,CB_IRET_STI,CB_IRET_ONLY };
enum { CB_RETF,CB_IRET,CB_IRET_STI };
#define CB_MAX 1024
#define CB_SEG 0xC800

8
src/cpu/core_16/main.h
View file

@ -1091,14 +1091,10 @@ restart:
flags.type=t_CF;
break;
case 0xfa: /* CLI */
// if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(false);
// else
SETFLAGBIT(IF,false);
SETFLAGBIT(IF,false);
break;
case 0xfb: /* STI */
// if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(true);
// else
SETFLAGBIT(IF,true);
SETFLAGBIT(IF,true);
#ifdef CPU_PIC_CHECK
if (GETFLAG(IF) && PIC_IRQCheck) goto decode_end;
#endif

8
src/cpu/core_full/load.h
View file

@ -368,14 +368,10 @@ l_M_Ed:
else reg_edx=0;
goto nextopcode;
case D_CLI:
// if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(false);
// else
SETFLAGBIT(IF,false);
SETFLAGBIT(IF,false);
goto nextopcode;
case D_STI:
// if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(true);
// else
SETFLAGBIT(IF,true);
SETFLAGBIT(IF,true);
if (GETFLAG(IF) && PIC_IRQCheck) {
LEAVECORE;
return CBRET_NONE;

2
src/dos/dos.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos.cpp,v 1.55 2003-10-13 21:56:25 finsterr Exp $ */
/* $Id: dos.cpp,v 1.56 2003-10-14 08:38:35 qbix79 Exp $ */
#include <stdio.h>
#include <stdlib.h>

2
src/dos/dos_ioctl.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos_ioctl.cpp,v 1.15 2003-10-13 21:56:25 finsterr Exp $ */
/* $Id: dos_ioctl.cpp,v 1.16 2003-10-14 08:38:35 qbix79 Exp $ */
#include <string.h>
#include "dosbox.h"

2
src/gui/sdlmain.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdlmain.cpp,v 1.47 2003-10-13 21:56:53 finsterr Exp $ */
/* $Id: sdlmain.cpp,v 1.48 2003-10-14 08:38:36 qbix79 Exp $ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE

2
src/hardware/dma.cpp
View file

@ -212,7 +212,7 @@ INLINE void ResetDMA8(DMA_CHANNEL * chan) {
chan->address=(chan->page << 16)+chan->base_address;
chan->current_count=chan->base_count+1;
chan->current_address=chan->base_address;
// LOG(LOG_DMA,LOG_NORMAL)("Setup at address %X:%X count %X",chan->page<<12,chan->base_address,chan->current_count);
LOG(LOG_DMA,LOG_NORMAL)("Setup at address %X:%X count %X",chan->page<<12,chan->base_address,chan->current_count);
}
Bitu DMA_8_Read(Bitu dmachan,Bit8u * buffer,Bitu count) {

4
src/hardware/iohandler.cpp
View file

@ -24,9 +24,7 @@ IO_WriteBlock IO_WriteTable[IO_MAX];
void IO_Write(Bitu num,Bit8u val) {
if (num<IO_MAX) IO_WriteTable[num].handler(num,val);
else {
LOG(LOG_IO,LOG_WARN)("IO:Out or range write %X2 to port %4X",val,num);
}
else LOG(LOG_IO,LOG_WARN)("IO:Out or range write %X2 to port %4X",val,num);
}
Bit8u IO_Read(Bitu num) {

2
src/hardware/timer.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: timer.cpp,v 1.18 2003-10-13 21:57:35 finsterr Exp $ */
/* $Id: timer.cpp,v 1.19 2003-10-14 08:38:36 qbix79 Exp $ */
#include "dosbox.h"
#include "inout.h"

4
src/ints/dpmi.cpp
View file

@ -839,7 +839,7 @@ Bitu DPMI::RealModeCallback(void)
reg_eip = RealOff(CALLBACK_RealPointer(callback.rmCallbackReturn));
// call protected mode func
SetVirtualIntFlag(false);
// SETFLAGBIT(IF,false);
SETFLAGBIT(IF,false);
SETFLAGBIT(TF,false);
CPU_Push32(flags.word);
CPU_CALL(dpmi.client.bit32,dpmi.rmCallback[num].codeSelector,dpmi.rmCallback[num].codeOffset);
@ -900,7 +900,7 @@ Bitu DPMI::CallRealIRETFrame(void)
SegSet16(cs,RealSeg(CALLBACK_RealPointer(callback.rmIntFrameReturn)));
reg_ip = RealOff(CALLBACK_RealPointer(callback.rmIntFrameReturn));
SetVirtualIntFlag(false);
// SETFLAGBIT(IF,false);
SETFLAGBIT(IF,false);
SETFLAGBIT(TF,false);
CPU_CALL(false,newCS,newIP);
return 0;

2
src/shell/shell_cmds.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: shell_cmds.cpp,v 1.31 2003-10-13 22:01:07 finsterr Exp $ */
/* $Id: shell_cmds.cpp,v 1.32 2003-10-14 08:38:36 qbix79 Exp $ */
#include <string.h>