revision 1189:1540105786c8
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 1189:1540105786c8 |
parent | 1188:1cc9bb0b3848 |
child | 1190:2e66e9053037 |
author | nkeynes |
date | Thu Dec 01 08:02:13 2011 +1000 (12 years ago) |
Fix make check
src/sh4/sh4.h | view | annotate | diff | log | ||
src/test/testsh4x86.c | view | annotate | diff | log | ||
src/test/testxlt.c | view | annotate | diff | log | ||
src/xlat/xltcache.c | view | annotate | diff | log |
1.1 --- a/src/sh4/sh4.h Thu Dec 01 01:50:44 2011 +10001.2 +++ b/src/sh4/sh4.h Thu Dec 01 08:02:13 2011 +10001.3 @@ -132,7 +132,7 @@1.4 * Handle an event that's due (note caller is responsible for ensuring that the1.5 * event is in fact due).1.6 */1.7 -void sh4_handle_pending_event();1.8 +void sh4_handle_pending_events();1.10 /**1.11 * Execute (using the emulator) a single instruction (in other words, perform a
2.1 --- a/src/test/testsh4x86.c Thu Dec 01 01:50:44 2011 +10002.2 +++ b/src/test/testsh4x86.c Thu Dec 01 08:02:13 2011 +10002.3 @@ -109,6 +109,7 @@2.4 void FASTCALL sh4_raise_trap( int exc ) { }2.5 void FASTCALL sh4_flush_store_queue( sh4addr_t addr ) { }2.6 void FASTCALL sh4_flush_store_queue_mmu( sh4addr_t addr, void *exc ) { }2.7 +void sh4_handle_pending_events() { }2.8 uint32_t sh4_sleep_run_slice(uint32_t nanosecs) { return nanosecs; }2.9 gboolean gui_error_dialog( const char *fmt, ... ) { return TRUE; }2.10 gboolean FASTCALL mmu_update_icache( sh4vma_t addr ) { return TRUE; }
3.1 --- a/src/test/testxlt.c Thu Dec 01 01:50:44 2011 +10003.2 +++ b/src/test/testxlt.c Thu Dec 01 08:02:13 2011 +10003.3 @@ -23,6 +23,10 @@3.4 extern xlat_cache_block_t xlat_new_cache;3.5 extern xlat_cache_block_t xlat_new_cache_ptr;3.7 +void sh4_translate_unlink_block( void *use_list )3.8 +{3.9 +}3.10 +3.11 /**3.12 * Test initial allocations from the new cache3.13 */
4.1 --- a/src/xlat/xltcache.c Thu Dec 01 01:50:44 2011 +10004.2 +++ b/src/xlat/xltcache.c Thu Dec 01 08:02:13 2011 +10004.3 @@ -613,7 +613,7 @@4.4 return count;4.5 }4.7 -void xlat_get_block_sh4addrs( struct xlat_block_ref *blocks, unsigned int size )4.8 +static void xlat_get_block_pcs( struct xlat_block_ref *blocks, unsigned int size )4.9 {4.10 unsigned i;4.11 for( i=0; i<XLAT_LUT_PAGES;i ++ ) {4.12 @@ -656,7 +656,7 @@4.14 struct xlat_block_ref blocks[count];4.15 xlat_get_active_blocks(blocks, count);4.16 - xlat_get_block_sh4addrs(blocks,count);4.17 + xlat_get_block_pcs(blocks,count);4.18 qsort(blocks, count, sizeof(struct xlat_block_ref), xlat_compare_active_field);4.20 if( topN > count )
.