ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename architecture 386 to i386

Browse Source
This commit is contained in:
gingerBill
2022-01-15 17:40:00 +00:00
parent 6c48670819
commit 29ebe0c3c9
15 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/c/c.odin
+1 -1
View File
@@ -48,7 +48,7 @@ int_least64_t :: builtin.i64
uint_least64_t :: builtin.u64 uint_least64_t :: builtin.u64
// Same on Windows, Linux, and FreeBSD // Same on Windows, Linux, and FreeBSD
when ODIN_ARCH == "386" || ODIN_ARCH == "amd64" { when ODIN_ARCH == "i386" || ODIN_ARCH == "amd64" {
int_fast8_t :: builtin.i8 int_fast8_t :: builtin.i8
uint_fast8_t :: builtin.u8 uint_fast8_t :: builtin.u8
int_fast16_t :: builtin.i32 int_fast16_t :: builtin.i32
core/crypto/_fiat/field_poly1305/field.odin
+1 -1
View File
@@ -22,7 +22,7 @@ fe_from_bytes :: #force_inline proc (out1: ^Tight_Field_Element, arg1: []byte, a
assert(len(arg1) == 16) assert(len(arg1) == 16)
when ODIN_ARCH == "386" || ODIN_ARCH == "amd64" { when ODIN_ARCH == "i386" || ODIN_ARCH == "amd64" {
// While it may be unwise to do deserialization here on our // While it may be unwise to do deserialization here on our
// own when fiat-crypto provides equivalent functionality, // own when fiat-crypto provides equivalent functionality,
// doing it this way provides a little under 3x performance // doing it this way provides a little under 3x performance
core/crypto/chacha20/chacha20.odin
+1 -1
View File
@@ -346,7 +346,7 @@ _do_blocks :: proc (ctx: ^Context, dst, src: []byte, nr_blocks: int) {
// Until dedicated assembly can be written leverage the fact that // Until dedicated assembly can be written leverage the fact that
// the callers of this routine ensure that src/dst are valid. // the callers of this routine ensure that src/dst are valid.
when ODIN_ARCH == "386" || ODIN_ARCH == "amd64" { when ODIN_ARCH == "i386" || ODIN_ARCH == "amd64" {
// util.PUT_U32_LE/util.U32_LE are not required on little-endian // util.PUT_U32_LE/util.U32_LE are not required on little-endian
// systems that also happen to not be strict about aligned // systems that also happen to not be strict about aligned
// memory access. // memory access.
core/runtime/entry_windows.odin
+1 -1
View File
@@ -22,7 +22,7 @@ when ODIN_BUILD_MODE == .Dynamic {
return true return true
} }
} else when !ODIN_TEST && !ODIN_NO_ENTRY_POINT { } else when !ODIN_TEST && !ODIN_NO_ENTRY_POINT {
when ODIN_ARCH == "386" || ODIN_NO_CRT { when ODIN_ARCH == "i386" || ODIN_NO_CRT {
@(link_name="mainCRTStartup", linkage="strong", require) @(link_name="mainCRTStartup", linkage="strong", require)
mainCRTStartup :: proc "stdcall" () -> i32 { mainCRTStartup :: proc "stdcall" () -> i32 {
context = default_context() context = default_context()
core/runtime/procs_windows_386.odin → core/runtime/procs_windows_i386.odin
View File
core/sys/cpu/cpu_x86.odin
+1 -1
View File
@@ -1,4 +1,4 @@
//+build 386, amd64 //+build i386, amd64
package sys_cpu package sys_cpu
_cache_line_size :: 64; _cache_line_size :: 64;
core/sys/unix/syscalls_linux.odin
+1 -1
View File
@@ -675,7 +675,7 @@ when ODIN_ARCH == "amd64" {
SYS_landlock_create_ruleset : uintptr : 444 SYS_landlock_create_ruleset : uintptr : 444
SYS_landlock_add_rule : uintptr : 445 SYS_landlock_add_rule : uintptr : 445
SYS_landlock_restrict_self : uintptr : 446 SYS_landlock_restrict_self : uintptr : 446
} else when ODIN_ARCH == "386" { } else when ODIN_ARCH == "i386" {
SYS_restart_syscall : uintptr : 0 SYS_restart_syscall : uintptr : 0
SYS_exit : uintptr : 1 SYS_exit : uintptr : 1
SYS_fork : uintptr : 2 SYS_fork : uintptr : 2
src/build_settings.cpp
+15 -15
View File
@@ -29,7 +29,7 @@ enum TargetArchKind {
TargetArch_Invalid, TargetArch_Invalid,
TargetArch_amd64, TargetArch_amd64,
TargetArch_386, TargetArch_i386,
TargetArch_arm64, TargetArch_arm64,
TargetArch_wasm32, TargetArch_wasm32,
TargetArch_wasm64, TargetArch_wasm64,
@@ -63,7 +63,7 @@ String target_os_names[TargetOs_COUNT] = {
String target_arch_names[TargetArch_COUNT] = { String target_arch_names[TargetArch_COUNT] = {
str_lit(""), str_lit(""),
str_lit("amd64"), str_lit("amd64"),
str_lit("386"), str_lit("i386"),
str_lit("arm64"), str_lit("arm64"),
str_lit("wasm32"), str_lit("wasm32"),
str_lit("wasm64"), str_lit("wasm64"),
@@ -269,9 +269,9 @@ bool global_ignore_warnings(void) {
} }
gb_global TargetMetrics target_windows_386 = { gb_global TargetMetrics target_windows_i386 = {
TargetOs_windows, TargetOs_windows,
TargetArch_386, TargetArch_i386,
4, 4,
8, 8,
str_lit("i386-pc-windows-msvc"), str_lit("i386-pc-windows-msvc"),
@@ -285,9 +285,9 @@ gb_global TargetMetrics target_windows_amd64 = {
str_lit("e-m:w-i64:64-f80:128-n8:16:32:64-S128"), str_lit("e-m:w-i64:64-f80:128-n8:16:32:64-S128"),
}; };
gb_global TargetMetrics target_linux_386 = { gb_global TargetMetrics target_linux_i386 = {
TargetOs_linux, TargetOs_linux,
TargetArch_386, TargetArch_i386,
4, 4,
8, 8,
str_lit("i386-pc-linux-gnu"), str_lit("i386-pc-linux-gnu"),
@@ -328,9 +328,9 @@ gb_global TargetMetrics target_darwin_arm64 = {
str_lit("e-m:o-i64:64-i128:128-n32:64-S128"), // TODO(bill): Is this correct? str_lit("e-m:o-i64:64-i128:128-n32:64-S128"), // TODO(bill): Is this correct?
}; };
gb_global TargetMetrics target_freebsd_386 = { gb_global TargetMetrics target_freebsd_i386 = {
TargetOs_freebsd, TargetOs_freebsd,
TargetArch_386, TargetArch_i386,
4, 4,
8, 8,
str_lit("i386-unknown-freebsd-elf"), str_lit("i386-unknown-freebsd-elf"),
@@ -401,12 +401,12 @@ gb_global NamedTargetMetrics named_targets[] = {
{ str_lit("darwin_amd64"), &target_darwin_amd64 }, { str_lit("darwin_amd64"), &target_darwin_amd64 },
{ str_lit("darwin_arm64"), &target_darwin_arm64 }, { str_lit("darwin_arm64"), &target_darwin_arm64 },
{ str_lit("essence_amd64"), &target_essence_amd64 }, { str_lit("essence_amd64"), &target_essence_amd64 },
{ str_lit("linux_386"), &target_linux_386 }, { str_lit("linux_i386"), &target_linux_i386 },
{ str_lit("linux_amd64"), &target_linux_amd64 }, { str_lit("linux_amd64"), &target_linux_amd64 },
{ str_lit("linux_arm64"), &target_linux_arm64 }, { str_lit("linux_arm64"), &target_linux_arm64 },
{ str_lit("windows_386"), &target_windows_386 }, { str_lit("windows_i386"), &target_windows_i386 },
{ str_lit("windows_amd64"), &target_windows_amd64 }, { str_lit("windows_amd64"), &target_windows_amd64 },
{ str_lit("freebsd_386"), &target_freebsd_386 }, { str_lit("freebsd_i386"), &target_freebsd_i386 },
{ str_lit("freebsd_amd64"), &target_freebsd_amd64 }, { str_lit("freebsd_amd64"), &target_freebsd_amd64 },
{ str_lit("freestanding_wasm32"), &target_freestanding_wasm32 }, { str_lit("freestanding_wasm32"), &target_freestanding_wasm32 },
{ str_lit("wasi_wasm32"), &target_wasi_wasm32 }, { str_lit("wasi_wasm32"), &target_wasi_wasm32 },
@@ -879,13 +879,13 @@ void init_build_context(TargetMetrics *cross_target) {
#endif #endif
#else #else
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
metrics = &target_windows_386; metrics = &target_windows_i386;
#elif defined(GB_SYSTEM_OSX) #elif defined(GB_SYSTEM_OSX)
#error "Build Error: Unsupported architecture" #error "Build Error: Unsupported architecture"
#elif defined(GB_SYSTEM_FREEBSD) #elif defined(GB_SYSTEM_FREEBSD)
metrics = &target_freebsd_386; metrics = &target_freebsd_i386;
#else #else
metrics = &target_linux_386; metrics = &target_linux_i386;
#endif #endif
#endif #endif
@@ -932,7 +932,7 @@ void init_build_context(TargetMetrics *cross_target) {
bc->link_flags = str_lit("-arch x86-64 "); bc->link_flags = str_lit("-arch x86-64 ");
break; break;
} }
} else if (bc->metrics.arch == TargetArch_386) { } else if (bc->metrics.arch == TargetArch_i386) {
switch (bc->metrics.os) { switch (bc->metrics.os) {
case TargetOs_windows: case TargetOs_windows:
bc->link_flags = str_lit("/machine:x86 "); bc->link_flags = str_lit("/machine:x86 ");
src/check_builtin.cpp
+1 -1
View File
@@ -3225,7 +3225,7 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
case TargetOs_essence: case TargetOs_essence:
case TargetOs_freebsd: case TargetOs_freebsd:
switch (build_context.metrics.arch) { switch (build_context.metrics.arch) {
case TargetArch_386: case TargetArch_i386:
case TargetArch_amd64: case TargetArch_amd64:
case TargetArch_arm64: case TargetArch_arm64:
max_arg_count = 7; max_arg_count = 7;
src/llvm_abi.cpp
+1 -1
View File
@@ -1193,7 +1193,7 @@ LB_ABI_INFO(lb_get_abi_info) {
} else { } else {
return lbAbiAmd64SysV::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); return lbAbiAmd64SysV::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
} }
case TargetArch_386: case TargetArch_i386:
return lbAbi386::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); return lbAbi386::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
case TargetArch_arm64: case TargetArch_arm64:
return lbAbiArm64::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); return lbAbiArm64::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
src/llvm_backend.cpp
+2 -2
View File
@@ -783,7 +783,7 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime)
params->Tuple.variables[1] = alloc_entity_param(nullptr, make_token_ident("fdwReason"), t_u32, false, true); params->Tuple.variables[1] = alloc_entity_param(nullptr, make_token_ident("fdwReason"), t_u32, false, true);
params->Tuple.variables[2] = alloc_entity_param(nullptr, make_token_ident("lpReserved"), t_rawptr, false, true); params->Tuple.variables[2] = alloc_entity_param(nullptr, make_token_ident("lpReserved"), t_rawptr, false, true);
call_cleanup = false; call_cleanup = false;
} else if (build_context.metrics.os == TargetOs_windows && (build_context.metrics.arch == TargetArch_386 || build_context.no_crt)) { } else if (build_context.metrics.os == TargetOs_windows && (build_context.metrics.arch == TargetArch_i386 || build_context.no_crt)) {
name = str_lit("mainCRTStartup"); name = str_lit("mainCRTStartup");
} else if (is_arch_wasm()) { } else if (is_arch_wasm()) {
name = str_lit("_start"); name = str_lit("_start");
@@ -1140,7 +1140,7 @@ void lb_generate_code(lbGenerator *gen) {
switch (build_context.metrics.arch) { switch (build_context.metrics.arch) {
case TargetArch_amd64: case TargetArch_amd64:
case TargetArch_386: case TargetArch_i386:
LLVMInitializeX86TargetInfo(); LLVMInitializeX86TargetInfo();
LLVMInitializeX86Target(); LLVMInitializeX86Target();
LLVMInitializeX86TargetMC(); LLVMInitializeX86TargetMC();
src/llvm_backend_expr.cpp
+1 -1
View File
@@ -508,7 +508,7 @@ bool lb_is_matrix_simdable(Type *t) {
case TargetArch_arm64: case TargetArch_arm64:
// TODO(bill): determine when this is fine // TODO(bill): determine when this is fine
return true; return true;
case TargetArch_386: case TargetArch_i386:
case TargetArch_wasm32: case TargetArch_wasm32:
case TargetArch_wasm64: case TargetArch_wasm64:
return false; return false;
src/llvm_backend_proc.cpp
+2 -2
View File
@@ -1361,7 +1361,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
} }
case BuiltinProc_cpu_relax: case BuiltinProc_cpu_relax:
if (build_context.metrics.arch == TargetArch_386 || if (build_context.metrics.arch == TargetArch_i386 ||
build_context.metrics.arch == TargetArch_amd64) { build_context.metrics.arch == TargetArch_amd64) {
LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false);
LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("pause"), {}); LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("pause"), {});
@@ -2018,7 +2018,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints));
} }
break; break;
case TargetArch_386: case TargetArch_i386:
{ {
GB_ASSERT(arg_count <= 7); GB_ASSERT(arg_count <= 7);
src/llvm_backend_utility.cpp
+1 -1
View File
@@ -1494,7 +1494,7 @@ lbValue lb_emit_mul_add(lbProcedure *p, lbValue a, lbValue b, lbValue c, Type *t
case TargetArch_arm64: case TargetArch_arm64:
// possible // possible
break; break;
case TargetArch_386: case TargetArch_i386:
case TargetArch_wasm32: case TargetArch_wasm32:
case TargetArch_wasm64: case TargetArch_wasm64:
is_possible = false; is_possible = false;
src/microsoft_craziness.h
+5 -5
View File
@@ -460,7 +460,7 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
wchar_t *library_path = nullptr; wchar_t *library_path = nullptr;
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
library_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\lib\\x64\\"); library_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\lib\\x64\\");
} else if (build_context.metrics.arch == TargetArch_386) { } else if (build_context.metrics.arch == TargetArch_i386) {
library_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\lib\\x86\\"); library_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\lib\\x86\\");
} else { } else {
continue; continue;
@@ -472,7 +472,7 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
wchar_t *link_exe_path = nullptr; wchar_t *link_exe_path = nullptr;
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
link_exe_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\bin\\Hostx64\\x64\\"); link_exe_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\bin\\Hostx64\\x64\\");
} else if (build_context.metrics.arch == TargetArch_386) { } else if (build_context.metrics.arch == TargetArch_i386) {
link_exe_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\bin\\Hostx86\\x86\\"); link_exe_path = concat(bstr_inst_path, L"\\VC\\Tools\\MSVC\\", version, L"\\bin\\Hostx86\\x86\\");
} else { } else {
continue; continue;
@@ -529,7 +529,7 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
lib_path = concat(buffer, L"VC\\Lib\\amd64\\"); lib_path = concat(buffer, L"VC\\Lib\\amd64\\");
} else if (build_context.metrics.arch == TargetArch_386) { } else if (build_context.metrics.arch == TargetArch_i386) {
lib_path = concat(buffer, L"VC\\Lib\\"); lib_path = concat(buffer, L"VC\\Lib\\");
} else { } else {
continue; continue;
@@ -542,7 +542,7 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
if (os_file_exists(vcruntime_filename)) { if (os_file_exists(vcruntime_filename)) {
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
result->vs_exe_path = concat(buffer, L"VC\\bin\\"); result->vs_exe_path = concat(buffer, L"VC\\bin\\");
} else if (build_context.metrics.arch == TargetArch_386) { } else if (build_context.metrics.arch == TargetArch_i386) {
// result->vs_exe_path = concat(buffer, L"VC\\bin\\amd64_x86\\"); // result->vs_exe_path = concat(buffer, L"VC\\bin\\amd64_x86\\");
result->vs_exe_path = concat(buffer, L"VC\\bin\\x86_amd64\\"); result->vs_exe_path = concat(buffer, L"VC\\bin\\x86_amd64\\");
} else { } else {
@@ -573,7 +573,7 @@ Find_Result find_visual_studio_and_windows_sdk() {
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x64\\"); result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x64\\");
result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x64\\"); result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x64\\");
} else if (build_context.metrics.arch == TargetArch_386) { } else if (build_context.metrics.arch == TargetArch_i386) {
result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x86\\"); result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x86\\");
result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x86\\"); result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x86\\");
} }