silence some warnings, add most of sf patch #1185267 by Moe
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2883
This commit is contained in:
parent
8c6d24bb61
commit
0c24e87fdc
49 changed files with 265 additions and 255 deletions
|
@ -145,7 +145,7 @@ static Bit32u decode_fetchd(void) {
|
|||
|
||||
#define START_WMMEM 64
|
||||
|
||||
static void INLINE decode_increase_wmapmask(Bitu size) {
|
||||
static INLINE void decode_increase_wmapmask(Bitu size) {
|
||||
Bitu mapidx;
|
||||
CacheBlock* activecb=decode.active_block;
|
||||
if (GCC_UNLIKELY(!activecb->cache.wmapmask)) {
|
||||
|
@ -927,7 +927,7 @@ static void dyn_pop(DynReg * dynreg,bool checked=true) {
|
|||
}
|
||||
}
|
||||
|
||||
static void INLINE dyn_get_modrm(void) {
|
||||
static INLINE void dyn_get_modrm(void) {
|
||||
decode.modrm.val=decode_fetchb();
|
||||
decode.modrm.mod=(decode.modrm.val >> 6) & 3;
|
||||
decode.modrm.reg=(decode.modrm.val >> 3) & 7;
|
||||
|
@ -1187,7 +1187,7 @@ static void dyn_mov_ebgb(void) {
|
|||
DynReg * rm_reg=&DynRegs[decode.modrm.reg&3];Bitu rm_regi=decode.modrm.reg&4;
|
||||
if (decode.modrm.mod<3) {
|
||||
dyn_fill_ea();
|
||||
dyn_write_byte_release(DREG(EA),rm_reg,rm_regi);
|
||||
dyn_write_byte_release(DREG(EA),rm_reg,rm_regi==4);
|
||||
} else {
|
||||
gen_dop_byte(DOP_MOV,&DynRegs[decode.modrm.rm&3],decode.modrm.rm&4,rm_reg,rm_regi);
|
||||
}
|
||||
|
@ -2594,7 +2594,6 @@ illegalopcode:
|
|||
dyn_closeblock();
|
||||
goto finish_block;
|
||||
#if (C_DEBUG)
|
||||
illegalopcodefull:
|
||||
dyn_set_eip_last();
|
||||
dyn_reduce_cycles();
|
||||
dyn_save_critical_regs();
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: dyn_fpu_dh.h,v 1.2 2006-11-11 14:42:38 c2woody Exp $ */
|
||||
/* $Id: dyn_fpu_dh.h,v 1.3 2007-06-12 20:22:07 c2woody Exp $ */
|
||||
|
||||
#include "dosbox.h"
|
||||
#if C_FPU
|
||||
|
@ -65,7 +65,7 @@ static void FPU_FLDCW_DH(PhysPt addr){
|
|||
}
|
||||
|
||||
static void FPU_FNSTCW_DH(PhysPt addr){
|
||||
mem_writew(addr,dyn_dh_fpu.cw);
|
||||
mem_writew(addr,(Bit16u)(dyn_dh_fpu.cw&0xffff));
|
||||
}
|
||||
|
||||
static void FPU_FNINIT_DH(void){
|
||||
|
|
|
@ -163,7 +163,7 @@ static GenReg * FindDynReg(DynReg * dynreg,bool stale=false) {
|
|||
genreg->Load(dynreg,stale);
|
||||
return genreg;
|
||||
}
|
||||
if (genreg->last_used<first_used) {
|
||||
if (genreg->last_used<(Bitu)first_used) {
|
||||
first_used=genreg->last_used;
|
||||
first_index=i;
|
||||
}
|
||||
|
@ -176,7 +176,7 @@ static GenReg * FindDynReg(DynReg * dynreg,bool stale=false) {
|
|||
genreg->Load(dynreg,stale);
|
||||
return genreg;
|
||||
}
|
||||
if (genreg->last_used<first_used) {
|
||||
if (genreg->last_used<(Bitu)first_used) {
|
||||
first_used=genreg->last_used;
|
||||
first_index=i;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: cpu.cpp,v 1.101 2007-06-02 11:47:05 c2woody Exp $ */
|
||||
/* $Id: cpu.cpp,v 1.102 2007-06-12 20:22:07 c2woody Exp $ */
|
||||
|
||||
#include <assert.h>
|
||||
#include <sstream>
|
||||
|
@ -94,7 +94,7 @@ void CPU_Core_Dynrec_Cache_Close(void);
|
|||
|
||||
#if defined(CPU_CHECK_IGNORE)
|
||||
#define CPU_CHECK_COND(cond,msg,exc,sel) { \
|
||||
cond; \
|
||||
if (cond) do {} while (0); \
|
||||
}
|
||||
#elif defined(CPU_CHECK_EXCEPT)
|
||||
#define CPU_CHECK_COND(cond,msg,exc,sel) { \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue