OSDN > Trouver un logiciel > homemicro > SCM > hg > homemicro > Commit

homemicro
Fork

homemicro: Commit

added convenience functions to simplify writing tests

diff -r ddc25bcb44b3 -r 2848176de5b1 emulator/hm1000.c

--- a/emulator/hm1000.c Wed Jan 01 00:23:52 2020 +0000

+++ b/emulator/hm1000.c Tue Apr 07 08:20:23 2020 +0100

		@@ -329,6 +329,26 @@
329	329	s->ticks = 0;
330	330	}
331	331
	332	+static void init_hm1000_cartridge(
	333	+ hm1k_state s, uint8_t ram,
	334	+ uint8_t rom, uint8_t cartridge, size_t cartridge_size) {
	335	+ init_6502(s, ram);
	336	+ s->rom = rom;
	337	+ s->io_read[SERIR - IO_BASE] = read_serir;
	338	+ s->io_write[SERCR - IO_BASE] = write_sercr;
	339	+ s->kbdrow = 0;
	340	+ memset(s->keyboard, 0xff, sizeof(s->keyboard));
	341	+ s->io_read[KBDCOL - IO_BASE] = read_kbdcol;
	342	+ s->io_write[KBDROW - IO_BASE] = write_kbdrow;
	343	+ s->cartridge = cartridge;
	344	+ s->cartridge_size = cartridge_size;
	345	+}
	346	+
	347	+static void init_hm1000(
	348	+ hm1k_state s, uint8_t ram, uint8_t *rom) {
	349	+ init_hm1000_cartridge(s, ram, rom, NULL, 0);
	350	+}
	351	+
332	352	static void reset(hm1k_state *s) {
333	353	add_ticks(s, 7);
334	354	sync_time(s);

		@@ -342,6 +362,27 @@
342	362	s->pc = load_u16(s, 0xfffc);
343	363	}
344	364
	365	+static void randomize_reset_hm1000(
	366	+ hm1k_state s, uint8_t ram, size_t ramsize,
	367	+ uint8_t *rom, size_t romsize, uint16_t reset_addr)
	368	+{
	369	+ randomize(ram, ramsize);
	370	+ randomize(rom, romsize);
	371	+ init_hm1000(s, ram, rom);
	372	+ rom[0x1ffc] = reset_addr & 0xff;
	373	+ rom[0x1ffd] = (reset_addr >> 8) & 0xff;
	374	+ reset(s);
	375	+}
	376	+
	377	+static void push(hm1k_state *s, uint8_t val) {
	378	+ store_u8(s, 0x100 + s->s--, val);
	379	+}
	380	+
	381	+static void push_u16(hm1k_state *s, uint16_t val) {
	382	+ push(s, (val >> 8) & 0xff);
	383	+ push(s, val & 0xff);
	384	+}
	385	+
345	386	static uint8_t set_nz(hm1k_state *s, uint8_t val) {
346	387	s->p &= 0x7d;
347	388	s->p \|= (val & 0x80) \| ((val == 0) ? FLAG_Z : 0);

		@@ -657,11 +696,11 @@
657	696	OP(ora) { s->a = set_nz(s, s->a \| load_u8(s, modes_a[op & 0x1f](s))); }
658	697
659	698	OP(pha) {
660		- store_u8(s, 0x100 + s->s--, s->a);
	699	+ push(s, s->a);
661	700	}
662	701
663	702	OP(php) {
664		- store_u8(s, 0x100 + s->s--, s->p);
	703	+ push(s, s->p);
665	704	}
666	705
667	706	OP(pla) {

diff -r ddc25bcb44b3 -r 2848176de5b1 emulator/test_ret1.c

--- a/emulator/test_ret1.c Wed Jan 01 00:23:52 2020 +0000

+++ b/emulator/test_ret1.c Tue Apr 07 08:20:23 2020 +0100

		@@ -2,15 +2,8 @@
2	2
3	3	#include "hm1000.c"
4	4
5		-static void push(hm1k_state *s, uint8_t value) {
6		- s->ram[0x100 + s->s] = value;
7		- --s->s;
8		-}
9		-
10	5	static void push_return_address(hm1k_state *s, uint16_t addr) {
11		- --addr;
12		- push(s, addr >> 8);
13		- push(s, addr & 0xff);
	6	+ push_u16(s, addr - 1);
14	7	}
15	8
16	9	int main(int argc, char *argv[]) {

		@@ -18,20 +11,9 @@
18	11	uint8_t ram[RAM_SIZE];
19	12	uint8_t rom[ROM_SIZE];
20	13
21		- randomize(ram, sizeof(ram));
22		- randomize(rom, sizeof(rom));
23		- rom[0x1ffc] = 0;
24		- rom[0x1ffd] = 0x04;
25		- init_6502(&state, ram);
26		- state.rom = rom;
27		- state.io_read[SERIR - IO_BASE] = read_serir;
28		- state.io_write[SERCR - IO_BASE] = write_sercr;
29		- state.kbdrow = 0;
30		- memset(state.keyboard, 0xff, sizeof(state.keyboard));
31		- state.io_read[KBDCOL - IO_BASE] = read_kbdcol;
32		- state.io_write[KBDROW - IO_BASE] = write_kbdrow;
33		- reset(&state);
34		-
	14	+ randomize_reset_hm1000(
	15	+ &state, ram, sizeof(ram),
	16	+ rom, sizeof(rom), 0x400);
35	17	state.a = 0x00;
36	18	state.s = 0xff;
37	19	push_return_address(&state, 0xfffc);