diff -r -U 5 -N -x CVS -x '*~' -x '.#*' clean/packages/services/objloader/current/include/objelf.h devo/packages/services/objloader/current/include/objelf.h --- clean/packages/services/objloader/current/include/objelf.h 2005-07-07 11:00:02.202423152 -0700 +++ devo/packages/services/objloader/current/include/objelf.h 2005-07-07 11:06:05.507192432 -0700 @@ -300,15 +300,15 @@ CYG_LDR_TABLE_ENTRY( cyg_mbox_tryput_entry, \ "cyg_mbox_tryput", cyg_mbox_tryput ); \ CYG_LDR_TABLE_ENTRY( cyg_mbox_peek_entry, \ "cyg_mbox_peek", cyg_mbox_peek ); \ CYG_LDR_TABLE_ENTRY( cyg_mbox_waiting_to_get_entry, \ - "cyg_mbox_waiting_to_get_item", \ - cyg_mbox_waiting_to_get_item ); \ + "cyg_mbox_waiting_to_get", \ + cyg_mbox_waiting_to_get ); \ CYG_LDR_TABLE_ENTRY( cyg_mbox_waiting_to_put_entry, \ - "cyg_mbox_waiting_to_put_item", \ - cyg_mbox_waiting_to_put_item ); + "cyg_mbox_waiting_to_put", \ + cyg_mbox_waiting_to_put ); #define CYG_LDR_TABLE_KAPI_MEMPOOL_FIX() \ CYG_LDR_TABLE_ENTRY( cyg_mempool_fix_create_entry, \ "cyg_mempool_fix_create", cyg_mempool_fix_create ); \ CYG_LDR_TABLE_ENTRY( cyg_mempool_fix_delete_entry, \ @@ -384,11 +384,11 @@ CYG_LDR_TABLE_ENTRY( cyg_semaphore_wait_entry, \ "cyg_semaphore_wait", cyg_semaphore_wait ); \ CYG_LDR_TABLE_ENTRY( cyg_semaphore_timed_wait_entry, \ "cyg_semaphore_timed_wait", cyg_semaphore_timed_wait ); \ CYG_LDR_TABLE_ENTRY( cyg_semaphore_try_wait_entry, \ - "cyg_semaphore_try_wait", cyg_semaphore_try_wait ); \ + "cyg_semaphore_trywait", cyg_semaphore_trywait ); \ CYG_LDR_TABLE_ENTRY( cyg_semaphore_post_entry, \ "cyg_semaphore_post", cyg_semaphore_post ); \ CYG_LDR_TABLE_ENTRY( cyg_semaphore_peek_entry, \ "cyg_semaphore_peek", cyg_semaphore_peek ); @@ -424,31 +424,21 @@ "cyg_thread_delay", cyg_thread_delay ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_get_stack_base_entry, \ "cyg_thread_get_stack_base", cyg_thread_get_stack_base ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_get_stack_size_entry, \ "cyg_thread_get_stack_size", cyg_thread_get_stack_size ); \ -CYG_LDR_TABLE_ENTRY( cyg_thread_get_stack_usage_entry, \ - "cyg_thread_get_stack_usage", \ - cyg_thread_get_stack_usage ); \ -CYG_LDR_TABLE_ENTRY( cyg_thread_measure_stack_usage_entry, \ - "cyg_thread_measure_stack_usage", \ - cyg_thread_measure_stack_usage ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_new_data_index_entry, \ "cyg_thread_new_data_index", cyg_thread_new_data_index ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_free_data_index_entry, \ "cyg_thread_free_data_index", \ cyg_thread_free_data_index ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_get_data_entry, \ "cyg_thread_get_data", cyg_thread_get_data ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_get_data_ptr_entry, \ "cyg_thread_get_data_ptr", cyg_thread_get_data_ptr ); \ CYG_LDR_TABLE_ENTRY( cyg_thread_set_data_entry, \ - "cyg_thread_set_data", cyg_thread_set_data ); \ -CYG_LDR_TABLE_ENTRY( cyg_thread_add_destructor_entry, \ - "cyg_thread_add_destructor", cyg_thread_add_destructor ); \ -CYG_LDR_TABLE_ENTRY( cyg_thread_rem_destructor_entry, \ - "cyg_thread_rem_destructor", cyg_thread_rem_destructor ); + "cyg_thread_set_data", cyg_thread_set_data ); #define CYG_LDR_TABLE_STRING() \ CYG_LDR_TABLE_ENTRY( memchr_entry, "memchr", memchr ); \ CYG_LDR_TABLE_ENTRY( memcmp_entry, "memcmp", memcmp ); \ CYG_LDR_TABLE_ENTRY( memcpy_entry, "memcpy", memcpy ); \ @@ -482,29 +472,23 @@ CYG_LDR_TABLE_ENTRY( fgetpos_entry, "fgetpos", fgetpos ); \ CYG_LDR_TABLE_ENTRY( fgets_entry, "fgets", fgets ); \ CYG_LDR_TABLE_ENTRY( fopen_entry, "fopen", fopen ); \ CYG_LDR_TABLE_ENTRY( fprintf_entry, "fprintf", fprintf ); \ CYG_LDR_TABLE_ENTRY( fputc_entry, "fputc", fputc ); \ -CYG_LDR_TABLE_ENTRY( fputchar_entry, "fputchar", fputchar ); \ CYG_LDR_TABLE_ENTRY( fputs_entry, "fputs", fputs ); \ CYG_LDR_TABLE_ENTRY( fread_entry, "fread", fread ); \ CYG_LDR_TABLE_ENTRY( freopen_entry, "freopen", freopen ); \ CYG_LDR_TABLE_ENTRY( fscanf_entry, "fscanf", fscanf ); \ CYG_LDR_TABLE_ENTRY( fseek_entry, "fseek", fseek ); \ CYG_LDR_TABLE_ENTRY( fsetpos_entry, "fsetpos", fsetpos ); \ CYG_LDR_TABLE_ENTRY( ftell_entry, "ftell", ftell ); \ CYG_LDR_TABLE_ENTRY( fwrite_entry, "fwrite", fwrite ); \ -CYG_LDR_TABLE_ENTRY( fgetc_entry, "fgetc", fgetc ); \ -CYG_LDR_TABLE_ENTRY( fgetchar_entry, "fgetchar", fgetchar ); \ -CYG_LDR_TABLE_ENTRY( fgets_entry, "fgets", fgets ); \ -CYG_LDR_TABLE_ENTRY( fgetw_entry, "fgetw", fgetw ); \ CYG_LDR_TABLE_ENTRY( perror_entry, "perror", perror ); \ CYG_LDR_TABLE_ENTRY( printf_entry, "printf", printf ); \ CYG_LDR_TABLE_ENTRY( putc_entry, "putc", putc ); \ CYG_LDR_TABLE_ENTRY( putchar_entry, "putchar", putchar ); \ CYG_LDR_TABLE_ENTRY( puts_entry, "puts", puts ); \ -CYG_LDR_TABLE_ENTRY( putw_entry, "putw", putw ); \ CYG_LDR_TABLE_ENTRY( remove_entry, "remove", remove ); \ CYG_LDR_TABLE_ENTRY( rename_entry, "rename", rename ); \ CYG_LDR_TABLE_ENTRY( rewind_entry, "rewind", rewind ); \ CYG_LDR_TABLE_ENTRY( scanf_entry, "scanf", scanf ); \ CYG_LDR_TABLE_ENTRY( setbuf_entry, "setbuf", setbuf ); \ @@ -529,12 +513,10 @@ "diag_dump_buf", diag_dump_buf ); \ CYG_LDR_TABLE_ENTRY( diag_dump_buf_32bit_entry, \ "diag_dump_buf_32bit", diag_dump_buf_32bit ); \ CYG_LDR_TABLE_ENTRY( diag_dump_buf_16bit_entry, \ "diag_dump_buf_16bit", diag_dump_buf_16bit ); \ -CYG_LDR_TABLE_ENTRY( __printf_fun_entry, \ - "__printf_fun", __printf_fun ); \ CYG_LDR_TABLE_ENTRY( diag_vdump_buf_with_offset_entry, \ "diag_vdump_buf_with_offset", \ diag_vdump_buf_with_offset ); \ CYG_LDR_TABLE_ENTRY( diag_dump_buf_with_offset_entry, \ "diag_dump_buf_with_offset", \ @@ -552,6 +534,5 @@ CYG_LDR_TABLE_ENTRY( diag_vsprintf_entry, "diag_vsprintf", diag_vsprintf ); \ CYG_LDR_TABLE_ENTRY( diag_vprintf_entry, "diag_vprintf", diag_vprintf ); //============================================================================== #endif - diff -r -U 5 -N -x CVS -x '*~' -x '.#*' clean/packages/services/objloader/current/tests/test_mods.c devo/packages/services/objloader/current/tests/test_mods.c --- clean/packages/services/objloader/current/tests/test_mods.c 2005-07-07 11:00:02.322404912 -0700 +++ devo/packages/services/objloader/current/tests/test_mods.c 2005-07-07 11:03:07.481256488 -0700 @@ -146,62 +146,30 @@ } // ----------------------------------------------------------------------------- // External symbols. // ----------------------------------------------------------------------------- +CYG_LDR_TABLE_KAPI_ALARM() +CYG_LDR_TABLE_KAPI_CLOCK() +CYG_LDR_TABLE_KAPI_COND() +CYG_LDR_TABLE_KAPI_COUNTER() +CYG_LDR_TABLE_KAPI_EXCEPTIONS() +CYG_LDR_TABLE_KAPI_FLAG() +CYG_LDR_TABLE_KAPI_INTERRUPTS() +CYG_LDR_TABLE_KAPI_MBOX() +CYG_LDR_TABLE_KAPI_MEMPOOL_FIX() +CYG_LDR_TABLE_KAPI_MEMPOOL_VAR() +CYG_LDR_TABLE_KAPI_MUTEX() +CYG_LDR_TABLE_KAPI_SCHEDULER() +CYG_LDR_TABLE_KAPI_SEMAPHORE() +CYG_LDR_TABLE_KAPI_THREAD() +CYG_LDR_TABLE_STRING() +CYG_LDR_TABLE_STDIO() +CYG_LDR_TABLE_INFRA_DIAG() -// eCos semaphores -CYG_LDR_TABLE_ENTRY( cyg_thread_delay_entry, - "cyg_thread_delay", - cyg_thread_delay ); -CYG_LDR_TABLE_ENTRY( cyg_semaphore_wait_entry, - "cyg_semaphore_wait", - cyg_semaphore_wait ); -CYG_LDR_TABLE_ENTRY( cyg_semaphore_init_entry, - "cyg_semaphore_init", - cyg_semaphore_init ); -CYG_LDR_TABLE_ENTRY( cyg_semaphore_post_entry, - "cyg_semaphore_post", - cyg_semaphore_post ); - -// eCos mailboxes -CYG_LDR_TABLE_ENTRY( cyg_mbox_put_entry, "cyg_mbox_put", cyg_mbox_put ); - -// eCos Flags -CYG_LDR_TABLE_ENTRY( cyg_flag_poll_entry, "cyg_flag_poll", cyg_flag_poll ); -CYG_LDR_TABLE_ENTRY( cyg_flag_setbits_entry, - "cyg_flag_setbits", - cyg_flag_setbits ); - -// eCos misc +// Extra entries CYG_LDR_TABLE_ENTRY( hal_delay_us_entry, "hal_delay_us", hal_delay_us ); CYG_LDR_TABLE_ENTRY( cyg_assert_msg_entry, "cyg_assert_msg", cyg_assert_msg ); CYG_LDR_TABLE_ENTRY( cyg_assert_fail_entry, "cyg_assert_fail", cyg_assert_fail ); - -// memory -CYG_LDR_TABLE_ENTRY( memcpy_entry, "memcpy", memcpy ); -CYG_LDR_TABLE_ENTRY( memset_entry, "memset", memset ); -CYG_LDR_TABLE_ENTRY( memcmp_entry, "memcmp", memcmp ); -CYG_LDR_TABLE_ENTRY( malloc_entry, "malloc", malloc ); -CYG_LDR_TABLE_ENTRY( free_entry, "free", free ); - -// Strings -CYG_LDR_TABLE_ENTRY( strcpy_entry, "strcpy", strcpy ); -CYG_LDR_TABLE_ENTRY( strcat_entry, "strcat", strcat ); -CYG_LDR_TABLE_ENTRY( sprintf_entry, "sprintf", sprintf ); -CYG_LDR_TABLE_ENTRY( strlen_entry, "strlen", strlen ); -CYG_LDR_TABLE_ENTRY( strcmp_entry, "strcmp", strcmp ); -CYG_LDR_TABLE_ENTRY( strncmp_entry, "strncmp", strncmp ); - -// files -CYG_LDR_TABLE_ENTRY( fopen_entry, "fopen", fopen ); -CYG_LDR_TABLE_ENTRY( fread_entry, "fread", fread ); -CYG_LDR_TABLE_ENTRY( fclose_entry, "fclose", fclose ); -CYG_LDR_TABLE_ENTRY( fseek_entry, "fseek", fseek ); -CYG_LDR_TABLE_ENTRY( stat_entry, "stat", stat ); - -// Diagnostic printout -CYG_LDR_TABLE_ENTRY( diag_printf_entry, "diag_printf", diag_printf ); - CYG_LDR_TABLE_ENTRY( weak_function_entry, "weak_function", weak_function );