diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s b/asm/msl_c/MSL_Common/Src/FILE_POS/_fseek.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s rename to asm/msl_c/MSL_Common/Src/FILE_POS/_fseek.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s b/asm/msl_c/MSL_Common/Src/FILE_POS/fseek.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s rename to asm/msl_c/MSL_Common/Src/FILE_POS/fseek.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s b/asm/msl_c/MSL_Common/Src/FILE_POS/ftell.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s rename to asm/msl_c/MSL_Common/Src/FILE_POS/ftell.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s b/asm/msl_c/MSL_Common/Src/abort_exit/abort.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s rename to asm/msl_c/MSL_Common/Src/abort_exit/abort.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s b/asm/msl_c/MSL_Common/Src/abort_exit/exit.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s rename to asm/msl_c/MSL_Common/Src/abort_exit/exit.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s b/asm/msl_c/MSL_Common/Src/alloc/__pool_free.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s rename to asm/msl_c/MSL_Common/Src/alloc/__pool_free.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s b/asm/msl_c/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s rename to asm/msl_c/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s b/asm/msl_c/MSL_Common/Src/alloc/deallocate_from_var_pools.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s rename to asm/msl_c/MSL_Common/Src/alloc/deallocate_from_var_pools.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s b/asm/msl_c/MSL_Common/Src/alloc/free.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s rename to asm/msl_c/MSL_Common/Src/alloc/free.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s b/asm/msl_c/MSL_Common/Src/ansi_files/__close_all.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s rename to asm/msl_c/MSL_Common/Src/ansi_files/__close_all.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s b/asm/msl_c/MSL_Common/Src/ansi_files/__flush_all.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s rename to asm/msl_c/MSL_Common/Src/ansi_files/__flush_all.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s b/asm/msl_c/MSL_Common/Src/arith/abs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s rename to asm/msl_c/MSL_Common/Src/arith/abs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s b/asm/msl_c/MSL_Common/Src/arith/div.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s rename to asm/msl_c/MSL_Common/Src/arith/div.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s b/asm/msl_c/MSL_Common/Src/buffer_io/__flush_buffer.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s rename to asm/msl_c/MSL_Common/Src/buffer_io/__flush_buffer.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s b/asm/msl_c/MSL_Common/Src/buffer_io/__prep_buffer.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s rename to asm/msl_c/MSL_Common/Src/buffer_io/__prep_buffer.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s b/asm/msl_c/MSL_Common/Src/char_io/__put_char.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s rename to asm/msl_c/MSL_Common/Src/char_io/__put_char.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s b/asm/msl_c/MSL_Common/Src/char_io/fputs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s rename to asm/msl_c/MSL_Common/Src/char_io/fputs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s b/asm/msl_c/MSL_Common/Src/ctype/tolower.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s rename to asm/msl_c/MSL_Common/Src/ctype/tolower.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s b/asm/msl_c/MSL_Common/Src/direct_io/__fwrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s rename to asm/msl_c/MSL_Common/Src/direct_io/__fwrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s b/asm/msl_c/MSL_Common/Src/direct_io/fwrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s rename to asm/msl_c/MSL_Common/Src/direct_io/fwrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s b/asm/msl_c/MSL_Common/Src/extras/stricmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s rename to asm/msl_c/MSL_Common/Src/extras/stricmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s b/asm/msl_c/MSL_Common/Src/extras/strnicmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s rename to asm/msl_c/MSL_Common/Src/extras/strnicmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s b/asm/msl_c/MSL_Common/Src/file_io/__msl_strnicmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s rename to asm/msl_c/MSL_Common/Src/file_io/__msl_strnicmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s b/asm/msl_c/MSL_Common/Src/file_io/fclose.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s rename to asm/msl_c/MSL_Common/Src/file_io/fclose.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s b/asm/msl_c/MSL_Common/Src/file_io/fflush.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s rename to asm/msl_c/MSL_Common/Src/file_io/fflush.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s b/asm/msl_c/MSL_Common/Src/mbstring/wcstombs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s rename to asm/msl_c/MSL_Common/Src/mbstring/wcstombs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s b/asm/msl_c/MSL_Common/Src/mem/__memrchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s rename to asm/msl_c/MSL_Common/Src/mem/__memrchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s b/asm/msl_c/MSL_Common/Src/mem/memchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s rename to asm/msl_c/MSL_Common/Src/mem/memchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s b/asm/msl_c/MSL_Common/Src/mem/memcmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s rename to asm/msl_c/MSL_Common/Src/mem/memcmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s b/asm/msl_c/MSL_Common/Src/mem/memmove.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s rename to asm/msl_c/MSL_Common/Src/mem/memmove.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s b/asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s rename to asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s b/asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s rename to asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s b/asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s rename to asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s b/asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s rename to asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s b/asm/msl_c/MSL_Common/Src/misc_io/__stdio_atexit.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s rename to asm/msl_c/MSL_Common/Src/misc_io/__stdio_atexit.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s b/asm/msl_c/MSL_Common/Src/printf/__FileWrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s rename to asm/msl_c/MSL_Common/Src/printf/__FileWrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s b/asm/msl_c/MSL_Common/Src/printf/__StringWrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s rename to asm/msl_c/MSL_Common/Src/printf/__StringWrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s b/asm/msl_c/MSL_Common/Src/printf/__pformatter.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s rename to asm/msl_c/MSL_Common/Src/printf/__pformatter.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s b/asm/msl_c/MSL_Common/Src/printf/double2hex.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s rename to asm/msl_c/MSL_Common/Src/printf/double2hex.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s b/asm/msl_c/MSL_Common/Src/printf/float2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s rename to asm/msl_c/MSL_Common/Src/printf/float2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s b/asm/msl_c/MSL_Common/Src/printf/fprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s rename to asm/msl_c/MSL_Common/Src/printf/fprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s b/asm/msl_c/MSL_Common/Src/printf/long2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s rename to asm/msl_c/MSL_Common/Src/printf/long2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s b/asm/msl_c/MSL_Common/Src/printf/longlong2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s rename to asm/msl_c/MSL_Common/Src/printf/longlong2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s b/asm/msl_c/MSL_Common/Src/printf/parse_format.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s rename to asm/msl_c/MSL_Common/Src/printf/parse_format.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s b/asm/msl_c/MSL_Common/Src/printf/printf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s rename to asm/msl_c/MSL_Common/Src/printf/printf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s b/asm/msl_c/MSL_Common/Src/printf/round_decimal.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s rename to asm/msl_c/MSL_Common/Src/printf/round_decimal.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s b/asm/msl_c/MSL_Common/Src/printf/snprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s rename to asm/msl_c/MSL_Common/Src/printf/snprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s b/asm/msl_c/MSL_Common/Src/printf/sprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s rename to asm/msl_c/MSL_Common/Src/printf/sprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s b/asm/msl_c/MSL_Common/Src/printf/vprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s rename to asm/msl_c/MSL_Common/Src/printf/vprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s b/asm/msl_c/MSL_Common/Src/printf/vsnprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s rename to asm/msl_c/MSL_Common/Src/printf/vsnprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s b/asm/msl_c/MSL_Common/Src/scanf/__StringRead.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s rename to asm/msl_c/MSL_Common/Src/scanf/__StringRead.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s b/asm/msl_c/MSL_Common/Src/signal/raise.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s rename to asm/msl_c/MSL_Common/Src/signal/raise.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s b/asm/msl_c/MSL_Common/Src/string/strcat.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s rename to asm/msl_c/MSL_Common/Src/string/strcat.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s b/asm/msl_c/MSL_Common/Src/string/strchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s rename to asm/msl_c/MSL_Common/Src/string/strchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s b/asm/msl_c/MSL_Common/Src/string/strcmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s rename to asm/msl_c/MSL_Common/Src/string/strcmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s b/asm/msl_c/MSL_Common/Src/string/strcpy.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s rename to asm/msl_c/MSL_Common/Src/string/strcpy.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s b/asm/msl_c/MSL_Common/Src/string/strlen.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s rename to asm/msl_c/MSL_Common/Src/string/strlen.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s b/asm/msl_c/MSL_Common/Src/string/strncmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s rename to asm/msl_c/MSL_Common/Src/string/strncmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s b/asm/msl_c/MSL_Common/Src/string/strncpy.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s rename to asm/msl_c/MSL_Common/Src/string/strncpy.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s b/asm/msl_c/MSL_Common/Src/string/strrchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s rename to asm/msl_c/MSL_Common/Src/string/strrchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s b/asm/msl_c/MSL_Common/Src/strtoul/__strtoul.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s rename to asm/msl_c/MSL_Common/Src/strtoul/__strtoul.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s b/asm/msl_c/MSL_Common/Src/strtoul/strtol.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s rename to asm/msl_c/MSL_Common/Src/strtoul/strtol.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s b/asm/msl_c/MSL_Common/Src/strtoul/strtoul.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s rename to asm/msl_c/MSL_Common/Src/strtoul/strtoul.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s b/asm/msl_c/MSL_Common/Src/wchar_io/fwide.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s rename to asm/msl_c/MSL_Common/Src/wchar_io/fwide.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s b/asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s rename to asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s b/asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s rename to asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s b/asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s rename to asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s b/asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s rename to asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s b/asm/msl_c/Math/Double_precision/e_acos/__ieee754_acos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s rename to asm/msl_c/Math/Double_precision/e_acos/__ieee754_acos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s b/asm/msl_c/Math/Double_precision/e_asin/__ieee754_asin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s rename to asm/msl_c/Math/Double_precision/e_asin/__ieee754_asin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s b/asm/msl_c/Math/Double_precision/e_atan2/__ieee754_atan2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s rename to asm/msl_c/Math/Double_precision/e_atan2/__ieee754_atan2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s b/asm/msl_c/Math/Double_precision/e_exp/__ieee754_exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s rename to asm/msl_c/Math/Double_precision/e_exp/__ieee754_exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s b/asm/msl_c/Math/Double_precision/e_fmod/__ieee754_fmod.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s rename to asm/msl_c/Math/Double_precision/e_fmod/__ieee754_fmod.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s b/asm/msl_c/Math/Double_precision/e_pow/__ieee754_pow.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s rename to asm/msl_c/Math/Double_precision/e_pow/__ieee754_pow.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s b/asm/msl_c/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s rename to asm/msl_c/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s b/asm/msl_c/Math/Double_precision/e_sqrt/__ieee754_sqrt.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s rename to asm/msl_c/Math/Double_precision/e_sqrt/__ieee754_sqrt.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s b/asm/msl_c/Math/Double_precision/k_cos/__kernel_cos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s rename to asm/msl_c/Math/Double_precision/k_cos/__kernel_cos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s b/asm/msl_c/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s rename to asm/msl_c/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s b/asm/msl_c/Math/Double_precision/k_sin/__kernel_sin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s rename to asm/msl_c/Math/Double_precision/k_sin/__kernel_sin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s b/asm/msl_c/Math/Double_precision/k_tan/__kernel_tan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s rename to asm/msl_c/Math/Double_precision/k_tan/__kernel_tan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s b/asm/msl_c/Math/Double_precision/s_atan/atan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s rename to asm/msl_c/Math/Double_precision/s_atan/atan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s b/asm/msl_c/Math/Double_precision/s_ceil/ceil.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s rename to asm/msl_c/Math/Double_precision/s_ceil/ceil.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s b/asm/msl_c/Math/Double_precision/s_copysign/copysign.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s rename to asm/msl_c/Math/Double_precision/s_copysign/copysign.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s b/asm/msl_c/Math/Double_precision/s_cos/cos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s rename to asm/msl_c/Math/Double_precision/s_cos/cos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s b/asm/msl_c/Math/Double_precision/s_floor/floor.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s rename to asm/msl_c/Math/Double_precision/s_floor/floor.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s b/asm/msl_c/Math/Double_precision/s_frexp/frexp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s rename to asm/msl_c/Math/Double_precision/s_frexp/frexp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s b/asm/msl_c/Math/Double_precision/s_ldexp/ldexp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s rename to asm/msl_c/Math/Double_precision/s_ldexp/ldexp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s b/asm/msl_c/Math/Double_precision/s_modf/modf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s rename to asm/msl_c/Math/Double_precision/s_modf/modf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s b/asm/msl_c/Math/Double_precision/s_sin/sin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s rename to asm/msl_c/Math/Double_precision/s_sin/sin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s b/asm/msl_c/Math/Double_precision/s_tan/tan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s rename to asm/msl_c/Math/Double_precision/s_tan/tan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s b/asm/msl_c/Math/Double_precision/w_acos/acos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s rename to asm/msl_c/Math/Double_precision/w_acos/acos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s b/asm/msl_c/Math/Double_precision/w_asin/asin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s rename to asm/msl_c/Math/Double_precision/w_asin/asin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s b/asm/msl_c/Math/Double_precision/w_atan2/atan2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s rename to asm/msl_c/Math/Double_precision/w_atan2/atan2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s b/asm/msl_c/Math/Double_precision/w_exp/exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s rename to asm/msl_c/Math/Double_precision/w_exp/exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s b/asm/msl_c/Math/Double_precision/w_fmod/fmod.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s rename to asm/msl_c/Math/Double_precision/w_fmod/fmod.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s b/asm/msl_c/Math/Double_precision/w_pow/pow.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s rename to asm/msl_c/Math/Double_precision/w_pow/pow.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s b/asm/msl_c/Math/Double_precision/w_sqrt/sqrt.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s rename to asm/msl_c/Math/Double_precision/w_sqrt/sqrt.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s b/asm/msl_c/PPC_EABI/Src/math_ppc/acosf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s rename to asm/msl_c/PPC_EABI/Src/math_ppc/acosf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s b/asm/msl_c/PPC_EABI/Src/math_ppc/cosf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s rename to asm/msl_c/PPC_EABI/Src/math_ppc/cosf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s b/asm/msl_c/PPC_EABI/Src/math_ppc/sinf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s rename to asm/msl_c/PPC_EABI/Src/math_ppc/sinf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s b/asm/msl_c/PPC_EABI/Src/math_ppc/tanf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s rename to asm/msl_c/PPC_EABI/Src/math_ppc/tanf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s b/asm/msl_c/PPC_EABI/Src/uart_console_io_gcn/__write_console.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s rename to asm/msl_c/PPC_EABI/Src/uart_console_io_gcn/__write_console.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s deleted file mode 100644 index 111b4993847..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s +++ /dev/null @@ -1,179 +0,0 @@ -lbl_80373514: -/* 80373514 94 21 FF B8 */ stwu r1, -0x48(r1) -/* 80373518 28 05 00 00 */ cmplwi r5, 0 -/* 8037351C BE C1 00 20 */ stmw r22, 0x20(r1) -/* 80373520 41 82 01 38 */ beq lbl_80373658 -/* 80373524 3B A0 00 00 */ li r29, 0 -/* 80373528 7C 1D 20 00 */ cmpw r29, r4 -/* 8037352C 3B C0 00 00 */ li r30, 0 -/* 80373530 40 80 01 20 */ bge lbl_80373650 -/* 80373534 2C 04 00 08 */ cmpwi r4, 8 -/* 80373538 38 C4 FF F8 */ addi r6, r4, -8 -/* 8037353C 40 81 02 5C */ ble lbl_80373798 -/* 80373540 38 06 00 07 */ addi r0, r6, 7 -/* 80373544 54 00 E8 FE */ srwi r0, r0, 3 -/* 80373548 2C 06 00 00 */ cmpwi r6, 0 -/* 8037354C 7C 09 03 A6 */ mtctr r0 -/* 80373550 3B E3 00 00 */ addi r31, r3, 0 -/* 80373554 40 81 02 44 */ ble lbl_80373798 -lbl_80373558: -/* 80373558 20 DD 00 03 */ subfic r6, r29, 3 -/* 8037355C 89 9F 00 00 */ lbz r12, 0(r31) -/* 80373560 38 1D 00 01 */ addi r0, r29, 1 -/* 80373564 89 7F 00 01 */ lbz r11, 1(r31) -/* 80373568 54 CA 18 38 */ slwi r10, r6, 3 -/* 8037356C 89 3F 00 02 */ lbz r9, 2(r31) -/* 80373570 21 00 00 03 */ subfic r8, r0, 3 -/* 80373574 88 FF 00 03 */ lbz r7, 3(r31) -/* 80373578 38 DD 00 02 */ addi r6, r29, 2 -/* 8037357C 88 1F 00 04 */ lbz r0, 4(r31) -/* 80373580 7D 8C 50 30 */ slw r12, r12, r10 -/* 80373584 8A FF 00 05 */ lbz r23, 5(r31) -/* 80373588 55 0A 18 38 */ slwi r10, r8, 3 -/* 8037358C 8B 3F 00 06 */ lbz r25, 6(r31) -/* 80373590 20 C6 00 03 */ subfic r6, r6, 3 -/* 80373594 8B 7F 00 07 */ lbz r27, 7(r31) -/* 80373598 54 C8 18 38 */ slwi r8, r6, 3 -/* 8037359C 7C DD 00 D0 */ neg r6, r29 -/* 803735A0 3A DD 00 04 */ addi r22, r29, 4 -/* 803735A4 54 C6 18 38 */ slwi r6, r6, 3 -/* 803735A8 22 D6 00 03 */ subfic r22, r22, 3 -/* 803735AC 3B 1D 00 05 */ addi r24, r29, 5 -/* 803735B0 56 D6 18 38 */ slwi r22, r22, 3 -/* 803735B4 23 18 00 03 */ subfic r24, r24, 3 -/* 803735B8 3B 5D 00 06 */ addi r26, r29, 6 -/* 803735BC 57 18 18 38 */ slwi r24, r24, 3 -/* 803735C0 23 5A 00 03 */ subfic r26, r26, 3 -/* 803735C4 3B 9D 00 07 */ addi r28, r29, 7 -/* 803735C8 57 5A 18 38 */ slwi r26, r26, 3 -/* 803735CC 23 9C 00 03 */ subfic r28, r28, 3 -/* 803735D0 57 9C 18 38 */ slwi r28, r28, 3 -/* 803735D4 7F DE 63 78 */ or r30, r30, r12 -/* 803735D8 7D 6A 50 30 */ slw r10, r11, r10 -/* 803735DC 7F DE 53 78 */ or r30, r30, r10 -/* 803735E0 7D 28 40 30 */ slw r8, r9, r8 -/* 803735E4 7F DE 43 78 */ or r30, r30, r8 -/* 803735E8 7C E6 30 30 */ slw r6, r7, r6 -/* 803735EC 7F DE 33 78 */ or r30, r30, r6 -/* 803735F0 7C 00 B0 30 */ slw r0, r0, r22 -/* 803735F4 7F DE 03 78 */ or r30, r30, r0 -/* 803735F8 7E E0 C0 30 */ slw r0, r23, r24 -/* 803735FC 7F DE 03 78 */ or r30, r30, r0 -/* 80373600 7F 20 D0 30 */ slw r0, r25, r26 -/* 80373604 7F DE 03 78 */ or r30, r30, r0 -/* 80373608 7F 60 E0 30 */ slw r0, r27, r28 -/* 8037360C 7F DE 03 78 */ or r30, r30, r0 -/* 80373610 3B FF 00 08 */ addi r31, r31, 8 -/* 80373614 3B BD 00 08 */ addi r29, r29, 8 -/* 80373618 42 00 FF 40 */ bdnz lbl_80373558 -/* 8037361C 48 00 01 7C */ b lbl_80373798 -lbl_80373620: -/* 80373620 7C 1D 20 50 */ subf r0, r29, r4 -/* 80373624 7C 1D 20 00 */ cmpw r29, r4 -/* 80373628 7C 09 03 A6 */ mtctr r0 -/* 8037362C 40 80 00 24 */ bge lbl_80373650 -lbl_80373630: -/* 80373630 20 1D 00 03 */ subfic r0, r29, 3 -/* 80373634 88 C7 00 00 */ lbz r6, 0(r7) -/* 80373638 54 00 18 38 */ slwi r0, r0, 3 -/* 8037363C 7C C0 00 30 */ slw r0, r6, r0 -/* 80373640 7F DE 03 78 */ or r30, r30, r0 -/* 80373644 38 E7 00 01 */ addi r7, r7, 1 -/* 80373648 3B BD 00 01 */ addi r29, r29, 1 -/* 8037364C 42 00 FF E4 */ bdnz lbl_80373630 -lbl_80373650: -/* 80373650 3C C0 CC 00 */ lis r6, 0xCC00 /* 0xCC006838@ha */ -/* 80373654 93 C6 68 38 */ stw r30, 0x6838(r6) /* 0xCC006838@l */ -lbl_80373658: -/* 80373658 38 04 FF FF */ addi r0, r4, -1 -/* 8037365C 3C C0 CC 00 */ lis r6, 0xCC00 /* 0xCC006800@ha */ -/* 80373660 54 A7 10 3A */ slwi r7, r5, 2 -/* 80373664 39 06 68 00 */ addi r8, r6, 0x6800 /* 0xCC006800@l */ -/* 80373668 60 E6 00 01 */ ori r6, r7, 1 -/* 8037366C 54 00 20 36 */ slwi r0, r0, 4 -/* 80373670 7C C0 03 78 */ or r0, r6, r0 -/* 80373674 94 08 00 34 */ stwu r0, 0x34(r8) -lbl_80373678: -/* 80373678 80 08 00 00 */ lwz r0, 0(r8) -/* 8037367C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80373680 40 82 FF F8 */ bne lbl_80373678 -/* 80373684 28 05 00 00 */ cmplwi r5, 0 -/* 80373688 40 82 01 08 */ bne lbl_80373790 -/* 8037368C 38 A0 00 00 */ li r5, 0 -/* 80373690 3C C0 CC 00 */ lis r6, 0xCC00 /* 0xCC006838@ha */ -/* 80373694 7C 05 20 00 */ cmpw r5, r4 -/* 80373698 80 06 68 38 */ lwz r0, 0x6838(r6) /* 0xCC006838@l */ -/* 8037369C 40 80 00 F4 */ bge lbl_80373790 -/* 803736A0 2C 04 00 08 */ cmpwi r4, 8 -/* 803736A4 38 E4 FF F8 */ addi r7, r4, -8 -/* 803736A8 40 81 00 BC */ ble lbl_80373764 -/* 803736AC 38 C7 00 07 */ addi r6, r7, 7 -/* 803736B0 54 C6 E8 FE */ srwi r6, r6, 3 -/* 803736B4 2C 07 00 00 */ cmpwi r7, 0 -/* 803736B8 7C C9 03 A6 */ mtctr r6 -/* 803736BC 40 81 00 A8 */ ble lbl_80373764 -lbl_803736C0: -/* 803736C0 20 C5 00 03 */ subfic r6, r5, 3 -/* 803736C4 54 C7 18 38 */ slwi r7, r6, 3 -/* 803736C8 38 C5 00 01 */ addi r6, r5, 1 -/* 803736CC 7C 08 3C 30 */ srw r8, r0, r7 -/* 803736D0 20 C6 00 03 */ subfic r6, r6, 3 -/* 803736D4 99 03 00 00 */ stb r8, 0(r3) -/* 803736D8 54 C7 18 38 */ slwi r7, r6, 3 -/* 803736DC 38 C5 00 02 */ addi r6, r5, 2 -/* 803736E0 7C 0C 3C 30 */ srw r12, r0, r7 -/* 803736E4 20 C6 00 03 */ subfic r6, r6, 3 -/* 803736E8 99 83 00 01 */ stb r12, 1(r3) -/* 803736EC 54 C6 18 38 */ slwi r6, r6, 3 -/* 803736F0 7C 0B 34 30 */ srw r11, r0, r6 -/* 803736F4 7C C5 00 D0 */ neg r6, r5 -/* 803736F8 99 63 00 02 */ stb r11, 2(r3) -/* 803736FC 54 C7 18 38 */ slwi r7, r6, 3 -/* 80373700 38 C5 00 04 */ addi r6, r5, 4 -/* 80373704 7C 0A 3C 30 */ srw r10, r0, r7 -/* 80373708 20 C6 00 03 */ subfic r6, r6, 3 -/* 8037370C 99 43 00 03 */ stb r10, 3(r3) -/* 80373710 54 C7 18 38 */ slwi r7, r6, 3 -/* 80373714 38 C5 00 05 */ addi r6, r5, 5 -/* 80373718 7C 09 3C 30 */ srw r9, r0, r7 -/* 8037371C 20 C6 00 03 */ subfic r6, r6, 3 -/* 80373720 99 23 00 04 */ stb r9, 4(r3) -/* 80373724 54 C7 18 38 */ slwi r7, r6, 3 -/* 80373728 7C 08 3C 30 */ srw r8, r0, r7 -/* 8037372C 38 C5 00 06 */ addi r6, r5, 6 -/* 80373730 99 03 00 05 */ stb r8, 5(r3) -/* 80373734 20 E6 00 03 */ subfic r7, r6, 3 -/* 80373738 38 C5 00 07 */ addi r6, r5, 7 -/* 8037373C 54 E7 18 38 */ slwi r7, r7, 3 -/* 80373740 7C 07 3C 30 */ srw r7, r0, r7 -/* 80373744 20 C6 00 03 */ subfic r6, r6, 3 -/* 80373748 98 E3 00 06 */ stb r7, 6(r3) -/* 8037374C 54 C6 18 38 */ slwi r6, r6, 3 -/* 80373750 7C 06 34 30 */ srw r6, r0, r6 -/* 80373754 98 C3 00 07 */ stb r6, 7(r3) -/* 80373758 38 63 00 08 */ addi r3, r3, 8 -/* 8037375C 38 A5 00 08 */ addi r5, r5, 8 -/* 80373760 42 00 FF 60 */ bdnz lbl_803736C0 -lbl_80373764: -/* 80373764 7C C5 20 50 */ subf r6, r5, r4 -/* 80373768 7C 05 20 00 */ cmpw r5, r4 -/* 8037376C 7C C9 03 A6 */ mtctr r6 -/* 80373770 40 80 00 20 */ bge lbl_80373790 -lbl_80373774: -/* 80373774 20 85 00 03 */ subfic r4, r5, 3 -/* 80373778 54 84 18 38 */ slwi r4, r4, 3 -/* 8037377C 7C 04 24 30 */ srw r4, r0, r4 -/* 80373780 98 83 00 00 */ stb r4, 0(r3) -/* 80373784 38 63 00 01 */ addi r3, r3, 1 -/* 80373788 38 A5 00 01 */ addi r5, r5, 1 -/* 8037378C 42 00 FF E8 */ bdnz lbl_80373774 -lbl_80373790: -/* 80373790 38 60 00 01 */ li r3, 1 -/* 80373794 48 00 00 0C */ b lbl_803737A0 -lbl_80373798: -/* 80373798 7C E3 EA 14 */ add r7, r3, r29 -/* 8037379C 4B FF FE 84 */ b lbl_80373620 -lbl_803737A0: -/* 803737A0 BA C1 00 20 */ lmw r22, 0x20(r1) -/* 803737A4 38 21 00 48 */ addi r1, r1, 0x48 -/* 803737A8 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s deleted file mode 100644 index 973dd34674d..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80373188: -/* 80373188 7C 08 02 A6 */ mflr r0 -/* 8037318C 3C A0 CC 00 */ lis r5, 0xCC00 /* 0xCC003000@ha */ -/* 80373190 90 01 00 04 */ stw r0, 4(r1) -/* 80373194 38 00 10 00 */ li r0, 0x1000 -/* 80373198 94 21 FF F8 */ stwu r1, -8(r1) -/* 8037319C 81 8D 94 54 */ lwz r12, DBGCallback(r13) -/* 803731A0 90 05 30 00 */ stw r0, 0x3000(r5) /* 0xCC003000@l */ -/* 803731A4 28 0C 00 00 */ cmplwi r12, 0 -/* 803731A8 41 82 00 10 */ beq lbl_803731B8 -/* 803731AC 7D 88 03 A6 */ mtlr r12 -/* 803731B0 7C 63 07 34 */ extsh r3, r3 -/* 803731B4 4E 80 00 21 */ blrl -lbl_803731B8: -/* 803731B8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 803731BC 38 21 00 08 */ addi r1, r1, 8 -/* 803731C0 7C 08 03 A6 */ mtlr r0 -/* 803731C4 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s deleted file mode 100644 index 5ef3ecec791..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8037338C: -/* 8037338C 7C 08 02 A6 */ mflr r0 -/* 80373390 90 01 00 04 */ stw r0, 4(r1) -/* 80373394 54 60 41 EA */ rlwinm r0, r3, 8, 7, 0x15 -/* 80373398 64 00 20 00 */ oris r0, r0, 0x2000 -/* 8037339C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 803733A0 BF 41 00 28 */ stmw r26, 0x28(r1) -/* 803733A4 3F A0 CC 00 */ lis r29, 0xCC00 /* 0xCC006800@ha */ -/* 803733A8 3B C5 00 00 */ addi r30, r5, 0 -/* 803733AC 3B 44 00 00 */ addi r26, r4, 0 -/* 803733B0 3B FD 68 00 */ addi r31, r29, 0x6800 /* 0xCC006800@l */ -/* 803733B4 38 61 00 24 */ addi r3, r1, 0x24 -/* 803733B8 38 80 00 04 */ li r4, 4 -/* 803733BC 38 A0 00 01 */ li r5, 1 -/* 803733C0 80 DD 68 28 */ lwz r6, 0x6828(r29) -/* 803733C4 70 C6 04 05 */ andi. r6, r6, 0x405 -/* 803733C8 60 C6 00 C0 */ ori r6, r6, 0xc0 -/* 803733CC 94 DF 00 28 */ stwu r6, 0x28(r31) -/* 803733D0 90 01 00 24 */ stw r0, 0x24(r1) -/* 803733D4 48 00 01 41 */ bl DBGEXIImm -/* 803733D8 7C 60 00 34 */ cntlzw r0, r3 -/* 803733DC 54 00 D9 7E */ srwi r0, r0, 5 -/* 803733E0 7C 1B 03 78 */ mr r27, r0 -lbl_803733E4: -/* 803733E4 3B 9D 68 00 */ addi r28, r29, 0x6800 -/* 803733E8 84 1C 00 34 */ lwzu r0, 0x34(r28) -/* 803733EC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803733F0 40 82 FF F4 */ bne lbl_803733E4 -/* 803733F4 48 00 00 44 */ b lbl_80373438 -lbl_803733F8: -/* 803733F8 38 61 00 20 */ addi r3, r1, 0x20 -/* 803733FC 38 80 00 04 */ li r4, 4 -/* 80373400 38 A0 00 00 */ li r5, 0 -/* 80373404 48 00 01 11 */ bl DBGEXIImm -/* 80373408 7C 60 00 34 */ cntlzw r0, r3 -/* 8037340C 54 00 D9 7E */ srwi r0, r0, 5 -/* 80373410 7F 7B 03 78 */ or r27, r27, r0 -lbl_80373414: -/* 80373414 80 1C 00 00 */ lwz r0, 0(r28) -/* 80373418 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8037341C 40 82 FF F8 */ bne lbl_80373414 -/* 80373420 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80373424 37 DE FF FC */ addic. r30, r30, -4 -/* 80373428 90 1A 00 00 */ stw r0, 0(r26) -/* 8037342C 3B 5A 00 04 */ addi r26, r26, 4 -/* 80373430 40 80 00 08 */ bge lbl_80373438 -/* 80373434 3B C0 00 00 */ li r30, 0 -lbl_80373438: -/* 80373438 2C 1E 00 00 */ cmpwi r30, 0 -/* 8037343C 40 82 FF BC */ bne lbl_803733F8 -/* 80373440 80 9F 00 00 */ lwz r4, 0(r31) -/* 80373444 7F 60 00 34 */ cntlzw r0, r27 -/* 80373448 54 03 D9 7E */ srwi r3, r0, 5 -/* 8037344C 70 80 04 05 */ andi. r0, r4, 0x405 -/* 80373450 90 1F 00 00 */ stw r0, 0(r31) -/* 80373454 BB 41 00 28 */ lmw r26, 0x28(r1) -/* 80373458 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8037345C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80373460 7C 08 03 A6 */ mtlr r0 -/* 80373464 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s deleted file mode 100644 index aff10994eb9..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80373468: -/* 80373468 7C 08 02 A6 */ mflr r0 -/* 8037346C 38 80 00 02 */ li r4, 2 -/* 80373470 90 01 00 04 */ stw r0, 4(r1) -/* 80373474 3C 00 60 00 */ lis r0, 0x6000 -/* 80373478 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 8037347C BF 61 00 24 */ stmw r27, 0x24(r1) -/* 80373480 3F C0 CC 00 */ lis r30, 0xCC00 /* 0xCC006800@ha */ -/* 80373484 3B 63 00 00 */ addi r27, r3, 0 -/* 80373488 3B BE 68 00 */ addi r29, r30, 0x6800 /* 0xCC006800@l */ -/* 8037348C 38 61 00 18 */ addi r3, r1, 0x18 -/* 80373490 80 BE 68 28 */ lwz r5, 0x6828(r30) -/* 80373494 70 A5 04 05 */ andi. r5, r5, 0x405 -/* 80373498 60 A5 00 C0 */ ori r5, r5, 0xc0 -/* 8037349C 94 BD 00 28 */ stwu r5, 0x28(r29) -/* 803734A0 38 A0 00 01 */ li r5, 1 -/* 803734A4 90 01 00 18 */ stw r0, 0x18(r1) -/* 803734A8 48 00 00 6D */ bl DBGEXIImm -/* 803734AC 7C 60 00 34 */ cntlzw r0, r3 -/* 803734B0 54 1F D9 7E */ srwi r31, r0, 5 -lbl_803734B4: -/* 803734B4 3B 9E 68 00 */ addi r28, r30, 0x6800 -/* 803734B8 84 1C 00 34 */ lwzu r0, 0x34(r28) -/* 803734BC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803734C0 40 82 FF F4 */ bne lbl_803734B4 -/* 803734C4 38 7B 00 00 */ addi r3, r27, 0 -/* 803734C8 38 80 00 04 */ li r4, 4 -/* 803734CC 38 A0 00 00 */ li r5, 0 -/* 803734D0 48 00 00 45 */ bl DBGEXIImm -/* 803734D4 7C 60 00 34 */ cntlzw r0, r3 -/* 803734D8 54 00 D9 7E */ srwi r0, r0, 5 -/* 803734DC 7F E3 03 78 */ or r3, r31, r0 -lbl_803734E0: -/* 803734E0 80 1C 00 00 */ lwz r0, 0(r28) -/* 803734E4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803734E8 40 82 FF F8 */ bne lbl_803734E0 -/* 803734EC 80 9D 00 00 */ lwz r4, 0(r29) -/* 803734F0 7C 60 00 34 */ cntlzw r0, r3 -/* 803734F4 54 03 D9 7E */ srwi r3, r0, 5 -/* 803734F8 70 80 04 05 */ andi. r0, r4, 0x405 -/* 803734FC 90 1D 00 00 */ stw r0, 0(r29) -/* 80373500 BB 61 00 24 */ lmw r27, 0x24(r1) -/* 80373504 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80373508 38 21 00 38 */ addi r1, r1, 0x38 -/* 8037350C 7C 08 03 A6 */ mtlr r0 -/* 80373510 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s deleted file mode 100644 index 745cfec32f3..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80373204: -/* 80373204 7C 08 02 A6 */ mflr r0 -/* 80373208 38 80 00 02 */ li r4, 2 -/* 8037320C 90 01 00 04 */ stw r0, 4(r1) -/* 80373210 3C 00 40 00 */ lis r0, 0x4000 -/* 80373214 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 80373218 BF 61 00 24 */ stmw r27, 0x24(r1) -/* 8037321C 3F C0 CC 00 */ lis r30, 0xCC00 /* 0xCC006800@ha */ -/* 80373220 3B 63 00 00 */ addi r27, r3, 0 -/* 80373224 3B BE 68 00 */ addi r29, r30, 0x6800 /* 0xCC006800@l */ -/* 80373228 38 61 00 18 */ addi r3, r1, 0x18 -/* 8037322C 80 BE 68 28 */ lwz r5, 0x6828(r30) -/* 80373230 70 A5 04 05 */ andi. r5, r5, 0x405 -/* 80373234 60 A5 00 C0 */ ori r5, r5, 0xc0 -/* 80373238 94 BD 00 28 */ stwu r5, 0x28(r29) -/* 8037323C 38 A0 00 01 */ li r5, 1 -/* 80373240 90 01 00 18 */ stw r0, 0x18(r1) -/* 80373244 48 00 02 D1 */ bl DBGEXIImm -/* 80373248 7C 60 00 34 */ cntlzw r0, r3 -/* 8037324C 54 1F D9 7E */ srwi r31, r0, 5 -lbl_80373250: -/* 80373250 3B 9E 68 00 */ addi r28, r30, 0x6800 -/* 80373254 84 1C 00 34 */ lwzu r0, 0x34(r28) -/* 80373258 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8037325C 40 82 FF F4 */ bne lbl_80373250 -/* 80373260 38 7B 00 00 */ addi r3, r27, 0 -/* 80373264 38 80 00 04 */ li r4, 4 -/* 80373268 38 A0 00 00 */ li r5, 0 -/* 8037326C 48 00 02 A9 */ bl DBGEXIImm -/* 80373270 7C 60 00 34 */ cntlzw r0, r3 -/* 80373274 54 00 D9 7E */ srwi r0, r0, 5 -/* 80373278 7F E3 03 78 */ or r3, r31, r0 -lbl_8037327C: -/* 8037327C 80 1C 00 00 */ lwz r0, 0(r28) -/* 80373280 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80373284 40 82 FF F8 */ bne lbl_8037327C -/* 80373288 80 9D 00 00 */ lwz r4, 0(r29) -/* 8037328C 7C 60 00 34 */ cntlzw r0, r3 -/* 80373290 54 03 D9 7E */ srwi r3, r0, 5 -/* 80373294 70 80 04 05 */ andi. r0, r4, 0x405 -/* 80373298 90 1D 00 00 */ stw r0, 0(r29) -/* 8037329C BB 61 00 24 */ lmw r27, 0x24(r1) -/* 803732A0 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 803732A4 38 21 00 38 */ addi r1, r1, 0x38 -/* 803732A8 7C 08 03 A6 */ mtlr r0 -/* 803732AC 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s deleted file mode 100644 index ce250e1fd23..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_803732B0: -/* 803732B0 7C 08 02 A6 */ mflr r0 -/* 803732B4 90 01 00 04 */ stw r0, 4(r1) -/* 803732B8 54 60 41 EA */ rlwinm r0, r3, 8, 7, 0x15 -/* 803732BC 64 00 A0 00 */ oris r0, r0, 0xa000 -/* 803732C0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 803732C4 BF 41 00 28 */ stmw r26, 0x28(r1) -/* 803732C8 3F A0 CC 00 */ lis r29, 0xCC00 /* 0xCC006800@ha */ -/* 803732CC 3B C5 00 00 */ addi r30, r5, 0 -/* 803732D0 3B 44 00 00 */ addi r26, r4, 0 -/* 803732D4 3B FD 68 00 */ addi r31, r29, 0x6800 /* 0xCC006800@l */ -/* 803732D8 38 61 00 24 */ addi r3, r1, 0x24 -/* 803732DC 38 80 00 04 */ li r4, 4 -/* 803732E0 38 A0 00 01 */ li r5, 1 -/* 803732E4 80 DD 68 28 */ lwz r6, 0x6828(r29) -/* 803732E8 70 C6 04 05 */ andi. r6, r6, 0x405 -/* 803732EC 60 C6 00 C0 */ ori r6, r6, 0xc0 -/* 803732F0 94 DF 00 28 */ stwu r6, 0x28(r31) -/* 803732F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 803732F8 48 00 02 1D */ bl DBGEXIImm -/* 803732FC 7C 60 00 34 */ cntlzw r0, r3 -/* 80373300 54 00 D9 7E */ srwi r0, r0, 5 -/* 80373304 7C 1B 03 78 */ mr r27, r0 -lbl_80373308: -/* 80373308 3B 9D 68 00 */ addi r28, r29, 0x6800 -/* 8037330C 84 1C 00 34 */ lwzu r0, 0x34(r28) -/* 80373310 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80373314 40 82 FF F4 */ bne lbl_80373308 -/* 80373318 48 00 00 44 */ b lbl_8037335C -lbl_8037331C: -/* 8037331C 80 1A 00 00 */ lwz r0, 0(r26) -/* 80373320 38 61 00 20 */ addi r3, r1, 0x20 -/* 80373324 38 80 00 04 */ li r4, 4 -/* 80373328 90 01 00 20 */ stw r0, 0x20(r1) -/* 8037332C 38 A0 00 01 */ li r5, 1 -/* 80373330 3B 5A 00 04 */ addi r26, r26, 4 -/* 80373334 48 00 01 E1 */ bl DBGEXIImm -/* 80373338 7C 60 00 34 */ cntlzw r0, r3 -/* 8037333C 54 00 D9 7E */ srwi r0, r0, 5 -/* 80373340 7F 7B 03 78 */ or r27, r27, r0 -lbl_80373344: -/* 80373344 80 1C 00 00 */ lwz r0, 0(r28) -/* 80373348 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8037334C 40 82 FF F8 */ bne lbl_80373344 -/* 80373350 37 DE FF FC */ addic. r30, r30, -4 -/* 80373354 40 80 00 08 */ bge lbl_8037335C -/* 80373358 3B C0 00 00 */ li r30, 0 -lbl_8037335C: -/* 8037335C 2C 1E 00 00 */ cmpwi r30, 0 -/* 80373360 40 82 FF BC */ bne lbl_8037331C -/* 80373364 80 9F 00 00 */ lwz r4, 0(r31) -/* 80373368 7F 60 00 34 */ cntlzw r0, r27 -/* 8037336C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80373370 70 80 04 05 */ andi. r0, r4, 0x405 -/* 80373374 90 1F 00 00 */ stw r0, 0(r31) -/* 80373378 BB 41 00 28 */ lmw r26, 0x28(r1) -/* 8037337C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80373380 38 21 00 40 */ addi r1, r1, 0x40 -/* 80373384 7C 08 03 A6 */ mtlr r0 -/* 80373388 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s deleted file mode 100644 index 9c85cdc73f8..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80373110: -/* 80373110 7C 08 02 A6 */ mflr r0 -/* 80373114 90 01 00 04 */ stw r0, 4(r1) -/* 80373118 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8037311C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80373120 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80373124 3B C4 00 00 */ addi r30, r4, 0 -/* 80373128 93 A1 00 14 */ stw r29, 0x14(r1) -/* 8037312C 3B A3 00 00 */ addi r29, r3, 0 -/* 80373130 4B FC A5 C5 */ bl OSDisableInterrupts -/* 80373134 38 0D 94 64 */ la r0, data_804519E4(r13) /* 804519E4-_SDA_BASE_ */ -/* 80373138 90 0D 94 60 */ stw r0, pEXIInputFlag(r13) -/* 8037313C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00018000@ha */ -/* 80373140 3B E3 00 00 */ addi r31, r3, 0 -/* 80373144 80 0D 94 60 */ lwz r0, pEXIInputFlag(r13) -/* 80373148 38 64 80 00 */ addi r3, r4, 0x8000 /* 0x00018000@l */ -/* 8037314C 90 1D 00 00 */ stw r0, 0(r29) -/* 80373150 93 CD 94 50 */ stw r30, MTRCallback(r13) -/* 80373154 4B FC A9 69 */ bl __OSMaskInterrupts -/* 80373158 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006828@ha */ -/* 8037315C 38 00 00 00 */ li r0, 0 -/* 80373160 90 03 68 28 */ stw r0, 0x6828(r3) /* 0xCC006828@l */ -/* 80373164 7F E3 FB 78 */ mr r3, r31 -/* 80373168 4B FC A5 B5 */ bl OSRestoreInterrupts -/* 8037316C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80373170 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80373174 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80373178 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 8037317C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80373180 7C 08 03 A6 */ mtlr r0 -/* 80373184 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s deleted file mode 100644 index 20a12a86687..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_803730BC: -/* 803730BC 7C 08 02 A6 */ mflr r0 -/* 803730C0 3C 60 00 02 */ lis r3, 0x0002 /* 0x00018000@ha */ -/* 803730C4 90 01 00 04 */ stw r0, 4(r1) -/* 803730C8 38 63 80 00 */ addi r3, r3, 0x8000 /* 0x00018000@l */ -/* 803730CC 94 21 FF F8 */ stwu r1, -8(r1) -/* 803730D0 4B FC A9 ED */ bl __OSMaskInterrupts -/* 803730D4 38 60 00 40 */ li r3, 0x40 -/* 803730D8 4B FC A9 E5 */ bl __OSMaskInterrupts -/* 803730DC 3C 60 80 37 */ lis r3, MWCallback@ha /* 0x803731C8@ha */ -/* 803730E0 38 03 31 C8 */ addi r0, r3, MWCallback@l /* 0x803731C8@l */ -/* 803730E4 3C 60 80 37 */ lis r3, DBGHandler@ha /* 0x80373188@ha */ -/* 803730E8 90 0D 94 54 */ stw r0, DBGCallback(r13) -/* 803730EC 38 83 31 88 */ addi r4, r3, DBGHandler@l /* 0x80373188@l */ -/* 803730F0 38 60 00 19 */ li r3, 0x19 -/* 803730F4 4B FC A6 4D */ bl __OSSetInterruptHandler -/* 803730F8 38 60 00 40 */ li r3, 0x40 -/* 803730FC 4B FC AA 49 */ bl __OSUnmaskInterrupts -/* 80373100 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80373104 38 21 00 08 */ addi r1, r1, 8 -/* 80373108 7C 08 03 A6 */ mtlr r0 -/* 8037310C 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s deleted file mode 100644 index 333f0d6a59d..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80373020: -/* 80373020 7C 08 02 A6 */ mflr r0 -/* 80373024 38 60 00 00 */ li r3, 0 -/* 80373028 90 01 00 04 */ stw r0, 4(r1) -/* 8037302C 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80373030 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80373034 80 0D 94 5C */ lwz r0, RecvDataLeng(r13) -/* 80373038 98 6D 94 64 */ stb r3, data_804519E4(r13) -/* 8037303C 2C 00 00 00 */ cmpwi r0, 0 -/* 80373040 40 82 00 64 */ bne lbl_803730A4 -/* 80373044 4B FC A6 B1 */ bl OSDisableInterrupts -/* 80373048 3B E3 00 00 */ addi r31, r3, 0 -/* 8037304C 38 61 00 08 */ addi r3, r1, 8 -/* 80373050 48 00 01 B5 */ bl DBGReadStatus -/* 80373054 80 01 00 08 */ lwz r0, 8(r1) -/* 80373058 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8037305C 41 82 00 40 */ beq lbl_8037309C -/* 80373060 38 61 00 08 */ addi r3, r1, 8 -/* 80373064 48 00 04 05 */ bl DBGReadMailbox -/* 80373068 80 01 00 08 */ lwz r0, 8(r1) -/* 8037306C 54 00 00 FE */ clrlwi r0, r0, 3 -/* 80373070 90 01 00 08 */ stw r0, 8(r1) -/* 80373074 80 81 00 08 */ lwz r4, 8(r1) -/* 80373078 54 83 00 CE */ rlwinm r3, r4, 0, 3, 7 -/* 8037307C 3C 03 E1 00 */ addis r0, r3, 0xe100 -/* 80373080 28 00 00 00 */ cmplwi r0, 0 -/* 80373084 40 82 00 18 */ bne lbl_8037309C -/* 80373088 54 83 04 7E */ clrlwi r3, r4, 0x11 -/* 8037308C 90 8D 94 58 */ stw r4, SendMailData(r13) -/* 80373090 38 00 00 01 */ li r0, 1 -/* 80373094 90 6D 94 5C */ stw r3, RecvDataLeng(r13) -/* 80373098 98 0D 94 64 */ stb r0, data_804519E4(r13) -lbl_8037309C: -/* 8037309C 7F E3 FB 78 */ mr r3, r31 -/* 803730A0 4B FC A6 7D */ bl OSRestoreInterrupts -lbl_803730A4: -/* 803730A4 80 6D 94 5C */ lwz r3, RecvDataLeng(r13) -/* 803730A8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803730AC 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 803730B0 38 21 00 18 */ addi r1, r1, 0x18 -/* 803730B4 7C 08 03 A6 */ mtlr r0 -/* 803730B8 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s deleted file mode 100644 index 2827f4f1623..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80372F94: -/* 80372F94 7C 08 02 A6 */ mflr r0 -/* 80372F98 90 01 00 04 */ stw r0, 4(r1) -/* 80372F9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80372FA0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80372FA4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80372FA8 3B C4 00 00 */ addi r30, r4, 0 -/* 80372FAC 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80372FB0 3B A3 00 00 */ addi r29, r3, 0 -/* 80372FB4 4B FC A7 41 */ bl OSDisableInterrupts -/* 80372FB8 80 0D 94 58 */ lwz r0, SendMailData(r13) -/* 80372FBC 3B E3 00 00 */ addi r31, r3, 0 -/* 80372FC0 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 80372FC4 41 82 00 0C */ beq lbl_80372FD0 -/* 80372FC8 38 60 10 00 */ li r3, 0x1000 -/* 80372FCC 48 00 00 08 */ b lbl_80372FD4 -lbl_80372FD0: -/* 80372FD0 38 60 00 00 */ li r3, 0 -lbl_80372FD4: -/* 80372FD4 3C 63 00 02 */ addis r3, r3, 2 -/* 80372FD8 38 1E 00 03 */ addi r0, r30, 3 -/* 80372FDC 38 9D 00 00 */ addi r4, r29, 0 -/* 80372FE0 54 05 00 3A */ rlwinm r5, r0, 0, 0, 0x1d -/* 80372FE4 38 63 E0 00 */ addi r3, r3, -8192 -/* 80372FE8 48 00 03 A5 */ bl DBGRead -/* 80372FEC 38 00 00 00 */ li r0, 0 -/* 80372FF0 90 0D 94 5C */ stw r0, RecvDataLeng(r13) -/* 80372FF4 7F E3 FB 78 */ mr r3, r31 -/* 80372FF8 98 0D 94 64 */ stb r0, data_804519E4(r13) -/* 80372FFC 4B FC A7 21 */ bl OSRestoreInterrupts -/* 80373000 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80373004 38 60 00 00 */ li r3, 0 -/* 80373008 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8037300C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80373010 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80373014 38 21 00 20 */ addi r1, r1, 0x20 -/* 80373018 7C 08 03 A6 */ mtlr r0 -/* 8037301C 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s deleted file mode 100644 index 9c818badeba..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_80372D34: -/* 80372D34 7C 08 02 A6 */ mflr r0 -/* 80372D38 90 01 00 04 */ stw r0, 4(r1) -/* 80372D3C 94 21 FF 88 */ stwu r1, -0x78(r1) -/* 80372D40 BF 01 00 58 */ stmw r24, 0x58(r1) -/* 80372D44 3B 43 00 00 */ addi r26, r3, 0 -/* 80372D48 3B 64 00 00 */ addi r27, r4, 0 -/* 80372D4C 4B FC A9 A9 */ bl OSDisableInterrupts -/* 80372D50 3B 83 00 00 */ addi r28, r3, 0 -/* 80372D54 3F 20 CC 00 */ lis r25, 0xCC00 /* 0xCC006828@ha */ -/* 80372D58 3F E0 40 00 */ lis r31, 0x4000 -lbl_80372D5C: -/* 80372D5C 80 19 68 28 */ lwz r0, 0x6828(r25) /* 0xCC006828@l */ -/* 80372D60 3B D9 68 00 */ addi r30, r25, 0x6800 -/* 80372D64 38 61 00 50 */ addi r3, r1, 0x50 -/* 80372D68 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372D6C 38 80 00 02 */ li r4, 2 -/* 80372D70 38 A0 00 01 */ li r5, 1 -/* 80372D74 60 00 00 C0 */ ori r0, r0, 0xc0 -/* 80372D78 94 1E 00 28 */ stwu r0, 0x28(r30) -/* 80372D7C 93 E1 00 50 */ stw r31, 0x50(r1) -/* 80372D80 48 00 07 95 */ bl DBGEXIImm -/* 80372D84 7C 60 00 34 */ cntlzw r0, r3 -/* 80372D88 54 18 D9 7E */ srwi r24, r0, 5 -lbl_80372D8C: -/* 80372D8C 3B B9 68 00 */ addi r29, r25, 0x6800 -/* 80372D90 84 1D 00 34 */ lwzu r0, 0x34(r29) -/* 80372D94 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372D98 40 82 FF F4 */ bne lbl_80372D8C -/* 80372D9C 38 61 00 54 */ addi r3, r1, 0x54 -/* 80372DA0 38 80 00 04 */ li r4, 4 -/* 80372DA4 38 A0 00 00 */ li r5, 0 -/* 80372DA8 48 00 07 6D */ bl DBGEXIImm -lbl_80372DAC: -/* 80372DAC 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372DB0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372DB4 40 82 FF F8 */ bne lbl_80372DAC -/* 80372DB8 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372DBC 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372DC0 90 1E 00 00 */ stw r0, 0(r30) -/* 80372DC4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80372DC8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80372DCC 40 82 FF 90 */ bne lbl_80372D5C -/* 80372DD0 88 6D 85 70 */ lbz r3, data_80450AF0(r13) -/* 80372DD4 38 03 00 01 */ addi r0, r3, 1 -/* 80372DD8 98 0D 85 70 */ stb r0, data_80450AF0(r13) -/* 80372DDC 88 0D 85 70 */ lbz r0, data_80450AF0(r13) -/* 80372DE0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372DE4 41 82 00 0C */ beq lbl_80372DF0 -/* 80372DE8 38 60 10 00 */ li r3, 0x1000 -/* 80372DEC 48 00 00 08 */ b lbl_80372DF4 -lbl_80372DF0: -/* 80372DF0 38 60 00 00 */ li r3, 0 -lbl_80372DF4: -/* 80372DF4 38 1B 00 03 */ addi r0, r27, 3 -/* 80372DF8 64 79 00 01 */ oris r25, r3, 1 -/* 80372DFC 54 18 00 3A */ rlwinm r24, r0, 0, 0, 0x1d -/* 80372E00 63 39 C0 00 */ ori r25, r25, 0xc000 -lbl_80372E04: -/* 80372E04 38 79 00 00 */ addi r3, r25, 0 -/* 80372E08 38 9A 00 00 */ addi r4, r26, 0 -/* 80372E0C 38 B8 00 00 */ addi r5, r24, 0 -/* 80372E10 48 00 04 A1 */ bl DBGWrite -/* 80372E14 2C 03 00 00 */ cmpwi r3, 0 -/* 80372E18 41 82 FF EC */ beq lbl_80372E04 -/* 80372E1C 3F E0 40 00 */ lis r31, 0x4000 -lbl_80372E20: -/* 80372E20 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372E24 38 61 00 4C */ addi r3, r1, 0x4c -/* 80372E28 38 80 00 02 */ li r4, 2 -/* 80372E2C 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372E30 38 A0 00 01 */ li r5, 1 -/* 80372E34 60 00 00 C0 */ ori r0, r0, 0xc0 -/* 80372E38 90 1E 00 00 */ stw r0, 0(r30) -/* 80372E3C 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80372E40 48 00 06 D5 */ bl DBGEXIImm -/* 80372E44 7C 60 00 34 */ cntlzw r0, r3 -/* 80372E48 54 1A D9 7E */ srwi r26, r0, 5 -lbl_80372E4C: -/* 80372E4C 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372E50 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372E54 40 82 FF F8 */ bne lbl_80372E4C -/* 80372E58 38 61 00 54 */ addi r3, r1, 0x54 -/* 80372E5C 38 80 00 04 */ li r4, 4 -/* 80372E60 38 A0 00 00 */ li r5, 0 -/* 80372E64 48 00 06 B1 */ bl DBGEXIImm -lbl_80372E68: -/* 80372E68 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372E6C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372E70 40 82 FF F8 */ bne lbl_80372E68 -/* 80372E74 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372E78 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372E7C 90 1E 00 00 */ stw r0, 0(r30) -/* 80372E80 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80372E84 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80372E88 40 82 FF 98 */ bne lbl_80372E20 -/* 80372E8C 88 0D 85 70 */ lbz r0, data_80450AF0(r13) -/* 80372E90 54 00 80 1E */ slwi r0, r0, 0x10 -/* 80372E94 64 00 1F 00 */ oris r0, r0, 0x1f00 -/* 80372E98 7C 00 DB 78 */ or r0, r0, r27 -/* 80372E9C 54 00 00 FE */ clrlwi r0, r0, 3 -/* 80372EA0 64 18 C0 00 */ oris r24, r0, 0xc000 -lbl_80372EA4: -/* 80372EA4 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372EA8 38 61 00 44 */ addi r3, r1, 0x44 -/* 80372EAC 38 80 00 04 */ li r4, 4 -/* 80372EB0 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372EB4 38 A0 00 01 */ li r5, 1 -/* 80372EB8 60 00 00 C0 */ ori r0, r0, 0xc0 -/* 80372EBC 90 1E 00 00 */ stw r0, 0(r30) -/* 80372EC0 93 01 00 44 */ stw r24, 0x44(r1) -/* 80372EC4 48 00 06 51 */ bl DBGEXIImm -/* 80372EC8 7C 60 00 34 */ cntlzw r0, r3 -/* 80372ECC 54 03 D9 7E */ srwi r3, r0, 5 -lbl_80372ED0: -/* 80372ED0 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372ED4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372ED8 40 82 FF F8 */ bne lbl_80372ED0 -/* 80372EDC 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372EE0 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372EE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80372EE8 90 1E 00 00 */ stw r0, 0(r30) -/* 80372EEC 40 82 FF B8 */ bne lbl_80372EA4 -/* 80372EF0 3F 60 40 00 */ lis r27, 0x4000 -lbl_80372EF4: -/* 80372EF4 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372EF8 38 61 00 3C */ addi r3, r1, 0x3c -/* 80372EFC 38 80 00 02 */ li r4, 2 -/* 80372F00 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372F04 38 A0 00 01 */ li r5, 1 -/* 80372F08 60 00 00 C0 */ ori r0, r0, 0xc0 -/* 80372F0C 90 1E 00 00 */ stw r0, 0(r30) -/* 80372F10 93 61 00 3C */ stw r27, 0x3c(r1) -/* 80372F14 48 00 06 01 */ bl DBGEXIImm -/* 80372F18 7C 60 00 34 */ cntlzw r0, r3 -/* 80372F1C 54 1A D9 7E */ srwi r26, r0, 5 -lbl_80372F20: -/* 80372F20 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372F24 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372F28 40 82 FF F8 */ bne lbl_80372F20 -/* 80372F2C 38 61 00 54 */ addi r3, r1, 0x54 -/* 80372F30 38 80 00 04 */ li r4, 4 -/* 80372F34 38 A0 00 00 */ li r5, 0 -/* 80372F38 48 00 05 DD */ bl DBGEXIImm -/* 80372F3C 7C 60 00 34 */ cntlzw r0, r3 -/* 80372F40 54 00 D9 7E */ srwi r0, r0, 5 -/* 80372F44 7F 43 03 78 */ or r3, r26, r0 -lbl_80372F48: -/* 80372F48 80 1D 00 00 */ lwz r0, 0(r29) -/* 80372F4C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80372F50 40 82 FF F8 */ bne lbl_80372F48 -/* 80372F54 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372F58 70 00 04 05 */ andi. r0, r0, 0x405 -/* 80372F5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80372F60 90 1E 00 00 */ stw r0, 0(r30) -/* 80372F64 40 82 FF 90 */ bne lbl_80372EF4 -/* 80372F68 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80372F6C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80372F70 40 82 FF 84 */ bne lbl_80372EF4 -/* 80372F74 7F 83 E3 78 */ mr r3, r28 -/* 80372F78 4B FC A7 A5 */ bl OSRestoreInterrupts -/* 80372F7C BB 01 00 58 */ lmw r24, 0x58(r1) -/* 80372F80 38 60 00 00 */ li r3, 0 -/* 80372F84 80 01 00 7C */ lwz r0, 0x7c(r1) -/* 80372F88 38 21 00 78 */ addi r1, r1, 0x78 -/* 80372F8C 7C 08 03 A6 */ mtlr r0 -/* 80372F90 4E 80 00 20 */ blr diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s b/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s deleted file mode 100644 index fb387560fd0..00000000000 --- a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_803731C8: -/* 803731C8 7C 08 02 A6 */ mflr r0 -/* 803731CC 90 01 00 04 */ stw r0, 4(r1) -/* 803731D0 38 00 00 01 */ li r0, 1 -/* 803731D4 94 21 FF F8 */ stwu r1, -8(r1) -/* 803731D8 81 8D 94 50 */ lwz r12, MTRCallback(r13) -/* 803731DC 98 0D 94 64 */ stb r0, data_804519E4(r13) -/* 803731E0 28 0C 00 00 */ cmplwi r12, 0 -/* 803731E4 41 82 00 10 */ beq lbl_803731F4 -/* 803731E8 7D 88 03 A6 */ mtlr r12 -/* 803731EC 38 60 00 00 */ li r3, 0 -/* 803731F0 4E 80 00 21 */ blrl -lbl_803731F4: -/* 803731F4 80 01 00 0C */ lwz r0, 0xc(r1) -/* 803731F8 38 21 00 08 */ addi r1, r1, 8 -/* 803731FC 7C 08 03 A6 */ mtlr r0 -/* 80373200 4E 80 00 20 */ blr diff --git a/defs/module0.py b/defs/module0.py index 0856c6e23d5..8672821d278 100644 --- a/defs/module0.py +++ b/defs/module0.py @@ -45,7 +45,7 @@ LIBRARIES = [ "dolphin/card", "dolphin/gx", "dolphin/gd", - "MSL_C.PPCEABI.bare.H", + "msl_c", "TRK_MINNOW_DOLPHIN", "amcstubs", "odemuexi2", @@ -679,7 +679,7 @@ TRANSLATION_UNITS = [ "MSL_Common/Src/arith", "MSL_Common/Src/buffer_io", "MSL_Common/Src/char_io", - "PPC_EABI/SRC/critical_regions.gamecube", + "PPC_EABI/Src/critical_regions.gamecube", "MSL_Common/Src/ctype", "MSL_Common/Src/direct_io", "MSL_Common/Src/file_io", @@ -695,7 +695,7 @@ TRANSLATION_UNITS = [ "MSL_Common/Src/string", "MSL_Common/Src/strtoul", "MSL_Common/Src/wchar_io", - "PPC_EABI/SRC/uart_console_io_gcn", + "PPC_EABI/Src/uart_console_io_gcn", "Math/Double_precision/e_acos", "Math/Double_precision/e_asin", "Math/Double_precision/e_atan2", @@ -724,7 +724,7 @@ TRANSLATION_UNITS = [ "Math/Double_precision/w_fmod", "Math/Double_precision/w_pow", "Math/Double_precision/e_sqrt", - "PPC_EABI/SRC/math_ppc", + "PPC_EABI/Src/math_ppc", "Math/Double_precision/w_sqrt", "MSL_Common/Src/extras", "MetroTRK/Portable/mainloop", diff --git a/docs/re_notes.md b/docs/re_notes.md index ee98567624f..fee297028f0 100644 --- a/docs/re_notes.md +++ b/docs/re_notes.md @@ -139,8 +139,8 @@ J2DTevBlock4 | 180 J2DTevBlock8 | 292 J2DTevBlock16 | 436 J2DTexMtx | 84 -J2DTextbox | 312 -J2DTextboxEx | 328 +J2DTextBox | 312 +J2DTextBoxEx | 328 J2DWindow | 328 J2DWindowEx | 384 J3DAnmClusterFull | 20 diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 7d92ef4caea..4ce1e6acc02 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -3,7 +3,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JUtility/TColor.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "dolphin/types.h" class J2DPrint { diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index fcf49010769..31de42a1241 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index 93aba8f392f..b93b0c32655 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -3,8 +3,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JUtility/TColor.h" -#include "SSystem/SComponent/c_Xyz.h" -#include "SSystem/SComponent/c_sXyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "SSystem/SComponent/c_sxyz.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 3ae2dacf007..c477b4c9cbb 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_OBJECT_H #define D_MSG_D_MSG_OBJECT_H -#include "JSystem/J2DGraph/J2DTextbox.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JMessage/control.h" #include "JSystem/JMessage/processor.h" #include "JSystem/JMessage/resource.h" diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 5079ab86ccd..9c44102538b 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1,8 +1,8 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/string.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/include/init.h b/include/init.h index bfe78198e7c..a112dfdc598 100644 --- a/include/init.h +++ b/include/init.h @@ -1,7 +1,7 @@ #ifndef INIT_H #define INIT_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dolphin/types.h" #endif /* INIT_H */ diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index 85c75aea138..728a7463563 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,8 +1,8 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/char_io.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" #include "m_Do/m_Do_main.h" diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h b/include/msl_c/MSL_Common/Src/FILE_POS.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h rename to include/msl_c/MSL_Common/Src/FILE_POS.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h b/include/msl_c/MSL_Common/Src/abort_exit.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h rename to include/msl_c/MSL_Common/Src/abort_exit.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h b/include/msl_c/MSL_Common/Src/alloc.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h rename to include/msl_c/MSL_Common/Src/alloc.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h b/include/msl_c/MSL_Common/Src/ansi_files.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h rename to include/msl_c/MSL_Common/Src/ansi_files.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h b/include/msl_c/MSL_Common/Src/arith.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h rename to include/msl_c/MSL_Common/Src/arith.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h b/include/msl_c/MSL_Common/Src/buffer_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h rename to include/msl_c/MSL_Common/Src/buffer_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h b/include/msl_c/MSL_Common/Src/char_io.h similarity index 74% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h rename to include/msl_c/MSL_Common/Src/char_io.h index e874b625ba6..49a65ef8e2a 100644 --- a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h +++ b/include/msl_c/MSL_Common/Src/char_io.h @@ -1,7 +1,7 @@ #ifndef MSL_COMMON_SRC_CHAR_IO_H #define MSL_COMMON_SRC_CHAR_IO_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h" +#include "msl_c/MSL_Common/Src/ansi_files.h" #include "dolphin/types.h" extern "C" int fputs(const char*, FILE*); diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h b/include/msl_c/MSL_Common/Src/ctype.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h rename to include/msl_c/MSL_Common/Src/ctype.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h b/include/msl_c/MSL_Common/Src/direct_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h rename to include/msl_c/MSL_Common/Src/direct_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h b/include/msl_c/MSL_Common/Src/errno.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h rename to include/msl_c/MSL_Common/Src/errno.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h b/include/msl_c/MSL_Common/Src/extras.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h rename to include/msl_c/MSL_Common/Src/extras.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h b/include/msl_c/MSL_Common/Src/file_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h rename to include/msl_c/MSL_Common/Src/file_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h b/include/msl_c/MSL_Common/Src/float.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h rename to include/msl_c/MSL_Common/Src/float.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h b/include/msl_c/MSL_Common/Src/mbstring.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h rename to include/msl_c/MSL_Common/Src/mbstring.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h b/include/msl_c/MSL_Common/Src/mem.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h rename to include/msl_c/MSL_Common/Src/mem.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h b/include/msl_c/MSL_Common/Src/mem_funcs.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h rename to include/msl_c/MSL_Common/Src/mem_funcs.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h b/include/msl_c/MSL_Common/Src/misc_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h rename to include/msl_c/MSL_Common/Src/misc_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h b/include/msl_c/MSL_Common/Src/printf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h rename to include/msl_c/MSL_Common/Src/printf.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h b/include/msl_c/MSL_Common/Src/scanf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h rename to include/msl_c/MSL_Common/Src/scanf.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h b/include/msl_c/MSL_Common/Src/signal.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h rename to include/msl_c/MSL_Common/Src/signal.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h b/include/msl_c/MSL_Common/Src/string.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h rename to include/msl_c/MSL_Common/Src/string.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h b/include/msl_c/MSL_Common/Src/strtoul.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h rename to include/msl_c/MSL_Common/Src/strtoul.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h b/include/msl_c/MSL_Common/Src/wchar_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h rename to include/msl_c/MSL_Common/Src/wchar_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h b/include/msl_c/MSL_Common_Embedded/Src/ansi_fp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h rename to include/msl_c/MSL_Common_Embedded/Src/ansi_fp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h b/include/msl_c/Math/Double_precision/e_acos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h rename to include/msl_c/Math/Double_precision/e_acos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h b/include/msl_c/Math/Double_precision/e_asin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h rename to include/msl_c/Math/Double_precision/e_asin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h b/include/msl_c/Math/Double_precision/e_atan2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h rename to include/msl_c/Math/Double_precision/e_atan2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h b/include/msl_c/Math/Double_precision/e_exp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h rename to include/msl_c/Math/Double_precision/e_exp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h b/include/msl_c/Math/Double_precision/e_fmod.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h rename to include/msl_c/Math/Double_precision/e_fmod.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h b/include/msl_c/Math/Double_precision/e_pow.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h rename to include/msl_c/Math/Double_precision/e_pow.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h b/include/msl_c/Math/Double_precision/e_rem_pio2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h rename to include/msl_c/Math/Double_precision/e_rem_pio2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h b/include/msl_c/Math/Double_precision/e_sqrt.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h rename to include/msl_c/Math/Double_precision/e_sqrt.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h b/include/msl_c/Math/Double_precision/k_cos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h rename to include/msl_c/Math/Double_precision/k_cos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h b/include/msl_c/Math/Double_precision/k_rem_pio2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h rename to include/msl_c/Math/Double_precision/k_rem_pio2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h b/include/msl_c/Math/Double_precision/k_sin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h rename to include/msl_c/Math/Double_precision/k_sin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h b/include/msl_c/Math/Double_precision/k_tan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h rename to include/msl_c/Math/Double_precision/k_tan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h b/include/msl_c/Math/Double_precision/s_atan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h rename to include/msl_c/Math/Double_precision/s_atan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h b/include/msl_c/Math/Double_precision/s_ceil.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h rename to include/msl_c/Math/Double_precision/s_ceil.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h b/include/msl_c/Math/Double_precision/s_copysign.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h rename to include/msl_c/Math/Double_precision/s_copysign.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h b/include/msl_c/Math/Double_precision/s_cos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h rename to include/msl_c/Math/Double_precision/s_cos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h b/include/msl_c/Math/Double_precision/s_floor.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h rename to include/msl_c/Math/Double_precision/s_floor.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h b/include/msl_c/Math/Double_precision/s_frexp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h rename to include/msl_c/Math/Double_precision/s_frexp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h b/include/msl_c/Math/Double_precision/s_ldexp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h rename to include/msl_c/Math/Double_precision/s_ldexp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h b/include/msl_c/Math/Double_precision/s_modf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h rename to include/msl_c/Math/Double_precision/s_modf.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h b/include/msl_c/Math/Double_precision/s_sin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h rename to include/msl_c/Math/Double_precision/s_sin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h b/include/msl_c/Math/Double_precision/s_tan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h rename to include/msl_c/Math/Double_precision/s_tan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h b/include/msl_c/Math/Double_precision/w_acos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h rename to include/msl_c/Math/Double_precision/w_acos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h b/include/msl_c/Math/Double_precision/w_asin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h rename to include/msl_c/Math/Double_precision/w_asin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h b/include/msl_c/Math/Double_precision/w_atan2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h rename to include/msl_c/Math/Double_precision/w_atan2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h b/include/msl_c/Math/Double_precision/w_exp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h rename to include/msl_c/Math/Double_precision/w_exp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h b/include/msl_c/Math/Double_precision/w_fmod.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h rename to include/msl_c/Math/Double_precision/w_fmod.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h b/include/msl_c/Math/Double_precision/w_pow.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h rename to include/msl_c/Math/Double_precision/w_pow.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h b/include/msl_c/Math/Double_precision/w_sqrt.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h rename to include/msl_c/Math/Double_precision/w_sqrt.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h b/include/msl_c/PPC_EABI/Src/critical_regions.gamecube.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h rename to include/msl_c/PPC_EABI/Src/critical_regions.gamecube.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h b/include/msl_c/PPC_EABI/Src/math_ppc.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h rename to include/msl_c/PPC_EABI/Src/math_ppc.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h b/include/msl_c/PPC_EABI/Src/uart_console_io_gcn.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h rename to include/msl_c/PPC_EABI/Src/uart_console_io_gcn.h diff --git a/include/msl_c/math.h b/include/msl_c/math.h index 844a5142514..991b8c6ce05 100644 --- a/include/msl_c/math.h +++ b/include/msl_c/math.h @@ -1,7 +1,7 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" +#include "msl_c/MSL_Common/Src/float.h" #include "dolphin/types.h" extern "C" { diff --git a/include/msl_c/string.h b/include/msl_c/string.h index 902f205f09f..ba74386deb9 100644 --- a/include/msl_c/string.h +++ b/include/msl_c/string.h @@ -4,7 +4,7 @@ #include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" -// TODO: move to MSL_C.PPCEABI.bare.H/ +// TODO: move to msl_c/ extern "C" { void memcpy(void*, const void*, s32); void* memset(void* dest, int ch, u32 count); diff --git a/include/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h b/include/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h deleted file mode 100644 index c7507eae688..00000000000 --- a/include/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef SRC_ODEMUEXI2LIB_DEBUGGERDRIVER_H -#define SRC_ODEMUEXI2LIB_DEBUGGERDRIVER_H - -#include "dolphin/types.h" - -#endif /* SRC_ODEMUEXI2LIB_DEBUGGERDRIVER_H */ diff --git a/include_link.mk b/include_link.mk index a5913519c0f..9aec6f6c311 100644 --- a/include_link.mk +++ b/include_link.mk @@ -42,7 +42,7 @@ -include libs/dolphin/gx/Makefile -include libs/dolphin/gd/Makefile -include libs/Runtime.PPCEABI.H/Makefile --include libs/MSL_C.PPCEABI.bare.H/Makefile +-include libs/msl_c/Makefile -include libs/TRK_MINNOW_DOLPHIN/Makefile -include libs/amcstubs/Makefile -include libs/odemuexi2/Makefile diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index acedc704a86..a208041afea 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J2DGraph/J2DManage.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 1ae9a766259..d8c24201fcc 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index ba67438d035..1f30bda3b81 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -11,7 +11,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DVertex.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" #include "dolphin/os/OSCache.h" diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp index da1f624a6c3..befab13ce84 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "dol2asm.h" -#include "dolphin/gx/gx.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index a6310e69a16..c3ede07a941 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRDvdAramRipper.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRFile.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp index d213d3b3fec..e8e8a84139f 100644 --- a/libs/JSystem/JKernel/JKRArchivePri.cpp +++ b/libs/JSystem/JKernel/JKRArchivePri.cpp @@ -5,8 +5,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/ctype.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/ctype.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index c8549929780..36cfada15a1 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -7,8 +7,8 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRFileFinder.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/ctype.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/ctype.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index db9e0b531af..48af1740c0a 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JKernel/JKRFileLoader.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "global.h" @@ -193,10 +193,10 @@ SECTION_SDATA static u8 rootPath[2 + 6 /* padding */] = { // matches, but lbl_804508C0 is accessed through r13 #ifdef NONMATCHING const char* JKRFileLoader::fetchVolumeName(char* buffer, long bufferSize, const char* path) { - // lbl_803D2D18 = MSL_C.PPCEABI.bare.H::__lower_map + // lbl_803D2D18 = msl_c::__lower_map // lbl_8039D150 = JKernel::@stringBase0 "/" // lbl_804508C0 = JKernel::rootPath$2498 "/" - // lbl_803D2D18 = MSL_C.PPCEABI.bare.H::__lower_map + // lbl_803D2D18 = msl_c::__lower_map if (strcmp(path, lbl_8039D150) == 0) { strcpy(buffer, lbl_804508C0); diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 7f5de050d32..56af486b09e 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index dcecd222cdd..78d5bd9d0e7 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp index d0daca474eb..830e3a44659 100644 --- a/libs/JSystem/JParticle/JPAResourceManager.cpp +++ b/libs/JSystem/JParticle/JPAResourceManager.cpp @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp index 2274e89366e..e9fd2f581f0 100644 --- a/libs/JSystem/JSupport/JSUMemoryStream.cpp +++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JSupport/JSUMemoryStream.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index 06dcb184d53..9a6ac9293c1 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index 1bea7c33c73..f9ce3f1811d 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -6,8 +6,8 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JUtility/JUTVideo.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 5c84f565d28..5c924d85e2b 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index e947e620ba0..67ed3a9ef94 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -6,8 +6,8 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/float.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp index 7ab0818cab3..a7db1187cf8 100644 --- a/libs/JSystem/JUtility/JUTNameTab.cpp +++ b/libs/JSystem/JUtility/JUTNameTab.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTNameTab.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/Makefile b/libs/MSL_C.PPCEABI.bare.H/Makefile deleted file mode 100644 index bd74e7615d5..00000000000 --- a/libs/MSL_C.PPCEABI.bare.H/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -# -# Generated By: dol2asm -# - -LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp \ - -LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.o \ - -LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ - -LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ - -nodefaults \ - -fp hard \ - -proc gekko \ - -linkmode moreram \ - -$(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) - @echo linking... $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a - @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - -$(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/%.o: libs/MSL_C.PPCEABI.bare.H/%.cpp - @mkdir -p $(@D) - @echo building... $< - @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $(basename $@).cpp - diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index 2bd9e0c918c..974fb6b6722 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_lib.h" #include "JSystem/JMath/JMath.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp b/libs/msl_c/MSL_Common/Src/FILE_POS.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp rename to libs/msl_c/MSL_Common/Src/FILE_POS.cpp index dc0ae3a2154..cf5253c81a0 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp +++ b/libs/msl_c/MSL_Common/Src/FILE_POS.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/FILE_POS // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h" +#include "msl_c/MSL_Common/Src/FILE_POS.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; #pragma optimizewithasm off asm void fseek() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s" +#include "asm/msl_c/MSL_Common/Src/FILE_POS/fseek.s" } #pragma pop @@ -44,7 +44,7 @@ asm void fseek() { #pragma optimizewithasm off static asm void _fseek() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s" +#include "asm/msl_c/MSL_Common/Src/FILE_POS/_fseek.s" } #pragma pop @@ -54,6 +54,6 @@ static asm void _fseek() { #pragma optimizewithasm off asm void ftell() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s" +#include "asm/msl_c/MSL_Common/Src/FILE_POS/ftell.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp b/libs/msl_c/MSL_Common/Src/abort_exit.cpp similarity index 90% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp rename to libs/msl_c/MSL_Common/Src/abort_exit.cpp index 9d0ea565af4..173e0c84c53 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp +++ b/libs/msl_c/MSL_Common/Src/abort_exit.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/abort_exit // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h" +#include "msl_c/MSL_Common/Src/abort_exit.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -54,7 +54,7 @@ static u8 __console_exit[4]; #pragma optimizewithasm off asm void exit() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s" +#include "asm/msl_c/MSL_Common/Src/abort_exit/exit.s" } #pragma pop @@ -64,7 +64,7 @@ asm void exit() { #pragma optimizewithasm off asm void abort() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s" +#include "asm/msl_c/MSL_Common/Src/abort_exit/abort.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp b/libs/msl_c/MSL_Common/Src/alloc.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp rename to libs/msl_c/MSL_Common/Src/alloc.cpp index f38ae99f3a1..bbbbb94834f 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp +++ b/libs/msl_c/MSL_Common/Src/alloc.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/alloc // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h" +#include "msl_c/MSL_Common/Src/alloc.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -40,7 +40,7 @@ static u8 protopool[56]; #pragma optimizewithasm off asm void free() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s" +#include "asm/msl_c/MSL_Common/Src/alloc/free.s" } #pragma pop @@ -50,7 +50,7 @@ asm void free() { #pragma optimizewithasm off asm void __pool_free() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s" +#include "asm/msl_c/MSL_Common/Src/alloc/__pool_free.s" } #pragma pop @@ -68,7 +68,7 @@ COMPILER_STRIP_GATE(0x803A2220, &fix_pool_sizes); #pragma optimizewithasm off static asm void deallocate_from_fixed_pools() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s" +#include "asm/msl_c/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s" } #pragma pop @@ -78,6 +78,6 @@ static asm void deallocate_from_fixed_pools() { #pragma optimizewithasm off static asm void deallocate_from_var_pools() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s" +#include "asm/msl_c/MSL_Common/Src/alloc/deallocate_from_var_pools.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp b/libs/msl_c/MSL_Common/Src/ansi_files.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp rename to libs/msl_c/MSL_Common/Src/ansi_files.cpp index 305d7d11bc9..20155dfbdb8 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp +++ b/libs/msl_c/MSL_Common/Src/ansi_files.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/ansi_files // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h" +#include "msl_c/MSL_Common/Src/ansi_files.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -127,7 +127,7 @@ static u8 stdin_buff[256]; #pragma optimizewithasm off asm void __flush_all() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s" +#include "asm/msl_c/MSL_Common/Src/ansi_files/__flush_all.s" } #pragma pop @@ -137,6 +137,6 @@ asm void __flush_all() { #pragma optimizewithasm off asm void __close_all() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s" +#include "asm/msl_c/MSL_Common/Src/ansi_files/__close_all.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp b/libs/msl_c/MSL_Common/Src/arith.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp rename to libs/msl_c/MSL_Common/Src/arith.cpp index 4a639118902..96af6b6382a 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp +++ b/libs/msl_c/MSL_Common/Src/arith.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/arith // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h" +#include "msl_c/MSL_Common/Src/arith.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -28,7 +28,7 @@ extern "C" void abs(); #pragma optimizewithasm off asm void div() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s" +#include "asm/msl_c/MSL_Common/Src/arith/div.s" } #pragma pop @@ -38,6 +38,6 @@ asm void div() { #pragma optimizewithasm off asm void abs() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s" +#include "asm/msl_c/MSL_Common/Src/arith/abs.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp b/libs/msl_c/MSL_Common/Src/buffer_io.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp rename to libs/msl_c/MSL_Common/Src/buffer_io.cpp index e386cffd171..fabaebfd7bf 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp +++ b/libs/msl_c/MSL_Common/Src/buffer_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/buffer_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h" +#include "msl_c/MSL_Common/Src/buffer_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -28,7 +28,7 @@ extern "C" void __prep_buffer(); #pragma optimizewithasm off asm void __flush_buffer() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s" +#include "asm/msl_c/MSL_Common/Src/buffer_io/__flush_buffer.s" } #pragma pop @@ -38,6 +38,6 @@ asm void __flush_buffer() { #pragma optimizewithasm off asm void __prep_buffer() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s" +#include "asm/msl_c/MSL_Common/Src/buffer_io/__prep_buffer.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp b/libs/msl_c/MSL_Common/Src/char_io.cpp similarity index 81% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp rename to libs/msl_c/MSL_Common/Src/char_io.cpp index 9cdd5b0a742..6ca26ec4a4c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp +++ b/libs/msl_c/MSL_Common/Src/char_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/char_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h" +#include "msl_c/MSL_Common/Src/char_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" void fwide(); #pragma optimizewithasm off asm int fputs(const char*, FILE*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s" +#include "asm/msl_c/MSL_Common/Src/char_io/fputs.s" } #pragma pop @@ -45,6 +45,6 @@ asm int fputs(const char*, FILE*) { #pragma optimizewithasm off asm void __put_char() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s" +#include "asm/msl_c/MSL_Common/Src/char_io/__put_char.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp b/libs/msl_c/MSL_Common/Src/ctype.cpp similarity index 97% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp rename to libs/msl_c/MSL_Common/Src/ctype.cpp index 3cb84bcfe81..c793b0fab4d 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp +++ b/libs/msl_c/MSL_Common/Src/ctype.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/ctype // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h" +#include "msl_c/MSL_Common/Src/ctype.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -68,7 +68,7 @@ SECTION_DATA extern u8 __lower_map[256] = { #pragma optimizewithasm off asm int tolower(int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s" +#include "asm/msl_c/MSL_Common/Src/ctype/tolower.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp b/libs/msl_c/MSL_Common/Src/direct_io.cpp similarity index 82% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp rename to libs/msl_c/MSL_Common/Src/direct_io.cpp index 1c8c0af11b4..98e5b6002be 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp +++ b/libs/msl_c/MSL_Common/Src/direct_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/direct_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h" +#include "msl_c/MSL_Common/Src/direct_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -38,7 +38,7 @@ extern "C" void fwide(); #pragma optimizewithasm off asm void __fwrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s" +#include "asm/msl_c/MSL_Common/Src/direct_io/__fwrite.s" } #pragma pop @@ -48,6 +48,6 @@ asm void __fwrite() { #pragma optimizewithasm off asm void fwrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s" +#include "asm/msl_c/MSL_Common/Src/direct_io/fwrite.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp b/libs/msl_c/MSL_Common/Src/errno.cpp similarity index 90% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp rename to libs/msl_c/MSL_Common/Src/errno.cpp index b5d1d0d58f5..97605419335 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp +++ b/libs/msl_c/MSL_Common/Src/errno.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/errno // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h" +#include "msl_c/MSL_Common/Src/errno.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp b/libs/msl_c/MSL_Common/Src/extras.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp rename to libs/msl_c/MSL_Common/Src/extras.cpp index b79d4dd7db5..4c21676e4ba 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp +++ b/libs/msl_c/MSL_Common/Src/extras.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/extras // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h" +#include "msl_c/MSL_Common/Src/extras.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -31,7 +31,7 @@ extern "C" extern u8 __lower_map[256]; #pragma optimizewithasm off asm void strnicmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s" +#include "asm/msl_c/MSL_Common/Src/extras/strnicmp.s" } #pragma pop @@ -41,6 +41,6 @@ asm void strnicmp() { #pragma optimizewithasm off asm void stricmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s" +#include "asm/msl_c/MSL_Common/Src/extras/stricmp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp b/libs/msl_c/MSL_Common/Src/file_io.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp rename to libs/msl_c/MSL_Common/Src/file_io.cpp index 6b06df0f37b..9d506cc5f26 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp +++ b/libs/msl_c/MSL_Common/Src/file_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/file_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h" +#include "msl_c/MSL_Common/Src/file_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" extern u8 __lower_map[256]; #pragma optimizewithasm off asm void __msl_strnicmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s" +#include "asm/msl_c/MSL_Common/Src/file_io/__msl_strnicmp.s" } #pragma pop @@ -45,7 +45,7 @@ asm void __msl_strnicmp() { #pragma optimizewithasm off asm void fflush() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s" +#include "asm/msl_c/MSL_Common/Src/file_io/fflush.s" } #pragma pop @@ -55,6 +55,6 @@ asm void fflush() { #pragma optimizewithasm off asm void fclose() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s" +#include "asm/msl_c/MSL_Common/Src/file_io/fclose.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp b/libs/msl_c/MSL_Common/Src/float.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp rename to libs/msl_c/MSL_Common/Src/float.cpp index bcb41b3acd1..7af7e7624a6 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp +++ b/libs/msl_c/MSL_Common/Src/float.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/float // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" +#include "msl_c/MSL_Common/Src/float.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp b/libs/msl_c/MSL_Common/Src/mbstring.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp rename to libs/msl_c/MSL_Common/Src/mbstring.cpp index 3ca1ccf4251..bfebd9af4c5 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp +++ b/libs/msl_c/MSL_Common/Src/mbstring.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mbstring // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h" +#include "msl_c/MSL_Common/Src/mbstring.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u32 lit_74[1 + 1 /* padding */] = { #pragma optimizewithasm off asm void wcstombs() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s" +#include "asm/msl_c/MSL_Common/Src/mbstring/wcstombs.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp b/libs/msl_c/MSL_Common/Src/mem.cpp similarity index 80% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp rename to libs/msl_c/MSL_Common/Src/mem.cpp index c9b3feb5ff4..892ab296a56 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp +++ b/libs/msl_c/MSL_Common/Src/mem.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mem // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h" +#include "msl_c/MSL_Common/Src/mem.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" void __copy_longs_aligned(); #pragma optimizewithasm off asm int memcmp(const void*, const void*, size_t) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s" +#include "asm/msl_c/MSL_Common/Src/mem/memcmp.s" } #pragma pop @@ -44,7 +44,7 @@ asm int memcmp(const void*, const void*, size_t) { #pragma optimizewithasm off asm void __memrchr() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s" +#include "asm/msl_c/MSL_Common/Src/mem/__memrchr.s" } #pragma pop @@ -54,7 +54,7 @@ asm void __memrchr() { #pragma optimizewithasm off asm void memchr() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s" +#include "asm/msl_c/MSL_Common/Src/mem/memchr.s" } #pragma pop @@ -64,6 +64,6 @@ asm void memchr() { #pragma optimizewithasm off asm void memmove() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s" +#include "asm/msl_c/MSL_Common/Src/mem/memmove.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp b/libs/msl_c/MSL_Common/Src/mem_funcs.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp rename to libs/msl_c/MSL_Common/Src/mem_funcs.cpp index 0b0fb6b7662..622da76038d 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp +++ b/libs/msl_c/MSL_Common/Src/mem_funcs.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mem_funcs // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h" +#include "msl_c/MSL_Common/Src/mem_funcs.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -30,7 +30,7 @@ extern "C" void __copy_longs_aligned(); #pragma optimizewithasm off asm void __copy_longs_rev_unaligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s" +#include "asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s" } #pragma pop @@ -40,7 +40,7 @@ asm void __copy_longs_rev_unaligned() { #pragma optimizewithasm off asm void __copy_longs_unaligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s" +#include "asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s" } #pragma pop @@ -50,7 +50,7 @@ asm void __copy_longs_unaligned() { #pragma optimizewithasm off asm void __copy_longs_rev_aligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s" +#include "asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s" } #pragma pop @@ -60,6 +60,6 @@ asm void __copy_longs_rev_aligned() { #pragma optimizewithasm off asm void __copy_longs_aligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s" +#include "asm/msl_c/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp b/libs/msl_c/MSL_Common/Src/misc_io.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp rename to libs/msl_c/MSL_Common/Src/misc_io.cpp index 82338b2e1e1..54e7d4dfa25 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp +++ b/libs/msl_c/MSL_Common/Src/misc_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/misc_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h" +#include "msl_c/MSL_Common/Src/misc_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -30,6 +30,6 @@ extern "C" extern u8 __stdio_exit[4]; #pragma optimizewithasm off asm void __stdio_atexit() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s" +#include "asm/msl_c/MSL_Common/Src/misc_io/__stdio_atexit.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp b/libs/msl_c/MSL_Common/Src/printf.cpp similarity index 91% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp rename to libs/msl_c/MSL_Common/Src/printf.cpp index 297b0395187..8f04d2fd028 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp +++ b/libs/msl_c/MSL_Common/Src/printf.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/printf // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -54,7 +54,7 @@ extern "C" extern u8 __ctype_map[256]; #pragma optimizewithasm off asm size_t sprintf(const char*, const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s" +#include "asm/msl_c/MSL_Common/Src/printf/sprintf.s" } #pragma pop @@ -64,7 +64,7 @@ asm size_t sprintf(const char*, const char*, ...) { #pragma optimizewithasm off asm size_t snprintf(const char*, size_t, const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s" +#include "asm/msl_c/MSL_Common/Src/printf/snprintf.s" } #pragma pop @@ -74,7 +74,7 @@ asm size_t snprintf(const char*, size_t, const char*, ...) { #pragma optimizewithasm off asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s" +#include "asm/msl_c/MSL_Common/Src/printf/vsnprintf.s" } #pragma pop @@ -84,7 +84,7 @@ asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_li #pragma optimizewithasm off asm size_t vprintf(const char*, va_list) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s" +#include "asm/msl_c/MSL_Common/Src/printf/vprintf.s" } #pragma pop @@ -94,7 +94,7 @@ asm size_t vprintf(const char*, va_list) { #pragma optimizewithasm off asm void fprintf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s" +#include "asm/msl_c/MSL_Common/Src/printf/fprintf.s" } #pragma pop @@ -104,7 +104,7 @@ asm void fprintf() { #pragma optimizewithasm off asm size_t printf(const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s" +#include "asm/msl_c/MSL_Common/Src/printf/printf.s" } #pragma pop @@ -114,7 +114,7 @@ asm size_t printf(const char*, ...) { #pragma optimizewithasm off asm void __StringWrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s" +#include "asm/msl_c/MSL_Common/Src/printf/__StringWrite.s" } #pragma pop @@ -124,7 +124,7 @@ asm void __StringWrite() { #pragma optimizewithasm off asm void __FileWrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s" +#include "asm/msl_c/MSL_Common/Src/printf/__FileWrite.s" } #pragma pop @@ -155,7 +155,7 @@ SECTION_SDATA static u8 data_80450AD8[2 + 6 /* padding */] = { asm void __pformatter() { nofralloc #undef __va_arg -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s" +#include "asm/msl_c/MSL_Common/Src/printf/__pformatter.s" } #pragma pop @@ -186,7 +186,7 @@ SECTION_SDATA2 static u8 lit_1089[8] = { #pragma optimizewithasm off static asm void float2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s" +#include "asm/msl_c/MSL_Common/Src/printf/float2str.s" } #pragma pop @@ -196,7 +196,7 @@ static asm void float2str() { #pragma optimizewithasm off static asm void round_decimal() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s" +#include "asm/msl_c/MSL_Common/Src/printf/round_decimal.s" } #pragma pop @@ -206,7 +206,7 @@ static asm void round_decimal() { #pragma optimizewithasm off static asm void double2hex() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s" +#include "asm/msl_c/MSL_Common/Src/printf/double2hex.s" } #pragma pop @@ -238,7 +238,7 @@ SECTION_DATA static void* lit_1248[33] = { #pragma optimizewithasm off static asm void longlong2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s" +#include "asm/msl_c/MSL_Common/Src/printf/longlong2str.s" } #pragma pop @@ -270,7 +270,7 @@ SECTION_DATA static void* lit_1307[33] = { #pragma optimizewithasm off static asm void long2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s" +#include "asm/msl_c/MSL_Common/Src/printf/long2str.s" } #pragma pop @@ -336,7 +336,7 @@ SECTION_DATA static void* lit_1442[17 + 1 /* padding */] = { #pragma optimizewithasm off static asm void parse_format() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s" +#include "asm/msl_c/MSL_Common/Src/printf/parse_format.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp b/libs/msl_c/MSL_Common/Src/scanf.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp rename to libs/msl_c/MSL_Common/Src/scanf.cpp index 6f35de531ef..b7666f25b35 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp +++ b/libs/msl_c/MSL_Common/Src/scanf.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/scanf // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h" +#include "msl_c/MSL_Common/Src/scanf.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void __StringRead(); #pragma optimizewithasm off asm void __StringRead() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s" +#include "asm/msl_c/MSL_Common/Src/scanf/__StringRead.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp b/libs/msl_c/MSL_Common/Src/signal.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp rename to libs/msl_c/MSL_Common/Src/signal.cpp index 9ab9b6e3e95..b6b61e6c3f1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp +++ b/libs/msl_c/MSL_Common/Src/signal.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/signal // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h" +#include "msl_c/MSL_Common/Src/signal.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,6 +35,6 @@ static u8 signal_funcs[24]; #pragma optimizewithasm off asm void raise() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s" +#include "asm/msl_c/MSL_Common/Src/signal/raise.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp b/libs/msl_c/MSL_Common/Src/string.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp rename to libs/msl_c/MSL_Common/Src/string.cpp index 2f18ef9c6a5..c4f02bb7ca5 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp +++ b/libs/msl_c/MSL_Common/Src/string.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/string // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -23,7 +23,7 @@ extern "C" void _epilog(); #pragma optimizewithasm off asm char* strrchr(const char*, int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s" +#include "asm/msl_c/MSL_Common/Src/string/strrchr.s" } #pragma pop @@ -33,7 +33,7 @@ asm char* strrchr(const char*, int) { #pragma optimizewithasm off asm char* strchr(const char*, int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s" +#include "asm/msl_c/MSL_Common/Src/string/strchr.s" } #pragma pop @@ -43,7 +43,7 @@ asm char* strchr(const char*, int) { #pragma optimizewithasm off asm int strncmp(const char*, const char*, u32) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s" +#include "asm/msl_c/MSL_Common/Src/string/strncmp.s" } #pragma pop @@ -53,7 +53,7 @@ asm int strncmp(const char*, const char*, u32) { #pragma optimizewithasm off asm int strcmp(const char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s" +#include "asm/msl_c/MSL_Common/Src/string/strcmp.s" } #pragma pop @@ -63,7 +63,7 @@ asm int strcmp(const char*, const char*) { #pragma optimizewithasm off asm char* strcat(char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s" +#include "asm/msl_c/MSL_Common/Src/string/strcat.s" } #pragma pop @@ -73,7 +73,7 @@ asm char* strcat(char*, const char*) { #pragma optimizewithasm off asm char* strncpy(char*, const char*, u32) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s" +#include "asm/msl_c/MSL_Common/Src/string/strncpy.s" } #pragma pop @@ -83,7 +83,7 @@ asm char* strncpy(char*, const char*, u32) { #pragma optimizewithasm off asm char* strcpy(char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s" +#include "asm/msl_c/MSL_Common/Src/string/strcpy.s" } #pragma pop @@ -93,6 +93,6 @@ asm char* strcpy(char*, const char*) { #pragma optimizewithasm off asm u32 strlen(const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s" +#include "asm/msl_c/MSL_Common/Src/string/strlen.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp b/libs/msl_c/MSL_Common/Src/strtoul.cpp similarity index 88% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp rename to libs/msl_c/MSL_Common/Src/strtoul.cpp index 23e601191c1..cdab51699c7 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp +++ b/libs/msl_c/MSL_Common/Src/strtoul.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/strtoul // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h" +#include "msl_c/MSL_Common/Src/strtoul.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; #pragma optimizewithasm off asm void strtol() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s" +#include "asm/msl_c/MSL_Common/Src/strtoul/strtol.s" } #pragma pop @@ -44,7 +44,7 @@ asm void strtol() { #pragma optimizewithasm off asm void strtoul() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s" +#include "asm/msl_c/MSL_Common/Src/strtoul/strtoul.s" } #pragma pop @@ -78,6 +78,6 @@ SECTION_DATA static void* lit_431[17 + 1 /* padding */] = { #pragma optimizewithasm off asm void __strtoul() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s" +#include "asm/msl_c/MSL_Common/Src/strtoul/__strtoul.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp b/libs/msl_c/MSL_Common/Src/wchar_io.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp rename to libs/msl_c/MSL_Common/Src/wchar_io.cpp index ba61d0ee79e..3f690803deb 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp +++ b/libs/msl_c/MSL_Common/Src/wchar_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/wchar_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h" +#include "msl_c/MSL_Common/Src/wchar_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void fwide(); #pragma optimizewithasm off asm void fwide() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s" +#include "asm/msl_c/MSL_Common/Src/wchar_io/fwide.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp b/libs/msl_c/MSL_Common_Embedded/Src/ansi_fp.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp rename to libs/msl_c/MSL_Common_Embedded/Src/ansi_fp.cpp index a53026b27c9..9e6a4033ce2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp +++ b/libs/msl_c/MSL_Common_Embedded/Src/ansi_fp.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common_Embedded/Src/ansi_fp // -#include "MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h" +#include "msl_c/MSL_Common_Embedded/Src/ansi_fp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -38,7 +38,7 @@ extern "C" void modf(); #pragma optimizewithasm off asm void __num2dec() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s" +#include "asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s" } #pragma pop @@ -54,7 +54,7 @@ SECTION_SDATA2 static u8 lit_824[8] = { #pragma optimizewithasm off asm void __num2dec_internal() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s" +#include "asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s" } #pragma pop @@ -175,7 +175,7 @@ SECTION_DATA static void* lit_1710[73 + 1 /* padding */] = { #pragma optimizewithasm off asm void __two_exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s" +#include "asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s" } #pragma pop @@ -185,7 +185,7 @@ asm void __two_exp() { #pragma optimizewithasm off asm void __timesdec() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s" +#include "asm/msl_c/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s" } #pragma pop diff --git a/libs/msl_c/Makefile b/libs/msl_c/Makefile new file mode 100644 index 00000000000..5a1fd841e3c --- /dev/null +++ b/libs/msl_c/Makefile @@ -0,0 +1,139 @@ +# +# Generated By: dol2asm +# + +LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ + libs/msl_c/MSL_Common/Src/abort_exit.cpp \ + libs/msl_c/MSL_Common/Src/alloc.cpp \ + libs/msl_c/MSL_Common/Src/errno.cpp \ + libs/msl_c/MSL_Common/Src/ansi_files.cpp \ + libs/msl_c/MSL_Common_Embedded/Src/ansi_fp.cpp \ + libs/msl_c/MSL_Common/Src/arith.cpp \ + libs/msl_c/MSL_Common/Src/buffer_io.cpp \ + libs/msl_c/MSL_Common/Src/char_io.cpp \ + libs/msl_c/PPC_EABI/Src/critical_regions.gamecube.cpp \ + libs/msl_c/MSL_Common/Src/ctype.cpp \ + libs/msl_c/MSL_Common/Src/direct_io.cpp \ + libs/msl_c/MSL_Common/Src/file_io.cpp \ + libs/msl_c/MSL_Common/Src/FILE_POS.cpp \ + libs/msl_c/MSL_Common/Src/mbstring.cpp \ + libs/msl_c/MSL_Common/Src/mem.cpp \ + libs/msl_c/MSL_Common/Src/mem_funcs.cpp \ + libs/msl_c/MSL_Common/Src/misc_io.cpp \ + libs/msl_c/MSL_Common/Src/printf.cpp \ + libs/msl_c/MSL_Common/Src/scanf.cpp \ + libs/msl_c/MSL_Common/Src/float.cpp \ + libs/msl_c/MSL_Common/Src/signal.cpp \ + libs/msl_c/MSL_Common/Src/string.cpp \ + libs/msl_c/MSL_Common/Src/strtoul.cpp \ + libs/msl_c/MSL_Common/Src/wchar_io.cpp \ + libs/msl_c/PPC_EABI/Src/uart_console_io_gcn.cpp \ + libs/msl_c/Math/Double_precision/e_acos.cpp \ + libs/msl_c/Math/Double_precision/e_asin.cpp \ + libs/msl_c/Math/Double_precision/e_atan2.cpp \ + libs/msl_c/Math/Double_precision/e_exp.cpp \ + libs/msl_c/Math/Double_precision/e_fmod.cpp \ + libs/msl_c/Math/Double_precision/e_pow.cpp \ + libs/msl_c/Math/Double_precision/e_rem_pio2.cpp \ + libs/msl_c/Math/Double_precision/k_cos.cpp \ + libs/msl_c/Math/Double_precision/k_rem_pio2.cpp \ + libs/msl_c/Math/Double_precision/k_sin.cpp \ + libs/msl_c/Math/Double_precision/k_tan.cpp \ + libs/msl_c/Math/Double_precision/s_atan.cpp \ + libs/msl_c/Math/Double_precision/s_ceil.cpp \ + libs/msl_c/Math/Double_precision/s_copysign.cpp \ + libs/msl_c/Math/Double_precision/s_cos.cpp \ + libs/msl_c/Math/Double_precision/s_floor.cpp \ + libs/msl_c/Math/Double_precision/s_frexp.cpp \ + libs/msl_c/Math/Double_precision/s_ldexp.cpp \ + libs/msl_c/Math/Double_precision/s_modf.cpp \ + libs/msl_c/Math/Double_precision/s_sin.cpp \ + libs/msl_c/Math/Double_precision/s_tan.cpp \ + libs/msl_c/Math/Double_precision/w_acos.cpp \ + libs/msl_c/Math/Double_precision/w_asin.cpp \ + libs/msl_c/Math/Double_precision/w_atan2.cpp \ + libs/msl_c/Math/Double_precision/w_exp.cpp \ + libs/msl_c/Math/Double_precision/w_fmod.cpp \ + libs/msl_c/Math/Double_precision/w_pow.cpp \ + libs/msl_c/Math/Double_precision/e_sqrt.cpp \ + libs/msl_c/PPC_EABI/Src/math_ppc.cpp \ + libs/msl_c/Math/Double_precision/w_sqrt.cpp \ + libs/msl_c/MSL_Common/Src/extras.cpp \ + +LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/abort_exit.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/alloc.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/errno.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/ansi_files.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common_Embedded/Src/ansi_fp.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/arith.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/buffer_io.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/char_io.o \ + $(BUILD_DIR)/libs/msl_c/PPC_EABI/Src/critical_regions.gamecube.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/ctype.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/direct_io.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/file_io.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/FILE_POS.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/mbstring.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/mem.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/mem_funcs.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/misc_io.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/printf.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/scanf.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/float.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/signal.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/string.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/strtoul.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/wchar_io.o \ + $(BUILD_DIR)/libs/msl_c/PPC_EABI/Src/uart_console_io_gcn.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_acos.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_asin.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_atan2.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_exp.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_fmod.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_pow.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_rem_pio2.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/k_cos.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/k_rem_pio2.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/k_sin.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/k_tan.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_atan.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_ceil.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_copysign.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_cos.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_floor.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_frexp.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_ldexp.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_modf.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_sin.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/s_tan.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_acos.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_asin.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_atan2.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_exp.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_fmod.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_pow.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/e_sqrt.o \ + $(BUILD_DIR)/libs/msl_c/PPC_EABI/Src/math_ppc.o \ + $(BUILD_DIR)/libs/msl_c/Math/Double_precision/w_sqrt.o \ + $(BUILD_DIR)/libs/msl_c/MSL_Common/Src/extras.o \ + +LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ + +LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ + -nodefaults \ + -fp hard \ + -proc gekko \ + -linkmode moreram \ + +$(BUILD_DIR)/libmsl_c.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) + @echo linking... $(BUILD_DIR)/libmsl_c.a + @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libmsl_c.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + +$(BUILD_DIR)/libs/msl_c/%.o: libs/msl_c/%.cpp + @mkdir -p $(@D) + @echo building... $< + @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $(basename $@).cpp + diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp b/libs/msl_c/Math/Double_precision/e_acos.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp rename to libs/msl_c/Math/Double_precision/e_acos.cpp index 2a8c8c1ce9f..f6d2e8d3598 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp +++ b/libs/msl_c/Math/Double_precision/e_acos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_acos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h" +#include "msl_c/Math/Double_precision/e_acos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -84,6 +84,6 @@ SECTION_SDATA2 static f64 lit_99 = 2.0; #pragma optimizewithasm off asm void __ieee754_acos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s" +#include "asm/msl_c/Math/Double_precision/e_acos/__ieee754_acos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp b/libs/msl_c/Math/Double_precision/e_asin.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp rename to libs/msl_c/Math/Double_precision/e_asin.cpp index 19312da8711..55808776783 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp +++ b/libs/msl_c/Math/Double_precision/e_asin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_asin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h" +#include "msl_c/Math/Double_precision/e_asin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -82,6 +82,6 @@ SECTION_SDATA2 static f64 lit_110 = 0.7853981633974483; #pragma optimizewithasm off asm void __ieee754_asin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s" +#include "asm/msl_c/Math/Double_precision/e_asin/__ieee754_asin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp b/libs/msl_c/Math/Double_precision/e_atan2.cpp similarity index 93% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp rename to libs/msl_c/Math/Double_precision/e_atan2.cpp index f6977ff0bbb..37eedc10023 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp +++ b/libs/msl_c/Math/Double_precision/e_atan2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_atan2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h" +#include "msl_c/Math/Double_precision/e_atan2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -65,6 +65,6 @@ SECTION_SDATA2 static f64 lit_155 = 1.2246467991473532e-16; #pragma optimizewithasm off asm void __ieee754_atan2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s" +#include "asm/msl_c/Math/Double_precision/e_atan2/__ieee754_atan2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp b/libs/msl_c/Math/Double_precision/e_exp.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp rename to libs/msl_c/Math/Double_precision/e_exp.cpp index 8d2d406741d..78620570321 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp +++ b/libs/msl_c/Math/Double_precision/e_exp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_exp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h" +#include "msl_c/Math/Double_precision/e_exp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -99,6 +99,6 @@ SECTION_SDATA2 static f64 lit_131 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s" +#include "asm/msl_c/Math/Double_precision/e_exp/__ieee754_exp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp b/libs/msl_c/Math/Double_precision/e_fmod.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp rename to libs/msl_c/Math/Double_precision/e_fmod.cpp index 1b74d42b5c7..6ba94349ed6 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp +++ b/libs/msl_c/Math/Double_precision/e_fmod.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_fmod // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h" +#include "msl_c/Math/Double_precision/e_fmod.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,6 +34,6 @@ COMPILER_STRIP_GATE(0x803A2370, &Zero); #pragma optimizewithasm off asm void __ieee754_fmod() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s" +#include "asm/msl_c/Math/Double_precision/e_fmod/__ieee754_fmod.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp b/libs/msl_c/Math/Double_precision/e_pow.cpp similarity index 97% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp rename to libs/msl_c/Math/Double_precision/e_pow.cpp index 31528583cf1..2e26cecb623 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp +++ b/libs/msl_c/Math/Double_precision/e_pow.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_pow // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h" +#include "msl_c/Math/Double_precision/e_pow.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -161,6 +161,6 @@ SECTION_SDATA2 static f64 lit_370 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_pow() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s" +#include "asm/msl_c/Math/Double_precision/e_pow/__ieee754_pow.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp b/libs/msl_c/Math/Double_precision/e_rem_pio2.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp rename to libs/msl_c/Math/Double_precision/e_rem_pio2.cpp index 8589524abed..3b8391fe2bc 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp +++ b/libs/msl_c/Math/Double_precision/e_rem_pio2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_rem_pio2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h" +#include "msl_c/Math/Double_precision/e_rem_pio2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -100,6 +100,6 @@ SECTION_SDATA2 static f64 lit_157 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_rem_pio2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s" +#include "asm/msl_c/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp b/libs/msl_c/Math/Double_precision/e_sqrt.cpp similarity index 83% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp rename to libs/msl_c/Math/Double_precision/e_sqrt.cpp index e63833cc43c..933a22cd2a2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp +++ b/libs/msl_c/Math/Double_precision/e_sqrt.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_sqrt // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h" +#include "msl_c/Math/Double_precision/e_sqrt.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,6 +34,6 @@ SECTION_SDATA2 static f64 lit_164 = 1.0; #pragma optimizewithasm off asm void __ieee754_sqrt() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s" +#include "asm/msl_c/Math/Double_precision/e_sqrt/__ieee754_sqrt.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp b/libs/msl_c/Math/Double_precision/k_cos.cpp similarity index 92% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp rename to libs/msl_c/Math/Double_precision/k_cos.cpp index 8615f144ce9..9983a4da527 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp +++ b/libs/msl_c/Math/Double_precision/k_cos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_cos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h" +#include "msl_c/Math/Double_precision/k_cos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -55,6 +55,6 @@ SECTION_SDATA2 static f64 lit_73 = 0.28125; #pragma optimizewithasm off asm void __kernel_cos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s" +#include "asm/msl_c/Math/Double_precision/k_cos/__kernel_cos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp b/libs/msl_c/Math/Double_precision/k_rem_pio2.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp rename to libs/msl_c/Math/Double_precision/k_rem_pio2.cpp index b649cf87817..e92ad486a49 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp +++ b/libs/msl_c/Math/Double_precision/k_rem_pio2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_rem_pio2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h" +#include "msl_c/Math/Double_precision/k_rem_pio2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -74,6 +74,6 @@ SECTION_SDATA2 static f64 lit_445 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __kernel_rem_pio2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s" +#include "asm/msl_c/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp b/libs/msl_c/Math/Double_precision/k_sin.cpp similarity index 91% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp rename to libs/msl_c/Math/Double_precision/k_sin.cpp index 9c2df87ffd2..621b471f8ae 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp +++ b/libs/msl_c/Math/Double_precision/k_sin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_sin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h" +#include "msl_c/Math/Double_precision/k_sin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -49,6 +49,6 @@ SECTION_SDATA2 static f64 lit_66 = 0.5; #pragma optimizewithasm off asm void __kernel_sin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s" +#include "asm/msl_c/Math/Double_precision/k_sin/__kernel_sin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp b/libs/msl_c/Math/Double_precision/k_tan.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp rename to libs/msl_c/Math/Double_precision/k_tan.cpp index ea40a790ca2..0251bd46fc2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp +++ b/libs/msl_c/Math/Double_precision/k_tan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_tan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h" +#include "msl_c/Math/Double_precision/k_tan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -63,6 +63,6 @@ SECTION_SDATA2 static f64 lit_101 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __kernel_tan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s" +#include "asm/msl_c/Math/Double_precision/k_tan/__kernel_tan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp b/libs/msl_c/Math/Double_precision/s_atan.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp rename to libs/msl_c/Math/Double_precision/s_atan.cpp index 553bf2d2c13..06dfc97a9df 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp +++ b/libs/msl_c/Math/Double_precision/s_atan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_atan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h" +#include "msl_c/Math/Double_precision/s_atan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -74,6 +74,6 @@ SECTION_SDATA2 static f64 lit_119 = -1.0; #pragma optimizewithasm off asm void atan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s" +#include "asm/msl_c/Math/Double_precision/s_atan/atan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp b/libs/msl_c/Math/Double_precision/s_ceil.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp rename to libs/msl_c/Math/Double_precision/s_ceil.cpp index 6db65ef52d0..fb9ffa17603 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp +++ b/libs/msl_c/Math/Double_precision/s_ceil.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_ceil // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h" +#include "msl_c/Math/Double_precision/s_ceil.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_125[8] = { #pragma optimizewithasm off asm void ceil() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s" +#include "asm/msl_c/Math/Double_precision/s_ceil/ceil.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp b/libs/msl_c/Math/Double_precision/s_copysign.cpp similarity index 75% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp rename to libs/msl_c/Math/Double_precision/s_copysign.cpp index f1359067957..e182bd0f046 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp +++ b/libs/msl_c/Math/Double_precision/s_copysign.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_copysign // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h" +#include "msl_c/Math/Double_precision/s_copysign.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void copysign(); #pragma optimizewithasm off asm void copysign() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s" +#include "asm/msl_c/Math/Double_precision/s_copysign/copysign.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp b/libs/msl_c/Math/Double_precision/s_cos.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp rename to libs/msl_c/Math/Double_precision/s_cos.cpp index 2b8fecbe054..27bfb50d497 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp +++ b/libs/msl_c/Math/Double_precision/s_cos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_cos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h" +#include "msl_c/Math/Double_precision/s_cos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u8 lit_67[8] = { #pragma optimizewithasm off asm void cos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s" +#include "asm/msl_c/Math/Double_precision/s_cos/cos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp b/libs/msl_c/Math/Double_precision/s_floor.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp rename to libs/msl_c/Math/Double_precision/s_floor.cpp index b33fa81cb4f..fe6ed8f8de1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp +++ b/libs/msl_c/Math/Double_precision/s_floor.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_floor // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h" +#include "msl_c/Math/Double_precision/s_floor.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_125[8] = { #pragma optimizewithasm off asm void floor() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s" +#include "asm/msl_c/Math/Double_precision/s_floor/floor.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp b/libs/msl_c/Math/Double_precision/s_frexp.cpp similarity index 82% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp rename to libs/msl_c/Math/Double_precision/s_frexp.cpp index c72caac9cbc..4b6dc0d5fa1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp +++ b/libs/msl_c/Math/Double_precision/s_frexp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_frexp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h" +#include "msl_c/Math/Double_precision/s_frexp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -31,6 +31,6 @@ SECTION_SDATA2 static f64 lit_57 = 1.8014398509481984e+16; #pragma optimizewithasm off asm void frexp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s" +#include "asm/msl_c/Math/Double_precision/s_frexp/frexp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp b/libs/msl_c/Math/Double_precision/s_ldexp.cpp similarity index 89% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp rename to libs/msl_c/Math/Double_precision/s_ldexp.cpp index 82f9dc13c32..bfcc8a86641 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp +++ b/libs/msl_c/Math/Double_precision/s_ldexp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_ldexp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h" +#include "msl_c/Math/Double_precision/s_ldexp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -47,6 +47,6 @@ SECTION_SDATA2 static f64 lit_95 = 5.551115123125783e-17; #pragma optimizewithasm off asm void ldexp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s" +#include "asm/msl_c/Math/Double_precision/s_ldexp/ldexp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp b/libs/msl_c/Math/Double_precision/s_modf.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp rename to libs/msl_c/Math/Double_precision/s_modf.cpp index a7397441e88..15c8a0e2a5b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp +++ b/libs/msl_c/Math/Double_precision/s_modf.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_modf // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h" +#include "msl_c/Math/Double_precision/s_modf.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void modf(); #pragma optimizewithasm off asm void modf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s" +#include "asm/msl_c/Math/Double_precision/s_modf/modf.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp b/libs/msl_c/Math/Double_precision/s_sin.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp rename to libs/msl_c/Math/Double_precision/s_sin.cpp index 2bfe22499a9..5e65f42d25c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp +++ b/libs/msl_c/Math/Double_precision/s_sin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_sin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h" +#include "msl_c/Math/Double_precision/s_sin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u8 lit_67[8] = { #pragma optimizewithasm off asm void sin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s" +#include "asm/msl_c/Math/Double_precision/s_sin/sin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp b/libs/msl_c/Math/Double_precision/s_tan.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp rename to libs/msl_c/Math/Double_precision/s_tan.cpp index c4249d5865c..b6ad931abe5 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp +++ b/libs/msl_c/Math/Double_precision/s_tan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_tan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h" +#include "msl_c/Math/Double_precision/s_tan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_58[8] = { #pragma optimizewithasm off asm void tan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s" +#include "asm/msl_c/Math/Double_precision/s_tan/tan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp b/libs/msl_c/Math/Double_precision/w_acos.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp rename to libs/msl_c/Math/Double_precision/w_acos.cpp index 36c12c515bb..dca85c4adfa 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp +++ b/libs/msl_c/Math/Double_precision/w_acos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_acos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h" +#include "msl_c/Math/Double_precision/w_acos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_acos(); #pragma optimizewithasm off asm void acos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s" +#include "asm/msl_c/Math/Double_precision/w_acos/acos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp b/libs/msl_c/Math/Double_precision/w_asin.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp rename to libs/msl_c/Math/Double_precision/w_asin.cpp index 847b5b496de..1aa92646868 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp +++ b/libs/msl_c/Math/Double_precision/w_asin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_asin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h" +#include "msl_c/Math/Double_precision/w_asin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_asin(); #pragma optimizewithasm off asm void asin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s" +#include "asm/msl_c/Math/Double_precision/w_asin/asin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp b/libs/msl_c/Math/Double_precision/w_atan2.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp rename to libs/msl_c/Math/Double_precision/w_atan2.cpp index effa2db5cde..db2f13c54d9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp +++ b/libs/msl_c/Math/Double_precision/w_atan2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_atan2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h" +#include "msl_c/Math/Double_precision/w_atan2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_atan2(); #pragma optimizewithasm off asm void atan2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s" +#include "asm/msl_c/Math/Double_precision/w_atan2/atan2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp b/libs/msl_c/Math/Double_precision/w_exp.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp rename to libs/msl_c/Math/Double_precision/w_exp.cpp index fc501983efb..b33f97fb5f8 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp +++ b/libs/msl_c/Math/Double_precision/w_exp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_exp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h" +#include "msl_c/Math/Double_precision/w_exp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_exp(); #pragma optimizewithasm off asm void exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s" +#include "asm/msl_c/Math/Double_precision/w_exp/exp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp b/libs/msl_c/Math/Double_precision/w_fmod.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp rename to libs/msl_c/Math/Double_precision/w_fmod.cpp index a5e8eb40364..35298690171 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp +++ b/libs/msl_c/Math/Double_precision/w_fmod.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_fmod // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h" +#include "msl_c/Math/Double_precision/w_fmod.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_fmod(); #pragma optimizewithasm off asm void fmod() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s" +#include "asm/msl_c/Math/Double_precision/w_fmod/fmod.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp b/libs/msl_c/Math/Double_precision/w_pow.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp rename to libs/msl_c/Math/Double_precision/w_pow.cpp index 06a0aa11b35..e20ed403677 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp +++ b/libs/msl_c/Math/Double_precision/w_pow.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_pow // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h" +#include "msl_c/Math/Double_precision/w_pow.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_pow(); #pragma optimizewithasm off asm void pow() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s" +#include "asm/msl_c/Math/Double_precision/w_pow/pow.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp b/libs/msl_c/Math/Double_precision/w_sqrt.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp rename to libs/msl_c/Math/Double_precision/w_sqrt.cpp index 9e43b87f39e..976ae5894ca 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp +++ b/libs/msl_c/Math/Double_precision/w_sqrt.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_sqrt // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h" +#include "msl_c/Math/Double_precision/w_sqrt.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_sqrt(); #pragma optimizewithasm off asm void sqrt() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s" +#include "asm/msl_c/Math/Double_precision/w_sqrt/sqrt.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp b/libs/msl_c/PPC_EABI/Src/critical_regions.gamecube.cpp similarity index 84% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp rename to libs/msl_c/PPC_EABI/Src/critical_regions.gamecube.cpp index a396672bdff..d4a3912aff1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp +++ b/libs/msl_c/PPC_EABI/Src/critical_regions.gamecube.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/critical_regions.gamecube +// Translation Unit: PPC_EABI/Src/critical_regions.gamecube // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h" +#include "msl_c/PPC_EABI/Src/critical_regions.gamecube.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp b/libs/msl_c/PPC_EABI/Src/math_ppc.cpp similarity index 75% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp rename to libs/msl_c/PPC_EABI/Src/math_ppc.cpp index e783612853b..a7db9ec85fb 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp +++ b/libs/msl_c/PPC_EABI/Src/math_ppc.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/math_ppc +// Translation Unit: PPC_EABI/Src/math_ppc // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h" +#include "msl_c/PPC_EABI/Src/math_ppc.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" void acos(); #pragma optimizewithasm off asm void tanf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s" +#include "asm/msl_c/PPC_EABI/Src/math_ppc/tanf.s" } #pragma pop @@ -45,7 +45,7 @@ asm void tanf() { #pragma optimizewithasm off asm void sinf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s" +#include "asm/msl_c/PPC_EABI/Src/math_ppc/sinf.s" } #pragma pop @@ -55,7 +55,7 @@ asm void sinf() { #pragma optimizewithasm off asm void cosf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s" +#include "asm/msl_c/PPC_EABI/Src/math_ppc/cosf.s" } #pragma pop @@ -65,6 +65,6 @@ asm void cosf() { #pragma optimizewithasm off asm void acosf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s" +#include "asm/msl_c/PPC_EABI/Src/math_ppc/acosf.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp b/libs/msl_c/PPC_EABI/Src/uart_console_io_gcn.cpp similarity index 81% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp rename to libs/msl_c/PPC_EABI/Src/uart_console_io_gcn.cpp index 8def84ba255..2c532afaed9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp +++ b/libs/msl_c/PPC_EABI/Src/uart_console_io_gcn.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/uart_console_io_gcn +// Translation Unit: PPC_EABI/Src/uart_console_io_gcn // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h" +#include "msl_c/PPC_EABI/Src/uart_console_io_gcn.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -42,6 +42,6 @@ static u8 initialized[4 + 4 /* padding */]; #pragma optimizewithasm off asm void __write_console() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s" +#include "asm/msl_c/PPC_EABI/Src/uart_console_io_gcn/__write_console.s" } #pragma pop diff --git a/libs/odemuexi2/Makefile b/libs/odemuexi2/Makefile index a42c27728ae..437019d19c3 100644 --- a/libs/odemuexi2/Makefile +++ b/libs/odemuexi2/Makefile @@ -3,10 +3,10 @@ # LIBODEMUEXI2_A_CPP_FILES := \ - libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp \ + libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp \ LIBODEMUEXI2_A_O_FILES := \ - $(BUILD_DIR)/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.o \ + $(BUILD_DIR)/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.o \ LIBODEMUEXI2_A_CFLAGS := \ diff --git a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp b/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp deleted file mode 100644 index 3bbefc22b18..00000000000 --- a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp +++ /dev/null @@ -1,191 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: src/OdemuExi2Lib/DebuggerDriver -// - -#include "odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void DBClose(); -extern "C" void DBOpen(); -extern "C" void DBWrite(); -extern "C" void DBRead(); -extern "C" void DBQueryData(); -extern "C" void DBInitInterrupts(); -extern "C" void DBInitComm(); -extern "C" static void DBGHandler(); -extern "C" static void MWCallback(); -extern "C" static void DBGReadStatus(); -extern "C" static void DBGWrite(); -extern "C" static void DBGRead(); -extern "C" static void DBGReadMailbox(); -extern "C" static void DBGEXIImm(); - -// -// External References: -// - -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void __OSSetInterruptHandler(); -extern "C" void __OSMaskInterrupts(); -extern "C" void __OSUnmaskInterrupts(); -extern "C" extern f32 data_80450AF0; - -// -// Declarations: -// - -/* 80372D2C-80372D30 36D66C 0004+00 0/0 1/1 0/0 .text DBClose */ -void DBClose() { - /* empty function */ -} - -/* 80372D30-80372D34 36D670 0004+00 0/0 1/1 0/0 .text DBOpen */ -void DBOpen() { - /* empty function */ -} - -/* 80372D34-80372F94 36D674 0260+00 0/0 1/1 0/0 .text DBWrite */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DBWrite() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804519D0-804519D4 000ED0 0004+00 2/2 0/0 0/0 .sbss MTRCallback */ -static u8 MTRCallback[4]; - -/* 804519D4-804519D8 000ED4 0004+00 2/2 0/0 0/0 .sbss DBGCallback */ -static u8 DBGCallback[4]; - -/* 804519D8-804519DC 000ED8 0004+00 2/2 0/0 0/0 .sbss SendMailData */ -static u8 SendMailData[4]; - -/* 804519DC-804519E0 000EDC 0004+00 2/2 0/0 0/0 .sbss RecvDataLeng */ -static u8 RecvDataLeng[4]; - -/* 804519E0-804519E4 000EE0 0004+00 1/1 0/0 0/0 .sbss pEXIInputFlag */ -static u8 pEXIInputFlag[4]; - -/* 804519E4-804519E8 000EE4 0004+00 4/4 0/0 0/0 .sbss None */ -static u8 data_804519E4[4]; - -/* 80372F94-80373020 36D8D4 008C+00 0/0 2/2 0/0 .text DBRead */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DBRead() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s" -} -#pragma pop - -/* 80373020-803730BC 36D960 009C+00 0/0 2/2 0/0 .text DBQueryData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DBQueryData() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s" -} -#pragma pop - -/* 803730BC-80373110 36D9FC 0054+00 0/0 1/1 0/0 .text DBInitInterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DBInitInterrupts() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s" -} -#pragma pop - -/* 80373110-80373188 36DA50 0078+00 0/0 1/1 0/0 .text DBInitComm */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DBInitComm() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s" -} -#pragma pop - -/* 80373188-803731C8 36DAC8 0040+00 1/1 0/0 0/0 .text DBGHandler */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGHandler() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s" -} -#pragma pop - -/* 803731C8-80373204 36DB08 003C+00 1/1 0/0 0/0 .text MWCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void MWCallback() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s" -} -#pragma pop - -/* 80373204-803732B0 36DB44 00AC+00 1/1 0/0 0/0 .text DBGReadStatus */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGReadStatus() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s" -} -#pragma pop - -/* 803732B0-8037338C 36DBF0 00DC+00 1/1 0/0 0/0 .text DBGWrite */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGWrite() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s" -} -#pragma pop - -/* 8037338C-80373468 36DCCC 00DC+00 1/1 0/0 0/0 .text DBGRead */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGRead() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s" -} -#pragma pop - -/* 80373468-80373514 36DDA8 00AC+00 1/1 0/0 0/0 .text DBGReadMailbox */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGReadMailbox() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s" -} -#pragma pop - -/* 80373514-803737AC 36DE54 0298+00 5/5 0/0 0/0 .text DBGEXIImm */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DBGEXIImm() { - nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s" -} -#pragma pop diff --git a/obj_files.mk b/obj_files.mk index 393d9acd948..9170340003b 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -280,7 +280,7 @@ LIBS := \ $(BUILD_DIR)/libgx.a \ $(BUILD_DIR)/libgd.a \ $(BUILD_DIR)/libRuntime.PPCEABI.H.a \ - $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a \ + $(BUILD_DIR)/libmsl_c.a \ $(BUILD_DIR)/libTRK_MINNOW_DOLPHIN.a \ $(BUILD_DIR)/libamcstubs.a \ $(BUILD_DIR)/libodemuexi2.a \ diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 534d990e074..bdef3e2dd00 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -6,7 +6,7 @@ #include "DynamicLink.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTConsole.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "msl_c/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 7866eab5a0e..f2af233670e 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -7,7 +7,7 @@ #include "DynamicLink.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 394740abb36..7ad40a4a34c 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -4,7 +4,7 @@ // #include "d/d_eye_hl.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "msl_c/MSL_Common/Src/string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 51d18a23b72..a7d546d29ec 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -15,7 +15,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_ext.h" -#include "m_Do/m_Do_reset.h" +#include "m_Do/m_Do_Reset.h" // // Forward References: diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 6e84d67a4e3..f81e0dbf603 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -4,7 +4,7 @@ // #include "d/kankyo/d_kankyo.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h" +#include "msl_c/MSL_Common/Src/mem.h" #include "Z2AudioLib/Z2EnvSeMgr.h" #include "d/com/d_com_inf_game.h" #include "d/kankyo/d_kankyo_data.h" diff --git a/tools/lcf.py b/tools/lcf.py index 214ac5b3839..77eff4ff086 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -389,7 +389,7 @@ ARCHIVES = [ "build/dolzel2/libgx.a", "build/dolzel2/libgd.a", "build/dolzel2/libRuntime.PPCEABI.H.a", - "build/dolzel2/libMSL_C.PPCEABI.bare.H.a", + "build/dolzel2/libmsl_c.a", "build/dolzel2/libTRK_MINNOW_DOLPHIN.a", "build/dolzel2/libamcstubs.a", "build/dolzel2/libodemuexi2.a", diff --git a/tp b/tp old mode 100755 new mode 100644