[[ lc-compile ]] Update builtin types for shim generation

montegoulding · montegoulding · commit ecd65ebdf6f8 · 2019-04-22T19:52:51.000+10:00
diff --git a/libscript/include/libscript/script.h b/libscript/include/libscript/script.h
@@ -478,6 +478,9 @@ enum MCScriptForeignPrimitiveType
     kMCScriptForeignPrimitiveTypeCDouble,
     kMCScriptForeignPrimitiveTypeSInt,
     kMCScriptForeignPrimitiveTypeUInt,
+    kMCScriptForeignPrimitiveTypeNaturalUInt,
+    kMCScriptForeignPrimitiveTypeNaturalSInt,
+    kMCScriptForeignPrimitiveTypeNaturalFloat,
 };
 
 MCScriptForeignPrimitiveType MCScriptQueryForeignHandlerReturnTypeInModule(MCScriptModuleBuilderRef build, uindex_t type_index);
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1942,24 +1942,38 @@ MCScriptMapTypeToForeignPrimitiveTypeInModule(MCScriptModuleBuilderRef self, uin
             { "CSChar", kMCScriptForeignPrimitiveTypeCSChar },
             { "CUChar", kMCScriptForeignPrimitiveTypeCUChar },
             { "CSShort", kMCScriptForeignPrimitiveTypeCSShort },
+            { "CShort", kMCScriptForeignPrimitiveTypeCSShort },
             { "CUShort", kMCScriptForeignPrimitiveTypeCUShort },
             { "CSInt", kMCScriptForeignPrimitiveTypeCSInt },
+            { "CInt", kMCScriptForeignPrimitiveTypeCSInt },
             { "CUInt", kMCScriptForeignPrimitiveTypeCUInt },
             { "CSLong", kMCScriptForeignPrimitiveTypeCSLong },
+            { "CLong", kMCScriptForeignPrimitiveTypeCSLong },
             { "CULong", kMCScriptForeignPrimitiveTypeCULong },
-            { "CULongLong", kMCScriptForeignPrimitiveTypeCSLongLong },
+            { "CSLongLong", kMCScriptForeignPrimitiveTypeCSLongLong },
+            { "CLongLong", kMCScriptForeignPrimitiveTypeCSLongLong },
             { "CULongLong", kMCScriptForeignPrimitiveTypeCULongLong },
             { "CDouble", kMCScriptForeignPrimitiveTypeCDouble },
             { "CFloat", kMCScriptForeignPrimitiveTypeCFloat },
             { "LCSInt", kMCScriptForeignPrimitiveTypeSInt },
+            { "LCInt", kMCScriptForeignPrimitiveTypeSInt },
+            { "LCIndex", kMCScriptForeignPrimitiveTypeSInt },
             { "LCUInt", kMCScriptForeignPrimitiveTypeUInt },
+            { "LCUIndex", kMCScriptForeignPrimitiveTypeUInt },
             
             { "Float32", kMCScriptForeignPrimitiveTypeFloat32 },
             { "Float64", kMCScriptForeignPrimitiveTypeFloat64 },
             
             { "Pointer", kMCScriptForeignPrimitiveTypePointer },
             
+            { "ZStringNative", kMCScriptForeignPrimitiveTypePointer },
             { "ZStringUTF8", kMCScriptForeignPrimitiveTypePointer },
+            { "ZStringUTF16", kMCScriptForeignPrimitiveTypePointer },
+            
+            /* Natural Types */
+            { "NaturalUInt", kMCScriptForeignPrimitiveTypeNaturalUInt },
+            { "NaturalSInt", kMCScriptForeignPrimitiveTypeNaturalSInt },
+            { "NaturalFloat", kMCScriptForeignPrimitiveTypeNaturalFloat },
             
             /* Java FFI Types */
             { "JObject", kMCScriptForeignPrimitiveTypePointer },
diff --git a/toolchain/lc-compile/src/emit.cpp b/toolchain/lc-compile/src/emit.cpp
@@ -441,6 +441,9 @@ static struct { MCScriptForeignPrimitiveType type; const char *ctype; } s_primit
     DEFINE_PRIMITIVE_TYPE_MAPPING(CDouble, double)
     DEFINE_PRIMITIVE_TYPE_MAPPING(SInt, int32_t)
     DEFINE_PRIMITIVE_TYPE_MAPPING(UInt, uint32_t)
+    DEFINE_PRIMITIVE_TYPE_MAPPING(NaturalUInt, natural_uint_t)
+    DEFINE_PRIMITIVE_TYPE_MAPPING(NaturalSInt, natural_sint_t)
+    DEFINE_PRIMITIVE_TYPE_MAPPING(NaturalFloat, natural_float_t)
 };
 
 #undef DEFINE_PRIMITIVE_TYPE_MAPPING
@@ -584,7 +587,16 @@ static bool EmitEmittedBuiltins(void)
 
 static const char *kOutputCDefinitions =
     "#include <stdint.h>\n"
-    "#include <stddef.h>\n"
+    "#include <stddef.h>\n\n"
+    "#if UINTPTR_MAX == 0xffffffff\n"
+    "typedef uint32_t natural_uint_t;\n"
+    "typedef int32_t natural_sint_t;\n"
+    "typedef float natural_float_t;\n"
+    "#elif UINTPTR_MAX == 0xffffffffffffffff\n"
+    "typedef uint64_t natural_uint_t;\n"
+    "typedef int64_t natural_sint_t;\n"
+    "typedef double natural_float_t;\n"
+    "#endif\n\n"
     "typedef void (*__builtin_shim_type)(void*, void**);\n"
     "struct __builtin_module_info\n"
     "{\n"
