Search
lxdream.org :: lxdream/src/test/testsh4x86.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/test/testsh4x86.c
changeset 945:787729653236
prev939:6f2302afeb89
next948:545c85cc56f1
author nkeynes
date Mon Jan 05 04:19:46 2009 +0000 (13 years ago)
branchlxdream-mem
permissions -rw-r--r--
last change Move address space decls to mmu.h
Finally remove sh4_read_long and friends
file annotate diff log raw
1.1 --- a/src/test/testsh4x86.c Sat Jan 03 03:30:26 2009 +0000
1.2 +++ b/src/test/testsh4x86.c Mon Jan 05 04:19:46 2009 +0000
1.3 @@ -37,6 +37,7 @@
1.4
1.5
1.6 struct mem_region_fn **sh4_address_space = (void *)0x12345432;
1.7 +struct mem_region_fn **sh4_user_address_space = (void *)0x12345678;
1.8 char *option_list = "s:o:d:h";
1.9 struct option longopts[1] = { { NULL, 0, 0, 0 } };
1.10
1.11 @@ -55,7 +56,8 @@
1.12 struct x86_symbol local_symbols[] = {
1.13 { "sh4r+128", ((char *)&sh4r)+128 },
1.14 { "sh4_cpu_period", &sh4_cpu_period },
1.15 - { "sh4_address_space", 0x12345432 },
1.16 + { "sh4_address_space", (void *)0x12345432 },
1.17 + { "sh4_user_address_space", (void *)0x12345678 },
1.18 { "sh4_write_fpscr", sh4_write_fpscr },
1.19 { "sh4_write_sr", sh4_write_sr },
1.20 { "sh4_read_sr", sh4_read_sr },
1.21 @@ -65,29 +67,10 @@
1.22 { "sh4_switch_fr_banks", sh4_switch_fr_banks },
1.23 { "sh4_execute_instruction", sh4_execute_instruction },
1.24 { "signsat48", signsat48 },
1.25 - { "sh4_read_byte", sh4_read_byte },
1.26 - { "sh4_read_word", sh4_read_word },
1.27 - { "sh4_read_long", sh4_read_long },
1.28 - { "sh4_write_byte", sh4_write_byte },
1.29 - { "sh4_write_word", sh4_write_word },
1.30 - { "sh4_write_long", sh4_write_long },
1.31 { "xlat_get_code_by_vma", xlat_get_code_by_vma },
1.32 { "xlat_get_code", xlat_get_code }
1.33 };
1.34
1.35 -int32_t FASTCALL sh4_read_byte( uint32_t addr )
1.36 -{
1.37 - return *(uint8_t *)(inbuf+(addr-start_addr));
1.38 -}
1.39 -int32_t FASTCALL sh4_read_word( uint32_t addr )
1.40 -{
1.41 - return *(uint16_t *)(inbuf+(addr-start_addr));
1.42 -}
1.43 -int32_t FASTCALL sh4_read_long( uint32_t addr )
1.44 -{
1.45 - return *(uint32_t *)(inbuf+(addr-start_addr));
1.46 -}
1.47 -
1.48 // Stubs
1.49 gboolean sh4_execute_instruction( ) { return TRUE; }
1.50 void sh4_accept_interrupt() {}
1.51 @@ -102,9 +85,6 @@
1.52 void CCN_set_cache_control( uint32_t val ) { }
1.53 void PMM_write_control( int ctr, uint32_t val ) { }
1.54 void SCIF_run_slice( uint32_t nanos ) {}
1.55 -void FASTCALL sh4_write_byte( uint32_t addr, uint32_t val ) {}
1.56 -void FASTCALL sh4_write_word( uint32_t addr, uint32_t val ) {}
1.57 -void FASTCALL sh4_write_long( uint32_t addr, uint32_t val ) {}
1.58 void FASTCALL sh4_write_fpscr( uint32_t val ) { }
1.59 void FASTCALL sh4_write_sr( uint32_t val ) { }
1.60 uint32_t FASTCALL sh4_read_sr( void ) { return 0; }
.