From f8020a2c4c4826acf5ad773ae0329b2b47d62e54 Mon Sep 17 00:00:00 2001 From: Peter Schorn Date: Thu, 29 May 2014 18:12:18 +0200 Subject: [PATCH] AltairZ80: Addressed Microsoft compiler generated warnings --- AltairZ80/altairz80_hdsk.c | 10 +-- AltairZ80/m68kopac.c | 20 +++--- AltairZ80/m68kopdm.c | 132 ++++++++++++++++++------------------- AltairZ80/m68kopnz.c | 48 +++++++------- AltairZ80/m68ksim.c | 4 +- AltairZ80/m68ksim.h | 2 +- makefile | 6 +- 7 files changed, 112 insertions(+), 110 deletions(-) diff --git a/AltairZ80/altairz80_hdsk.c b/AltairZ80/altairz80_hdsk.c index cfbaea66..8f697285 100644 --- a/AltairZ80/altairz80_hdsk.c +++ b/AltairZ80/altairz80_hdsk.c @@ -776,12 +776,14 @@ t_bool hdsk_checkParameters(void) { /* pre-condition: hdsk_checkParameters has been executed to repair any faulty parameters */ static int32 doSeek(void) { + int32 hostSector; + int32 sectorSize; UNIT *uptr = &hdsk_dev.units[selectedDisk]; assert(uptr != NULL); - int32 hostSector = (dpb[uptr -> HDSK_FORMAT_TYPE].skew == NULL) ? - selectedSector : dpb[uptr -> HDSK_FORMAT_TYPE].skew[selectedSector]; - int32 sectorSize = (dpb[uptr -> HDSK_FORMAT_TYPE].physicalSectorSize == 0) ? - uptr -> HDSK_SECTOR_SIZE : dpb[uptr -> HDSK_FORMAT_TYPE].physicalSectorSize; + hostSector = ((dpb[uptr -> HDSK_FORMAT_TYPE].skew == NULL) ? + selectedSector : dpb[uptr -> HDSK_FORMAT_TYPE].skew[selectedSector]); + sectorSize = ((dpb[uptr -> HDSK_FORMAT_TYPE].physicalSectorSize == 0) ? + uptr -> HDSK_SECTOR_SIZE : dpb[uptr -> HDSK_FORMAT_TYPE].physicalSectorSize); if (sim_fseek(uptr -> fileref, sectorSize * (uptr -> HDSK_SECTORS_PER_TRACK * selectedTrack + hostSector) + dpb[uptr -> HDSK_FORMAT_TYPE].offset, SEEK_SET)) { diff --git a/AltairZ80/m68kopac.c b/AltairZ80/m68kopac.c index a44f9418..62f787eb 100644 --- a/AltairZ80/m68kopac.c +++ b/AltairZ80/m68kopac.c @@ -5691,14 +5691,14 @@ void m68k_op_bfexts_32_d(void) width = ((width-1) & 31) + 1; data = ROL_32(data, offset); - FLAG_N = NFLAG_32(data); + FLAG_N = (uint)(NFLAG_32(data)); data = MAKE_INT_32(data) >> (32 - width); - FLAG_Z = data; + FLAG_Z = (uint)data; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; - REG_D[(word2>>12)&7] = data; + REG_D[(word2>>12)&7] = (uint)data; return; } @@ -6061,14 +6061,14 @@ void m68k_op_bfextu_32_d(void) width = ((width-1) & 31) + 1; data = ROL_32(data, offset); - FLAG_N = NFLAG_32(data); + FLAG_N = (uint)(NFLAG_32(data)); data >>= 32 - width; - FLAG_Z = data; + FLAG_Z = (uint)data; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; - REG_D[(word2>>12)&7] = data; + REG_D[(word2>>12)&7] = (uint)data; return; } @@ -6425,10 +6425,10 @@ void m68k_op_bfffo_32_d(void) width = ((width-1) & 31) + 1; data = ROL_32(data, offset); - FLAG_N = NFLAG_32(data); + FLAG_N = (uint)(NFLAG_32(data)); data >>= 32 - width; - FLAG_Z = data; + FLAG_Z = (uint)data; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; @@ -6833,8 +6833,8 @@ void m68k_op_bfins_32_d(void) mask = ROR_32(mask, offset); insert = MASK_OUT_ABOVE_32(insert << (32 - width)); - FLAG_N = NFLAG_32(insert); - FLAG_Z = insert; + FLAG_N = (uint)(NFLAG_32(insert)); + FLAG_Z = (uint)insert; insert = ROR_32(insert, offset); FLAG_V = VFLAG_CLEAR; diff --git a/AltairZ80/m68kopdm.c b/AltairZ80/m68kopdm.c index 66a4d1d0..53bafc08 100644 --- a/AltairZ80/m68kopdm.c +++ b/AltairZ80/m68kopdm.c @@ -1139,11 +1139,11 @@ void m68k_op_divl_32_d(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -1350,11 +1350,11 @@ void m68k_op_divl_32_ai(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)NFLAG_32(quotient); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -1561,11 +1561,11 @@ void m68k_op_divl_32_pi(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)NFLAG_32(quotient); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -1772,11 +1772,11 @@ void m68k_op_divl_32_pd(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)NFLAG_32(quotient); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -1983,11 +1983,11 @@ void m68k_op_divl_32_di(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)NFLAG_32(quotient); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -2194,11 +2194,11 @@ void m68k_op_divl_32_ix(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)NFLAG_32(quotient); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -2405,11 +2405,11 @@ void m68k_op_divl_32_aw(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -2616,11 +2616,11 @@ void m68k_op_divl_32_al(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -2827,11 +2827,11 @@ void m68k_op_divl_32_pcdi(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -3038,11 +3038,11 @@ void m68k_op_divl_32_pcix(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -3249,11 +3249,11 @@ void m68k_op_divl_32_i(void) } } - REG_D[word2 & 7] = remainder; - REG_D[(word2 >> 12) & 7] = quotient; + REG_D[word2 & 7] = (uint)remainder; + REG_D[(word2 >> 12) & 7] = (uint)quotient; - FLAG_N = NFLAG_32(quotient); - FLAG_Z = quotient; + FLAG_N = (uint)(NFLAG_32(quotient)); + FLAG_Z = (uint)quotient; FLAG_V = VFLAG_CLEAR; FLAG_C = CFLAG_CLEAR; return; @@ -11869,7 +11869,7 @@ void m68k_op_mull_32_d(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -11886,7 +11886,7 @@ void m68k_op_mull_32_d(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -11993,7 +11993,7 @@ void m68k_op_mull_32_ai(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12010,7 +12010,7 @@ void m68k_op_mull_32_ai(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12117,7 +12117,7 @@ void m68k_op_mull_32_pi(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12134,7 +12134,7 @@ void m68k_op_mull_32_pi(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12241,7 +12241,7 @@ void m68k_op_mull_32_pd(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12258,7 +12258,7 @@ void m68k_op_mull_32_pd(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12365,7 +12365,7 @@ void m68k_op_mull_32_di(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12382,7 +12382,7 @@ void m68k_op_mull_32_di(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12489,7 +12489,7 @@ void m68k_op_mull_32_ix(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12506,7 +12506,7 @@ void m68k_op_mull_32_ix(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12613,7 +12613,7 @@ void m68k_op_mull_32_aw(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12630,7 +12630,7 @@ void m68k_op_mull_32_aw(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12737,7 +12737,7 @@ void m68k_op_mull_32_al(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12754,7 +12754,7 @@ void m68k_op_mull_32_al(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12861,7 +12861,7 @@ void m68k_op_mull_32_pcdi(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12878,7 +12878,7 @@ void m68k_op_mull_32_pcdi(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -12985,7 +12985,7 @@ void m68k_op_mull_32_pcix(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -13002,7 +13002,7 @@ void m68k_op_mull_32_pcix(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -13109,7 +13109,7 @@ void m68k_op_mull_32_i(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = ((sint64)res != (sint32)res)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; @@ -13126,7 +13126,7 @@ void m68k_op_mull_32_i(void) if(!BIT_A(word2)) { FLAG_Z = MASK_OUT_ABOVE_32(res); - FLAG_N = NFLAG_32(res); + FLAG_N = (uint)(NFLAG_32(res)); FLAG_V = (res > 0xffffffff)<<7; REG_D[(word2 >> 12) & 7] = FLAG_Z; return; diff --git a/AltairZ80/m68kopnz.c b/AltairZ80/m68kopnz.c index 11ba57a1..1624299e 100644 --- a/AltairZ80/m68kopnz.c +++ b/AltairZ80/m68kopnz.c @@ -2777,7 +2777,7 @@ void m68k_op_ror_32_s(void) FLAG_N = NFLAG_32(res); FLAG_Z = res; - FLAG_C = src << (9-shift); + FLAG_C = (uint)(src << (9 - shift)); FLAG_V = VFLAG_CLEAR; } @@ -2849,7 +2849,7 @@ void m68k_op_ror_32_r(void) USE_CYCLES(orig_shift<> ((shift - 1) & 31)) << 8; + FLAG_C = (uint)((src >> ((shift - 1) & 31)) << 8); FLAG_N = NFLAG_32(res); FLAG_Z = res; FLAG_V = VFLAG_CLEAR; @@ -2857,8 +2857,8 @@ void m68k_op_ror_32_r(void) } FLAG_C = CFLAG_CLEAR; - FLAG_N = NFLAG_32(src); - FLAG_Z = src; + FLAG_N = (uint)(NFLAG_32(src)); + FLAG_Z = (uint)src; FLAG_V = VFLAG_CLEAR; } @@ -3012,7 +3012,7 @@ void m68k_op_rol_32_s(void) FLAG_N = NFLAG_32(res); FLAG_Z = res; - FLAG_C = src >> (24-shift); + FLAG_C = (uint)(src >> (24 - shift)); FLAG_V = VFLAG_CLEAR; } @@ -3101,7 +3101,7 @@ void m68k_op_rol_32_r(void) *r_dst = res; - FLAG_C = (src >> (32 - shift)) << 8; + FLAG_C = (uint)((src >> (32 - shift)) << 8); FLAG_N = NFLAG_32(res); FLAG_Z = res; FLAG_V = VFLAG_CLEAR; @@ -3109,8 +3109,8 @@ void m68k_op_rol_32_r(void) } FLAG_C = CFLAG_CLEAR; - FLAG_N = NFLAG_32(src); - FLAG_Z = src; + FLAG_N = (uint)(NFLAG_32(src)); + FLAG_Z = (uint)src; FLAG_V = VFLAG_CLEAR; } @@ -3267,13 +3267,13 @@ void m68k_op_roxr_32_s(void) res = ROR_33_64(res, shift); - FLAG_C = FLAG_X = res >> 24; + FLAG_C = FLAG_X = (uint)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; + *r_dst = (uint)res; - FLAG_N = NFLAG_32(res); - FLAG_Z = res; + FLAG_N = (uint)(NFLAG_32(res)); + FLAG_Z = (uint)res; FLAG_V = VFLAG_CLEAR; #else @@ -3372,12 +3372,12 @@ void m68k_op_roxr_32_r(void) USE_CYCLES(orig_shift<> 24; + FLAG_C = FLAG_X = (uint)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; - FLAG_N = NFLAG_32(res); - FLAG_Z = res; + *r_dst = (uint)res; + FLAG_N = (uint)(NFLAG_32(res)); + FLAG_Z = (uint)res; FLAG_V = VFLAG_CLEAR; return; } @@ -3581,13 +3581,13 @@ void m68k_op_roxl_32_s(void) res = ROL_33_64(res, shift); - FLAG_C = FLAG_X = res >> 24; + FLAG_C = FLAG_X = (uint)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; + *r_dst = (uint)res; - FLAG_N = NFLAG_32(res); - FLAG_Z = res; + FLAG_N = (uint)(NFLAG_32(res)); + FLAG_Z = (uint)res; FLAG_V = VFLAG_CLEAR; #else @@ -3687,12 +3687,12 @@ void m68k_op_roxl_32_r(void) USE_CYCLES(orig_shift<> 24; + FLAG_C = FLAG_X = (uint)(res >> 24); res = MASK_OUT_ABOVE_32(res); - *r_dst = res; - FLAG_N = NFLAG_32(res); - FLAG_Z = res; + *r_dst = (uint)res; + FLAG_N = (uint)(NFLAG_32(res)); + FLAG_Z = (uint)res; FLAG_V = VFLAG_CLEAR; return; } diff --git a/AltairZ80/m68ksim.c b/AltairZ80/m68ksim.c index f0686233..a09ea3a8 100644 --- a/AltairZ80/m68ksim.c +++ b/AltairZ80/m68ksim.c @@ -163,7 +163,7 @@ extern UNIT cpu_unit; #define M68K_BOOT_SP 0xfe0000 /* initial SP for boot */ t_stat m68k_hdsk_boot(const int32 unitno, DEVICE *dptr, - const uint32 verboseMessage, const uint32 hdskNumber) { + const uint32 verboseMessage, const int32 hdskNumber) { UNIT *uptr; size_t i; @@ -384,7 +384,7 @@ unsigned int m68k_cpu_read_long(unsigned int address) { case DISK_STATUS: return hdsk_getStatus(); case M68K_GET_TIME: - return time(NULL); + return (unsigned int)(time(NULL)); default: break; } diff --git a/AltairZ80/m68ksim.h b/AltairZ80/m68ksim.h index f5f12a32..63d2dc0a 100644 --- a/AltairZ80/m68ksim.h +++ b/AltairZ80/m68ksim.h @@ -49,7 +49,7 @@ void m68k_clear_memory(void); void m68k_CPUToView(void); void m68k_viewToCPU(void); t_stat m68k_hdsk_boot(const int32 unitno, DEVICE *dptr, - const uint32 verboseMessage, const uint32 hdskNumber); + const uint32 verboseMessage, const int32 hdskNumber); #define M68K_MAX_RAM 0xffffff // highest address of 16MB of RAM #define M68K_MAX_RAM_LOG2 24 // 24 bit addresses diff --git a/makefile b/makefile index db28ea01..e7c81173 100644 --- a/makefile +++ b/makefile @@ -1022,9 +1022,9 @@ ALTAIRZ80 = ${ALTAIRZ80D}/altairz80_cpu.c ${ALTAIRZ80D}/altairz80_cpu_nommu.c \ ${ALTAIRZ80D}/s100_scp300f.c ${ALTAIRZ80D}/sim_imd.c \ ${ALTAIRZ80D}/wd179x.c ${ALTAIRZ80D}/s100_hdc1001.c \ ${ALTAIRZ80D}/s100_if3.c ${ALTAIRZ80D}/s100_adcs6.c \ - ${ALTAIRZ80D}/m68kcpu.c ${ALTAIRZ80D}/m68kdasm.c \ - ${ALTAIRZ80D}/m68kopac.c ${ALTAIRZ80D}/m68kopdm.c \ - ${ALTAIRZ80D}/m68kopnz.c ${ALTAIRZ80D}/m68kops.c ${ALTAIRZ80D}/m68ksim.c + ${ALTAIRZ80D}/m68kcpu.c ${ALTAIRZ80D}/m68kdasm.c \ + ${ALTAIRZ80D}/m68kopac.c ${ALTAIRZ80D}/m68kopdm.c \ + ${ALTAIRZ80D}/m68kopnz.c ${ALTAIRZ80D}/m68kops.c ${ALTAIRZ80D}/m68ksim.c ALTAIRZ80_OPT = -I ${ALTAIRZ80D}