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

Fix some gcc 3.4 issues.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1800
This commit is contained in:
Sjoerd van der Berg 2004-05-15 07:57:04 +00:00
parent 5e9dd89b56
commit 239e9b3b5a
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/dos_inc.h
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos_inc.h,v 1.43 2004-05-05 21:56:04 harekiet Exp $ */
/* $Id: dos_inc.h,v 1.44 2004-05-15 07:57:02 harekiet Exp $ */
#ifndef DOS_H_
#define DOS_H_
@ -214,22 +214,22 @@ INLINE Bit16u DOS_PackDate(Bit16u year,Bit16u mon,Bit16u day) {
class MemStruct {
public:
INLINE Bit8u GetIt(Bit8u&,PhysPt addr) {
INLINE Bit8u GetIt(Bit8u,PhysPt addr) {
return mem_readb(pt+addr);
}
INLINE Bit16u GetIt(Bit16u&,PhysPt addr) {
INLINE Bit16u GetIt(Bit16u,PhysPt addr) {
return mem_readw(pt+addr);
}
INLINE Bit32u GetIt(Bit32u&,PhysPt addr) {
INLINE Bit32u GetIt(Bit32u,PhysPt addr) {
return mem_readd(pt+addr);
}
INLINE void SaveIt(Bit8u&,PhysPt addr,Bit8u val) {
INLINE void SaveIt(Bit8u,PhysPt addr,Bit8u val) {
mem_writeb(pt+addr,val);
}
INLINE void SaveIt(Bit16u&,PhysPt addr,Bit16u val) {
INLINE void SaveIt(Bit16u,PhysPt addr,Bit16u val) {
mem_writew(pt+addr,val);
}
INLINE void SaveIt(Bit32u&,PhysPt addr,Bit32u val) {
INLINE void SaveIt(Bit32u,PhysPt addr,Bit32u val) {
mem_writed(pt+addr,val);
}
INLINE void SetPt(Bit16u seg) { pt=PhysMake(seg,0);}

2
src/cpu/core_dyn_x86/risc_x86.h
View file

@ -124,7 +124,7 @@ return_address:
"popl %%ebp \n"
:"=a" (retval), "=c" (tempflags)
:"r" (tempflags),"r" (code)
:"%edx","%ebx","%edi","%esi","%ebp","cc","memory"
:"%edx","%ebx","%edi","%esi","cc","memory"
);
reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST);
#endif

6
src/dos/dos_classes.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos_classes.cpp,v 1.37 2004-05-04 18:34:08 qbix79 Exp $ */
/* $Id: dos_classes.cpp,v 1.38 2004-05-15 07:57:04 harekiet Exp $ */
#include <string.h>
#include <stdlib.h>
@ -146,7 +146,7 @@ void DOS_PSP::MakeNew(Bit16u mem_size)
/* FCBs are filled with 0 */
// ....
/* Init file pointer and max_files */
sSave(sPSP,file_table,RealMake(seg,offsetof(sPSP,files[0])));
sSave(sPSP,file_table,RealMake(seg,offsetof(sPSP,files)));
sSave(sPSP,max_files,20);
for (i=0;i<20;i++) SetFileHandle(i,0xff);
@ -243,7 +243,7 @@ void DOS_PSP::SetCommandTail(RealPt src)
MEM_BlockCopy(pt+offsetof(sPSP,cmdtail),Real2Phys(src),128);
} else { // empty
sSave(sPSP,cmdtail.count,0x00);
mem_writeb(pt+offsetof(sPSP,cmdtail.buffer[0]),0x0d);
mem_writeb(pt+offsetof(sPSP,cmdtail.buffer),0x0d);
};
};