entity parameter tree equipment; architecture -> arch

src/base/base_core.c

@@ -399,23 +399,23 @@ txt_rng_contains(TxtRng r, TxtPt pt)
 //~ rjf: Toolchain/Environment Enum Functions
 
 internal U64
-bit_size_from_arch(Architecture arch)
+bit_size_from_arch(Arch arch)
 {
   // TODO(rjf): metacode
   U64 arch_bitsize = 0;
   switch(arch)
   {
-    case Architecture_x64:   arch_bitsize = 64; break;
-    case Architecture_x86:   arch_bitsize = 32; break;
-    case Architecture_arm64: arch_bitsize = 64; break;
-    case Architecture_arm32: arch_bitsize = 32; break;
+    case Arch_x64:   arch_bitsize = 64; break;
+    case Arch_x86:   arch_bitsize = 32; break;
+    case Arch_arm64: arch_bitsize = 64; break;
+    case Arch_arm32: arch_bitsize = 32; break;
     default: break;
   }
   return arch_bitsize;
 }
 
 internal U64
-max_instruction_size_from_arch(Architecture arch)
+max_instruction_size_from_arch(Arch arch)
 {
   // TODO(rjf): make this real
   return 64;
@@ -434,17 +434,17 @@ operating_system_from_context(void){
   return os;
 }
 
-internal Architecture
-architecture_from_context(void){
-  Architecture arch = Architecture_Null;
+internal Arch
+arch_from_context(void){
+  Arch arch = Arch_Null;
 #if ARCH_X64
-  arch = Architecture_x64;
+  arch = Arch_x64;
 #elif ARCH_X86
-  arch = Architecture_x86;
+  arch = Arch_x86;
 #elif ARCH_ARM64
-  arch = Architecture_arm64;
+  arch = Arch_arm64;
 #elif ARCH_ARM32
-  arch = Architecture_arm32;
+  arch = Arch_arm32;
 #endif
   return arch;
 }

src/base/base_core.h

@@ -439,16 +439,16 @@ typedef enum OperatingSystem
 }
 OperatingSystem;
 
-typedef enum Architecture
+typedef enum Arch
 {
-  Architecture_Null,
-  Architecture_x64,
-  Architecture_x86,
-  Architecture_arm64,
-  Architecture_arm32,
-  Architecture_COUNT,
+  Arch_Null,
+  Arch_x64,
+  Arch_x86,
+  Arch_arm64,
+  Arch_arm32,
+  Arch_COUNT,
 }
-Architecture;
+Arch;
 
 typedef enum Compiler
 {
@@ -779,11 +779,11 @@ internal B32 txt_rng_contains(TxtRng r, TxtPt pt);
 ////////////////////////////////
 //~ rjf: Toolchain/Environment Enum Functions
 
-internal U64 bit_size_from_arch(Architecture arch);
-internal U64 max_instruction_size_from_arch(Architecture arch);
+internal U64 bit_size_from_arch(Arch arch);
+internal U64 max_instruction_size_from_arch(Arch arch);
 
 internal OperatingSystem operating_system_from_context(void);
-internal Architecture architecture_from_context(void);
+internal Arch arch_from_context(void);
 internal Compiler compiler_from_context(void);
 
 ////////////////////////////////

src/base/base_strings.c

@@ -1459,7 +1459,7 @@ string_from_operating_system(OperatingSystem os){
 }
 
 internal String8
-string_from_architecture(Architecture arch){
+string_from_arch(Arch arch){
   local_persist String8 strings[] = {
     str8_lit_comp("Null"),
     str8_lit_comp("x64"),
@@ -1468,7 +1468,7 @@ string_from_architecture(Architecture arch){
     str8_lit_comp("arm32"),
   };
   String8 result = str8_lit("error");
-  if (arch < Architecture_COUNT){
+  if (arch < Arch_COUNT){
     result = strings[arch];
   }
   return(result);

src/base/base_strings.h

@@ -315,7 +315,7 @@ internal String32 str32_from_8(Arena *arena, String8 in);
 internal String8 string_from_dimension(Dimension dimension);
 internal String8 string_from_side(Side side);
 internal String8 string_from_operating_system(OperatingSystem os);
-internal String8 string_from_architecture(Architecture arch);
+internal String8 string_from_arch(Arch arch);
 
 ////////////////////////////////
 //~ rjf: Time Types -> String