ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/uae_cpu/newcpu.cpp

Comparing BasiliskII/src/uae_cpu/newcpu.cpp (file contents):
Revision 1.4 by cebix, 1999-10-31T23:18:42Z vs.
Revision 1.5 by cebix, 1999-11-03T10:56:43Z

#	Line 183 | Line 183 | void init_m68k (void)
183		for (j = 7 ; j >= 0 ; j--) {
184		if (i & (1 << j)) break;
185		}
186	<	fpp_movem_index1[i] = j;
187	<	fpp_movem_index2[i] = 7-j;
186	>	fpp_movem_index1[i] = 7-j;
187	>	fpp_movem_index2[i] = j;
188		fpp_movem_next[i] = i & (~(1 << j));
189		}
190		#if COUNT_INSTRS
#	Line 250 | Line 250 | uae_s32 ShowEA (int reg, amodes mode, wo
250		disp16 = get_iword_1 (m68kpc_offset); m68kpc_offset += 2;
251		addr = m68k_areg(regs,reg) + (uae_s16)disp16;
252		sprintf (buffer,"(A%d,$%04x) == $%08lx", reg, disp16 & 0xffff,
253	<	(long unsigned int)addr);
253	>	(unsigned long)addr);
254		break;
255		case Ad8r:
256		dp = get_iword_1 (m68kpc_offset); m68kpc_offset += 2;
#	Line 283 | Line 283 | uae_s32 ShowEA (int reg, amodes mode, wo
283		dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W',
284		1 << ((dp >> 9) & 3),
285		disp,outer,
286	<	(long unsigned int)addr);
286	>	(unsigned long)addr);
287		} else {
288		addr = m68k_areg(regs,reg) + (uae_s32)((uae_s8)disp8) + dispreg;
289		sprintf (buffer,"(A%d, %c%d.%c*%d, $%02x) == $%08lx", reg,
290		dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W',
291		1 << ((dp >> 9) & 3), disp8,
292	<	(long unsigned int)addr);
292	>	(unsigned long)addr);
293		}
294		break;
295		case PC16:
296		addr = m68k_getpc () + m68kpc_offset;
297		disp16 = get_iword_1 (m68kpc_offset); m68kpc_offset += 2;
298		addr += (uae_s16)disp16;
299	<	sprintf (buffer,"(PC,$%04x) == $%08lx", disp16 & 0xffff,(long unsigned int)addr);
299	>	sprintf (buffer,"(PC,$%04x) == $%08lx", disp16 & 0xffff,(unsigned long)addr);
300		break;
301		case PC8r:
302		addr = m68k_getpc () + m68kpc_offset;
#	Line 330 | Line 330 | uae_s32 ShowEA (int reg, amodes mode, wo
330		dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W',
331		1 << ((dp >> 9) & 3),
332		disp,outer,
333	<	(long unsigned int)addr);
333	>	(unsigned long)addr);
334		} else {
335		addr += (uae_s32)((uae_s8)disp8) + dispreg;
336		sprintf (buffer,"(PC, %c%d.%c*%d, $%02x) == $%08lx", dp & 0x8000 ? 'A' : 'D',
337		(int)r, dp & 0x800 ? 'L' : 'W',  1 << ((dp >> 9) & 3),
338	<	disp8, (long unsigned int)addr);
338	>	disp8, (unsigned long)addr);
339		}
340		break;
341		case absw:
342	<	sprintf (buffer,"$%08lx", (long unsigned int)(uae_s32)(uae_s16)get_iword_1 (m68kpc_offset));
342	>	sprintf (buffer,"$%08lx", (unsigned long)(uae_s32)(uae_s16)get_iword_1 (m68kpc_offset));
343		m68kpc_offset += 2;
344		break;
345		case absl:
346	<	sprintf (buffer,"$%08lx", (long unsigned int)get_ilong_1 (m68kpc_offset));
346	>	sprintf (buffer,"$%08lx", (unsigned long)get_ilong_1 (m68kpc_offset));
347		m68kpc_offset += 4;
348		break;
349		case imm:
#	Line 357 | Line 357 | uae_s32 ShowEA (int reg, amodes mode, wo
357		m68kpc_offset += 2;
358		break;
359		case sz_long:
360	<	sprintf (buffer,"#$%08lx", (long unsigned int)(get_ilong_1 (m68kpc_offset)));
360	>	sprintf (buffer,"#$%08lx", (unsigned long)(get_ilong_1 (m68kpc_offset)));
361		m68kpc_offset += 4;
362		break;
363		default:
#	Line 377 | Line 377 | uae_s32 ShowEA (int reg, amodes mode, wo
377		case imm2:
378		offset = (uae_s32)get_ilong_1 (m68kpc_offset);
379		m68kpc_offset += 4;
380	<	sprintf (buffer,"#$%08lx", (long unsigned int)offset);
380	>	sprintf (buffer,"#$%08lx", (unsigned long)offset);
381		break;
382		case immi:
383		offset = (uae_s32)(uae_s8)(reg & 0xff);
384	<	sprintf (buffer,"#$%08lx", (long unsigned int)offset);
384	>	sprintf (buffer,"#$%08lx", (unsigned long)offset);
385		break;
386		default:
387		break;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines