mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'llvm-3.9'

Browse Source
This commit is contained in:
Andrew Kelley 2016-09-05 16:19:20 -04:00
commit e8e2d84689
10 changed files with 281 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -70,8 +70,8 @@ compromises backward compatibility.
### Dependencies ### Dependencies
* cmake >= 2.8.5 * cmake >= 2.8.5
* LLVM == 3.8.0 * LLVM == 3.9.x
* libclang == 3.8.0 * libclang == 3.9.x
### Debug / Development Build ### Debug / Development Build

4
cmake/Findclang.cmake
View File

@ -8,14 +8,14 @@
find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
PATHS PATHS
/usr/lib/llvm-3.8/include /usr/lib/llvm-3.9/include
/mingw64/include) /mingw64/include)
macro(FIND_AND_ADD_CLANG_LIB _libname_) macro(FIND_AND_ADD_CLANG_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
PATHS PATHS
/usr/lib/llvm-3.8/lib /usr/lib/llvm-3.9/lib
/mingw64/lib) /mingw64/lib)
if(CLANG_${_prettylibname_}_LIB) if(CLANG_${_prettylibname_}_LIB)
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB})

2
cmake/Findllvm.cmake
View File

@ -7,7 +7,7 @@
# LLVM_LIBRARIES # LLVM_LIBRARIES
# LLVM_LIBDIRS # LLVM_LIBDIRS
find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.8) find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.9)
execute_process( execute_process(
COMMAND ${LLVM_CONFIG_EXE} --libs COMMAND ${LLVM_CONFIG_EXE} --libs

1
src/all_types.hpp
View File

@ -1336,6 +1336,7 @@ struct VariableTableEntry {
BlockContext *block_context; BlockContext *block_context;
LLVMValueRef param_value_ref; LLVMValueRef param_value_ref;
bool force_depends_on_compile_var; bool force_depends_on_compile_var;
ImportTableEntry *import;
}; };
struct ErrorTableEntry { struct ErrorTableEntry {

3
src/analyze.cpp
View File

@ -3757,6 +3757,7 @@ static VariableTableEntry *add_local_var(CodeGen *g, AstNode *source_node, Impor
VariableTableEntry *variable_entry = allocate<VariableTableEntry>(1); VariableTableEntry *variable_entry = allocate<VariableTableEntry>(1);
variable_entry->type = type_entry; variable_entry->type = type_entry;
variable_entry->block_context = context; variable_entry->block_context = context;
variable_entry->import = import;
if (name) { if (name) {
buf_init_from_buf(&variable_entry->name, name); buf_init_from_buf(&variable_entry->name, name);
@ -6025,7 +6026,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
int *field_use_counts = nullptr; int *field_use_counts = nullptr;
HashMap<int, AstNode *, int_hash, int_eq> err_use_nodes; HashMap<int, AstNode *, int_hash, int_eq> err_use_nodes = {};
if (expr_type->id == TypeTableEntryIdEnum) { if (expr_type->id == TypeTableEntryIdEnum) {
field_use_counts = allocate<int>(expr_type->data.enumeration.field_count); field_use_counts = allocate<int>(expr_type->data.enumeration.field_count);
} else if (expr_type->id == TypeTableEntryIdErrorUnion) { } else if (expr_type->id == TypeTableEntryIdErrorUnion) {

53
src/codegen.cpp
View File

@ -2757,7 +2757,7 @@ static LLVMValueRef gen_if_var_expr(CodeGen *g, AstNode *node) {
static LLVMValueRef gen_block(CodeGen *g, AstNode *block_node, TypeTableEntry *implicit_return_type) { static LLVMValueRef gen_block(CodeGen *g, AstNode *block_node, TypeTableEntry *implicit_return_type) {
assert(block_node->type == NodeTypeBlock); assert(block_node->type == NodeTypeBlock);
LLVMValueRef return_value; LLVMValueRef return_value = nullptr;
for (int i = 0; i < block_node->data.block.statements.length; i += 1) { for (int i = 0; i < block_node->data.block.statements.length; i += 1) {
AstNode *statement_node = block_node->data.block.statements.at(i); AstNode *statement_node = block_node->data.block.statements.at(i);
return_value = gen_expr(g, statement_node); return_value = gen_expr(g, statement_node);
@ -3301,7 +3301,7 @@ static LLVMValueRef gen_var_decl_expr(CodeGen *g, AstNode *node) {
} }
} }
LLVMValueRef init_val; LLVMValueRef init_val = nullptr;
TypeTableEntry *init_val_type; TypeTableEntry *init_val_type;
return gen_var_decl_raw(g, node, &node->data.variable_declaration, false, &init_val, &init_val_type, false); return gen_var_decl_raw(g, node, &node->data.variable_declaration, false, &init_val, &init_val_type, false);
} }
@ -3954,6 +3954,19 @@ static void build_label_blocks(CodeGen *g, FnTableEntry *fn) {
LLVMPositionBuilderAtEnd(g->builder, entry_block); LLVMPositionBuilderAtEnd(g->builder, entry_block);
} }
static void gen_global_var(CodeGen *g, VariableTableEntry *var, LLVMValueRef init_val,
TypeTableEntry *type_entry)
{
assert(var->is_const);
assert(var->import);
assert(type_entry);
bool is_local_to_unit = true;
LLVMZigCreateGlobalVariable(g->dbuilder,
var->block_context->di_scope, buf_ptr(&var->name),
buf_ptr(&var->name), var->import->di_file, var->decl_node->line + 1,
type_entry->di_type, is_local_to_unit, init_val);
}
static void do_code_gen(CodeGen *g) { static void do_code_gen(CodeGen *g) {
assert(!g->errors.length); assert(!g->errors.length);
@ -3967,10 +3980,29 @@ static void do_code_gen(CodeGen *g) {
for (int i = 0; i < g->global_vars.length; i += 1) { for (int i = 0; i < g->global_vars.length; i += 1) {
VariableTableEntry *var = g->global_vars.at(i); VariableTableEntry *var = g->global_vars.at(i);
if (var->type->id == TypeTableEntryIdNumLitFloat || if (var->type->id == TypeTableEntryIdNumLitFloat) {
var->type->id == TypeTableEntryIdNumLitInt || // Generate debug info for it but that's it.
!type_has_bits(var->type)) ConstExprValue *const_val = &get_resolved_expr(var->val_node)->const_val;
{ assert(const_val->ok);
TypeTableEntry *var_type = g->builtin_types.entry_f64;
LLVMValueRef init_val = LLVMConstReal(var_type->type_ref, const_val->data.x_bignum.data.x_float);
gen_global_var(g, var, init_val, var_type);
continue;
}
if (var->type->id == TypeTableEntryIdNumLitInt) {
// Generate debug info for it but that's it.
ConstExprValue *const_val = &get_resolved_expr(var->val_node)->const_val;
assert(const_val->ok);
TypeTableEntry *var_type = const_val->data.x_bignum.is_negative ?
g->builtin_types.entry_isize : g->builtin_types.entry_usize;
LLVMValueRef init_val = LLVMConstInt(var_type->type_ref,
bignum_to_twos_complement(&const_val->data.x_bignum), false);
gen_global_var(g, var, init_val, var_type);
continue;
}
if (!type_has_bits(var->type)) {
continue; continue;
} }
@ -3981,6 +4013,8 @@ static void do_code_gen(CodeGen *g) {
if (var->decl_node->data.variable_declaration.is_extern) { if (var->decl_node->data.variable_declaration.is_extern) {
global_value = LLVMAddGlobal(g->module, var->type->type_ref, buf_ptr(&var->name)); global_value = LLVMAddGlobal(g->module, var->type->type_ref, buf_ptr(&var->name));
// TODO debug info for the extern variable
LLVMSetLinkage(global_value, LLVMExternalLinkage); LLVMSetLinkage(global_value, LLVMExternalLinkage);
} else { } else {
AstNode *expr_node = var->decl_node->data.variable_declaration.expr; AstNode *expr_node = var->decl_node->data.variable_declaration.expr;
@ -3999,6 +4033,11 @@ static void do_code_gen(CodeGen *g) {
LLVMSetInitializer(global_value, init_val); LLVMSetInitializer(global_value, init_val);
LLVMSetLinkage(global_value, LLVMInternalLinkage); LLVMSetLinkage(global_value, LLVMInternalLinkage);
LLVMSetUnnamedAddr(global_value, true); LLVMSetUnnamedAddr(global_value, true);
// TODO debug info for function pointers
if (var->is_const && var->type->id != TypeTableEntryIdFn) {
gen_global_var(g, var, init_val, var->type);
}
} }
LLVMSetGlobalConstant(global_value, var->is_const); LLVMSetGlobalConstant(global_value, var->is_const);
@ -4847,7 +4886,7 @@ static void init(CodeGen *g, Buf *source_path) {
g->target_machine = LLVMCreateTargetMachine(target_ref, buf_ptr(&g->triple_str), g->target_machine = LLVMCreateTargetMachine(target_ref, buf_ptr(&g->triple_str),
target_specific_cpu_args, target_specific_features, opt_level, reloc_mode, LLVMCodeModelDefault); target_specific_cpu_args, target_specific_features, opt_level, reloc_mode, LLVMCodeModelDefault);
g->target_data_ref = LLVMGetTargetMachineData(g->target_machine); g->target_data_ref = LLVMCreateTargetDataLayout(g->target_machine);
char *layout_str = LLVMCopyStringRepOfTargetData(g->target_data_ref); char *layout_str = LLVMCopyStringRepOfTargetData(g->target_data_ref);
LLVMSetDataLayout(g->module, layout_str); LLVMSetDataLayout(g->module, layout_str);

77
src/parseh.cpp
View File

@ -408,25 +408,7 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const
case BuiltinType::ObjCId: case BuiltinType::ObjCId:
case BuiltinType::ObjCClass: case BuiltinType::ObjCClass:
case BuiltinType::ObjCSel: case BuiltinType::ObjCSel:
case BuiltinType::OCLImage1d:
case BuiltinType::OCLImage1dArray:
case BuiltinType::OCLImage1dBuffer:
case BuiltinType::OCLImage2d:
case BuiltinType::OCLImage2dArray:
case BuiltinType::OCLImage2dArrayDepth:
case BuiltinType::OCLImage2dDepth:
case BuiltinType::OCLImage2dMSAA:
case BuiltinType::OCLImage2dArrayMSAA:
case BuiltinType::OCLImage2dMSAADepth:
case BuiltinType::OCLImage2dArrayMSAADepth:
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLNDRange:
case BuiltinType::OCLReserveID:
case BuiltinType::OMPArraySection: case BuiltinType::OMPArraySection:
case BuiltinType::OCLImage3d:
case BuiltinType::OCLSampler:
case BuiltinType::OCLEvent:
case BuiltinType::Dependent: case BuiltinType::Dependent:
case BuiltinType::Overload: case BuiltinType::Overload:
case BuiltinType::BoundMember: case BuiltinType::BoundMember:
@ -434,6 +416,50 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const
case BuiltinType::UnknownAny: case BuiltinType::UnknownAny:
case BuiltinType::BuiltinFn: case BuiltinType::BuiltinFn:
case BuiltinType::ARCUnbridgedCast: case BuiltinType::ARCUnbridgedCast:
case BuiltinType::OCLImage1dRO:
case BuiltinType::OCLImage1dArrayRO:
case BuiltinType::OCLImage1dBufferRO:
case BuiltinType::OCLImage2dRO:
case BuiltinType::OCLImage2dArrayRO:
case BuiltinType::OCLImage2dDepthRO:
case BuiltinType::OCLImage2dArrayDepthRO:
case BuiltinType::OCLImage2dMSAARO:
case BuiltinType::OCLImage2dArrayMSAARO:
case BuiltinType::OCLImage2dMSAADepthRO:
case BuiltinType::OCLImage2dArrayMSAADepthRO:
case BuiltinType::OCLImage3dRO:
case BuiltinType::OCLImage1dWO:
case BuiltinType::OCLImage1dArrayWO:
case BuiltinType::OCLImage1dBufferWO:
case BuiltinType::OCLImage2dWO:
case BuiltinType::OCLImage2dArrayWO:
case BuiltinType::OCLImage2dDepthWO:
case BuiltinType::OCLImage2dArrayDepthWO:
case BuiltinType::OCLImage2dMSAAWO:
case BuiltinType::OCLImage2dArrayMSAAWO:
case BuiltinType::OCLImage2dMSAADepthWO:
case BuiltinType::OCLImage2dArrayMSAADepthWO:
case BuiltinType::OCLImage3dWO:
case BuiltinType::OCLImage1dRW:
case BuiltinType::OCLImage1dArrayRW:
case BuiltinType::OCLImage1dBufferRW:
case BuiltinType::OCLImage2dRW:
case BuiltinType::OCLImage2dArrayRW:
case BuiltinType::OCLImage2dDepthRW:
case BuiltinType::OCLImage2dArrayDepthRW:
case BuiltinType::OCLImage2dMSAARW:
case BuiltinType::OCLImage2dArrayMSAARW:
case BuiltinType::OCLImage2dMSAADepthRW:
case BuiltinType::OCLImage2dArrayMSAADepthRW:
case BuiltinType::OCLImage3dRW:
case BuiltinType::Float128:
case BuiltinType::OCLSampler:
case BuiltinType::OCLEvent:
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLNDRange:
case BuiltinType::OCLReserveID:
emit_warning(c, decl, "missed a builtin type"); emit_warning(c, decl, "missed a builtin type");
return c->codegen->builtin_types.entry_invalid; return c->codegen->builtin_types.entry_invalid;
} }
@ -554,8 +580,17 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const
case CC_SpirFunction: // default for OpenCL functions on SPIR target case CC_SpirFunction: // default for OpenCL functions on SPIR target
emit_warning(c, decl, "function type has SPIR function calling convention"); emit_warning(c, decl, "function type has SPIR function calling convention");
return c->codegen->builtin_types.entry_invalid; return c->codegen->builtin_types.entry_invalid;
case CC_SpirKernel: // inferred for OpenCL kernels on SPIR target case CC_OpenCLKernel:
emit_warning(c, decl, "function type has SPIR kernel calling convention"); emit_warning(c, decl, "function type has OpenCLKernel calling convention");
return c->codegen->builtin_types.entry_invalid;
case CC_Swift:
emit_warning(c, decl, "function type has Swift calling convention");
return c->codegen->builtin_types.entry_invalid;
case CC_PreserveMost:
emit_warning(c, decl, "function type has PreserveMost calling convention");
return c->codegen->builtin_types.entry_invalid;
case CC_PreserveAll:
emit_warning(c, decl, "function type has PreserveAll calling convention");
return c->codegen->builtin_types.entry_invalid; return c->codegen->builtin_types.entry_invalid;
} }
@ -1170,7 +1205,7 @@ static void visit_var_decl(Context *c, const VarDecl *var_decl) {
emit_warning(c, var_decl, "ignoring variable '%s' - unable to evaluate initializer\n", buf_ptr(name)); emit_warning(c, var_decl, "ignoring variable '%s' - unable to evaluate initializer\n", buf_ptr(name));
return; return;
} }
AstNode *init_node; AstNode *init_node = nullptr;
switch (ap_value->getKind()) { switch (ap_value->getKind()) {
case APValue::Int: case APValue::Int:
{ {

111
src/target.cpp
View File

@ -15,6 +15,8 @@ static const ArchType arch_list[] = {
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v8_2a}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v8_2a},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v8_1a}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v8_1a},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v8}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v8},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v8m_baseline},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v8m_mainline},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v7}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v7},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v7em}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v7em},
{ZigLLVM_arm, ZigLLVM_ARMSubArch_v7m}, {ZigLLVM_arm, ZigLLVM_ARMSubArch_v7m},
@ -71,8 +73,11 @@ static const ArchType arch_list[] = {
{ZigLLVM_kalimba, ZigLLVM_KalimbaSubArch_v5}, {ZigLLVM_kalimba, ZigLLVM_KalimbaSubArch_v5},
{ZigLLVM_shave, ZigLLVM_NoSubArch}, {ZigLLVM_shave, ZigLLVM_NoSubArch},
{ZigLLVM_lanai, ZigLLVM_NoSubArch},
{ZigLLVM_wasm32, ZigLLVM_NoSubArch}, {ZigLLVM_wasm32, ZigLLVM_NoSubArch},
{ZigLLVM_wasm64, ZigLLVM_NoSubArch}, {ZigLLVM_wasm64, ZigLLVM_NoSubArch},
{ZigLLVM_renderscript32, ZigLLVM_NoSubArch},
{ZigLLVM_renderscript64, ZigLLVM_NoSubArch},
}; };
static const ZigLLVM_VendorType vendor_list[] = { static const ZigLLVM_VendorType vendor_list[] = {
@ -88,6 +93,8 @@ static const ZigLLVM_VendorType vendor_list[] = {
ZigLLVM_NVIDIA, ZigLLVM_NVIDIA,
ZigLLVM_CSR, ZigLLVM_CSR,
ZigLLVM_Myriad, ZigLLVM_Myriad,
ZigLLVM_AMD,
ZigLLVM_Mesa,
}; };
static const ZigLLVM_OSType os_list[] = { static const ZigLLVM_OSType os_list[] = {
@ -119,10 +126,12 @@ static const ZigLLVM_OSType os_list[] = {
ZigLLVM_ELFIAMCU, ZigLLVM_ELFIAMCU,
ZigLLVM_TvOS, ZigLLVM_TvOS,
ZigLLVM_WatchOS, ZigLLVM_WatchOS,
ZigLLVM_Mesa3D,
}; };
static const ZigLLVM_EnvironmentType environ_list[] = { static const ZigLLVM_EnvironmentType environ_list[] = {
ZigLLVM_GNU, ZigLLVM_GNU,
ZigLLVM_GNUABI64,
ZigLLVM_GNUEABI, ZigLLVM_GNUEABI,
ZigLLVM_GNUEABIHF, ZigLLVM_GNUEABIHF,
ZigLLVM_GNUX32, ZigLLVM_GNUX32,
@ -130,6 +139,9 @@ static const ZigLLVM_EnvironmentType environ_list[] = {
ZigLLVM_EABI, ZigLLVM_EABI,
ZigLLVM_EABIHF, ZigLLVM_EABIHF,
ZigLLVM_Android, ZigLLVM_Android,
ZigLLVM_Musl,
ZigLLVM_MuslEABI,
ZigLLVM_MuslEABIHF,
ZigLLVM_MSVC, ZigLLVM_MSVC,
ZigLLVM_Itanium, ZigLLVM_Itanium,
ZigLLVM_Cygnus, ZigLLVM_Cygnus,
@ -289,42 +301,73 @@ void resolve_target_object_format(ZigTarget *target) {
if (target->oformat != ZigLLVM_UnknownObjectFormat) { if (target->oformat != ZigLLVM_UnknownObjectFormat) {
return; return;
} }
switch (target->arch.arch) { switch (target->arch.arch) {
default: case ZigLLVM_UnknownArch:
break; case ZigLLVM_aarch64:
case ZigLLVM_hexagon: case ZigLLVM_arm:
case ZigLLVM_mips: case ZigLLVM_thumb:
case ZigLLVM_mipsel: case ZigLLVM_x86:
case ZigLLVM_mips64: case ZigLLVM_x86_64:
case ZigLLVM_mips64el: if (is_os_darwin(target)) {
case ZigLLVM_r600: target->oformat = ZigLLVM_MachO;
case ZigLLVM_amdgcn: } else if (target->os == ZigLLVM_Win32) {
case ZigLLVM_sparc: target->oformat = ZigLLVM_COFF;
case ZigLLVM_sparcv9: } else {
case ZigLLVM_systemz: target->oformat = ZigLLVM_ELF;
case ZigLLVM_xcore: }
case ZigLLVM_ppc64le:
target->oformat = ZigLLVM_ELF;
return;
case ZigLLVM_ppc:
case ZigLLVM_ppc64:
if (is_os_darwin(target)) {
target->oformat = ZigLLVM_MachO;
return; return;
}
target->oformat = ZigLLVM_ELF;
return;
}
if (is_os_darwin(target)) { case ZigLLVM_aarch64_be:
target->oformat = ZigLLVM_MachO; case ZigLLVM_amdgcn:
return; case ZigLLVM_amdil:
} else if (target->os == ZigLLVM_Win32) { case ZigLLVM_amdil64:
target->oformat = ZigLLVM_COFF; case ZigLLVM_armeb:
return; case ZigLLVM_avr:
case ZigLLVM_bpfeb:
case ZigLLVM_bpfel:
case ZigLLVM_hexagon:
case ZigLLVM_lanai:
case ZigLLVM_hsail:
case ZigLLVM_hsail64:
case ZigLLVM_kalimba:
case ZigLLVM_le32:
case ZigLLVM_le64:
case ZigLLVM_mips:
case ZigLLVM_mips64:
case ZigLLVM_mips64el:
case ZigLLVM_mipsel:
case ZigLLVM_msp430:
case ZigLLVM_nvptx:
case ZigLLVM_nvptx64:
case ZigLLVM_ppc64le:
case ZigLLVM_r600:
case ZigLLVM_renderscript32:
case ZigLLVM_renderscript64:
case ZigLLVM_shave:
case ZigLLVM_sparc:
case ZigLLVM_sparcel:
case ZigLLVM_sparcv9:
case ZigLLVM_spir:
case ZigLLVM_spir64:
case ZigLLVM_systemz:
case ZigLLVM_tce:
case ZigLLVM_thumbeb:
case ZigLLVM_wasm32:
case ZigLLVM_wasm64:
case ZigLLVM_xcore:
target->oformat= ZigLLVM_ELF;
return;
case ZigLLVM_ppc:
case ZigLLVM_ppc64:
if (is_os_darwin(target)) {
target->oformat = ZigLLVM_MachO;
} else {
target->oformat= ZigLLVM_ELF;
}
return;
} }
target->oformat = ZigLLVM_ELF;
} }
// See lib/Support/Triple.cpp in LLVM for the source of this data. // See lib/Support/Triple.cpp in LLVM for the source of this data.
@ -357,8 +400,10 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
case ZigLLVM_hsail: case ZigLLVM_hsail:
case ZigLLVM_spir: case ZigLLVM_spir:
case ZigLLVM_kalimba: case ZigLLVM_kalimba:
case ZigLLVM_lanai:
case ZigLLVM_shave: case ZigLLVM_shave:
case ZigLLVM_wasm32: case ZigLLVM_wasm32:
case ZigLLVM_renderscript32:
return 32; return 32;
case ZigLLVM_aarch64: case ZigLLVM_aarch64:
@ -379,6 +424,7 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
case ZigLLVM_hsail64: case ZigLLVM_hsail64:
case ZigLLVM_spir64: case ZigLLVM_spir64:
case ZigLLVM_wasm64: case ZigLLVM_wasm64:
case ZigLLVM_renderscript64:
return 64; return 64;
} }
zig_unreachable(); zig_unreachable();
@ -446,6 +492,7 @@ int get_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
case ZigLLVM_ELFIAMCU: case ZigLLVM_ELFIAMCU:
case ZigLLVM_TvOS: case ZigLLVM_TvOS:
case ZigLLVM_WatchOS: case ZigLLVM_WatchOS:
case ZigLLVM_Mesa3D:
zig_panic("TODO c type size in bits for this target"); zig_panic("TODO c type size in bits for this target");
} }
zig_unreachable(); zig_unreachable();

42
src/zig_llvm.cpp
View File

@ -52,10 +52,6 @@ void LLVMZigInitializeLowerIntrinsicsPass(LLVMPassRegistryRef R) {
initializeLowerIntrinsicsPass(*unwrap(R)); initializeLowerIntrinsicsPass(*unwrap(R));
} }
void LLVMZigInitializeUnreachableBlockElimPass(LLVMPassRegistryRef R) {
initializeUnreachableBlockElimPass(*unwrap(R));
}
char *LLVMZigGetHostCPUName(void) { char *LLVMZigGetHostCPUName(void) {
std::string str = sys::getHostCPUName(); std::string str = sys::getHostCPUName();
return strdup(str.c_str()); return strdup(str.c_str());
@ -405,6 +401,22 @@ LLVMZigDILocalVariable *LLVMZigCreateAutoVariable(LLVMZigDIBuilder *dbuilder,
return reinterpret_cast<LLVMZigDILocalVariable*>(result); return reinterpret_cast<LLVMZigDILocalVariable*>(result);
} }
LLVMZigDIGlobalVariable *LLVMZigCreateGlobalVariable(LLVMZigDIBuilder *dbuilder,
LLVMZigDIScope *scope, const char *name, const char *linkage_name, LLVMZigDIFile *file,
unsigned line_no, LLVMZigDIType *di_type, bool is_local_to_unit, LLVMValueRef constant_val)
{
DIGlobalVariable *result = reinterpret_cast<DIBuilder*>(dbuilder)->createGlobalVariable(
reinterpret_cast<DIScope*>(scope),
name,
linkage_name,
reinterpret_cast<DIFile*>(file),
line_no,
reinterpret_cast<DIType*>(di_type),
is_local_to_unit,
reinterpret_cast<llvm::Constant *>(constant_val));
return reinterpret_cast<LLVMZigDIGlobalVariable*>(result);
}
LLVMZigDILocalVariable *LLVMZigCreateParameterVariable(LLVMZigDIBuilder *dbuilder, LLVMZigDILocalVariable *LLVMZigCreateParameterVariable(LLVMZigDIBuilder *dbuilder,
LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no, LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no,
LLVMZigDIType *type, bool always_preserve, unsigned flags, unsigned arg_no) LLVMZigDIType *type, bool always_preserve, unsigned flags, unsigned arg_no)
@ -452,11 +464,11 @@ LLVMZigDICompileUnit *LLVMZigCreateCompileUnit(LLVMZigDIBuilder *dibuilder,
uint64_t dwo_id, bool emit_debug_info) uint64_t dwo_id, bool emit_debug_info)
{ {
DICompileUnit *result = reinterpret_cast<DIBuilder*>(dibuilder)->createCompileUnit( DICompileUnit *result = reinterpret_cast<DIBuilder*>(dibuilder)->createCompileUnit(
lang, file, dir, producer, is_optimized, flags, runtime_version, split_name, lang, file, dir, producer, is_optimized, flags, runtime_version, split_name);
DIBuilder::FullDebug, dwo_id, emit_debug_info);
return reinterpret_cast<LLVMZigDICompileUnit*>(result); return reinterpret_cast<LLVMZigDICompileUnit*>(result);
} }
LLVMZigDIFile *LLVMZigCreateFile(LLVMZigDIBuilder *dibuilder, const char *filename, const char *directory) { LLVMZigDIFile *LLVMZigCreateFile(LLVMZigDIBuilder *dibuilder, const char *filename, const char *directory) {
DIFile *result = reinterpret_cast<DIBuilder*>(dibuilder)->createFile(filename, directory); DIFile *result = reinterpret_cast<DIBuilder*>(dibuilder)->createFile(filename, directory);
return reinterpret_cast<LLVMZigDIFile*>(result); return reinterpret_cast<LLVMZigDIFile*>(result);
@ -603,6 +615,10 @@ const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch) {
return "v8_1a"; return "v8_1a";
case ZigLLVM_ARMSubArch_v8: case ZigLLVM_ARMSubArch_v8:
return "v8"; return "v8";
case ZigLLVM_ARMSubArch_v8m_baseline:
return "v8m_baseline";
case ZigLLVM_ARMSubArch_v8m_mainline:
return "v8m_mainline";
case ZigLLVM_ARMSubArch_v7: case ZigLLVM_ARMSubArch_v7:
return "v7"; return "v7";
case ZigLLVM_ARMSubArch_v7em: case ZigLLVM_ARMSubArch_v7em:
@ -648,13 +664,13 @@ unsigned ZigLLVMGetPrefTypeAlignment(LLVMTargetDataRef TD, LLVMTypeRef Ty) {
static AtomicOrdering mapFromLLVMOrdering(LLVMAtomicOrdering Ordering) { static AtomicOrdering mapFromLLVMOrdering(LLVMAtomicOrdering Ordering) {
switch (Ordering) { switch (Ordering) {
case LLVMAtomicOrderingNotAtomic: return NotAtomic; case LLVMAtomicOrderingNotAtomic: return AtomicOrdering::NotAtomic;
case LLVMAtomicOrderingUnordered: return Unordered; case LLVMAtomicOrderingUnordered: return AtomicOrdering::Unordered;
case LLVMAtomicOrderingMonotonic: return Monotonic; case LLVMAtomicOrderingMonotonic: return AtomicOrdering::Monotonic;
case LLVMAtomicOrderingAcquire: return Acquire; case LLVMAtomicOrderingAcquire: return AtomicOrdering::Acquire;
case LLVMAtomicOrderingRelease: return Release; case LLVMAtomicOrderingRelease: return AtomicOrdering::Release;
case LLVMAtomicOrderingAcquireRelease: return AcquireRelease; case LLVMAtomicOrderingAcquireRelease: return AtomicOrdering::AcquireRelease;
case LLVMAtomicOrderingSequentiallyConsistent: return SequentiallyConsistent; case LLVMAtomicOrderingSequentiallyConsistent: return AtomicOrdering::SequentiallyConsistent;
} }
abort(); abort();
} }

109
src/zig_llvm.hpp
View File

@ -23,13 +23,13 @@ struct LLVMZigDILexicalBlock;
struct LLVMZigDISubprogram; struct LLVMZigDISubprogram;
struct LLVMZigDISubroutineType; struct LLVMZigDISubroutineType;
struct LLVMZigDILocalVariable; struct LLVMZigDILocalVariable;
struct LLVMZigDIGlobalVariable;
struct LLVMZigDILocation; struct LLVMZigDILocation;
struct LLVMZigDIEnumerator; struct LLVMZigDIEnumerator;
struct LLVMZigInsertionPoint; struct LLVMZigInsertionPoint;
void LLVMZigInitializeLoopStrengthReducePass(LLVMPassRegistryRef R); void LLVMZigInitializeLoopStrengthReducePass(LLVMPassRegistryRef R);
void LLVMZigInitializeLowerIntrinsicsPass(LLVMPassRegistryRef R); void LLVMZigInitializeLowerIntrinsicsPass(LLVMPassRegistryRef R);
void LLVMZigInitializeUnreachableBlockElimPass(LLVMPassRegistryRef R);
char *LLVMZigGetHostCPUName(void); char *LLVMZigGetHostCPUName(void);
char *LLVMZigGetNativeFeatures(void); char *LLVMZigGetNativeFeatures(void);
@ -126,6 +126,10 @@ LLVMZigDILocalVariable *LLVMZigCreateAutoVariable(LLVMZigDIBuilder *dbuilder,
LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no, LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no,
LLVMZigDIType *type, bool always_preserve, unsigned flags); LLVMZigDIType *type, bool always_preserve, unsigned flags);
LLVMZigDIGlobalVariable *LLVMZigCreateGlobalVariable(LLVMZigDIBuilder *dbuilder,
LLVMZigDIScope *scope, const char *name, const char *linkage_name, LLVMZigDIFile *file,
unsigned line_no, LLVMZigDIType *di_type, bool is_local_to_unit, LLVMValueRef constant_val);
LLVMZigDILocalVariable *LLVMZigCreateParameterVariable(LLVMZigDIBuilder *dbuilder, LLVMZigDILocalVariable *LLVMZigCreateParameterVariable(LLVMZigDIBuilder *dbuilder,
LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no, LLVMZigDIScope *scope, const char *name, LLVMZigDIFile *file, unsigned line_no,
LLVMZigDIType *type, bool always_preserve, unsigned flags, unsigned arg_no); LLVMZigDIType *type, bool always_preserve, unsigned flags, unsigned arg_no);
@ -170,50 +174,53 @@ unsigned ZigLLVMGetPrefTypeAlignment(LLVMTargetDataRef TD, LLVMTypeRef Ty);
enum ZigLLVM_ArchType { enum ZigLLVM_ArchType {
ZigLLVM_UnknownArch, ZigLLVM_UnknownArch,
ZigLLVM_arm, // ARM (little endian): arm, armv.*, xscale ZigLLVM_arm, // ARM (little endian): arm, armv.*, xscale
ZigLLVM_armeb, // ARM (big endian): armeb ZigLLVM_armeb, // ARM (big endian): armeb
ZigLLVM_aarch64, // AArch64 (little endian): aarch64 ZigLLVM_aarch64, // AArch64 (little endian): aarch64
ZigLLVM_aarch64_be, // AArch64 (big endian): aarch64_be ZigLLVM_aarch64_be, // AArch64 (big endian): aarch64_be
ZigLLVM_avr, // AVR: Atmel AVR microcontroller ZigLLVM_avr, // AVR: Atmel AVR microcontroller
ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian) ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)
ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian) ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)
ZigLLVM_hexagon, // Hexagon: hexagon ZigLLVM_hexagon, // Hexagon: hexagon
ZigLLVM_mips, // MIPS: mips, mipsallegrex ZigLLVM_mips, // MIPS: mips, mipsallegrex
ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexel ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexel
ZigLLVM_mips64, // MIPS64: mips64 ZigLLVM_mips64, // MIPS64: mips64
ZigLLVM_mips64el, // MIPS64EL: mips64el ZigLLVM_mips64el, // MIPS64EL: mips64el
ZigLLVM_msp430, // MSP430: msp430 ZigLLVM_msp430, // MSP430: msp430
ZigLLVM_ppc, // PPC: powerpc ZigLLVM_ppc, // PPC: powerpc
ZigLLVM_ppc64, // PPC64: powerpc64, ppu ZigLLVM_ppc64, // PPC64: powerpc64, ppu
ZigLLVM_ppc64le, // PPC64LE: powerpc64le ZigLLVM_ppc64le, // PPC64LE: powerpc64le
ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX
ZigLLVM_amdgcn, // AMDGCN: AMD GCN GPUs ZigLLVM_amdgcn, // AMDGCN: AMD GCN GPUs
ZigLLVM_sparc, // Sparc: sparc ZigLLVM_sparc, // Sparc: sparc
ZigLLVM_sparcv9, // Sparcv9: Sparcv9 ZigLLVM_sparcv9, // Sparcv9: Sparcv9
ZigLLVM_sparcel, // Sparc: (endianness = little). NB: 'Sparcle' is a CPU variant ZigLLVM_sparcel, // Sparc: (endianness = little). NB: 'Sparcle' is a CPU variant
ZigLLVM_systemz, // SystemZ: s390x ZigLLVM_systemz, // SystemZ: s390x
ZigLLVM_tce, // TCE (http://tce.cs.tut.fi/): tce ZigLLVM_tce, // TCE (http://tce.cs.tut.fi/): tce
ZigLLVM_thumb, // Thumb (little endian): thumb, thumbv.* ZigLLVM_thumb, // Thumb (little endian): thumb, thumbv.*
ZigLLVM_thumbeb, // Thumb (big endian): thumbeb ZigLLVM_thumbeb, // Thumb (big endian): thumbeb
ZigLLVM_x86, // X86: i[3-9]86 ZigLLVM_x86, // X86: i[3-9]86
ZigLLVM_x86_64, // X86-64: amd64, x86_64 ZigLLVM_x86_64, // X86-64: amd64, x86_64
ZigLLVM_xcore, // XCore: xcore ZigLLVM_xcore, // XCore: xcore
ZigLLVM_nvptx, // NVPTX: 32-bit ZigLLVM_nvptx, // NVPTX: 32-bit
ZigLLVM_nvptx64, // NVPTX: 64-bit ZigLLVM_nvptx64, // NVPTX: 64-bit
ZigLLVM_le32, // le32: generic little-endian 32-bit CPU (PNaCl) ZigLLVM_le32, // le32: generic little-endian 32-bit CPU (PNaCl)
ZigLLVM_le64, // le64: generic little-endian 64-bit CPU (PNaCl) ZigLLVM_le64, // le64: generic little-endian 64-bit CPU (PNaCl)
ZigLLVM_amdil, // AMDIL ZigLLVM_amdil, // AMDIL
ZigLLVM_amdil64, // AMDIL with 64-bit pointers ZigLLVM_amdil64, // AMDIL with 64-bit pointers
ZigLLVM_hsail, // AMD HSAIL ZigLLVM_hsail, // AMD HSAIL
ZigLLVM_hsail64, // AMD HSAIL with 64-bit pointers ZigLLVM_hsail64, // AMD HSAIL with 64-bit pointers
ZigLLVM_spir, // SPIR: standard portable IR for OpenCL 32-bit version ZigLLVM_spir, // SPIR: standard portable IR for OpenCL 32-bit version
ZigLLVM_spir64, // SPIR: standard portable IR for OpenCL 64-bit version ZigLLVM_spir64, // SPIR: standard portable IR for OpenCL 64-bit version
ZigLLVM_kalimba, // Kalimba: generic kalimba ZigLLVM_kalimba, // Kalimba: generic kalimba
ZigLLVM_shave, // SHAVE: Movidius vector VLIW processors ZigLLVM_shave, // SHAVE: Movidius vector VLIW processors
ZigLLVM_wasm32, // WebAssembly with 32-bit pointers ZigLLVM_lanai, // Lanai: Lanai 32-bit
ZigLLVM_wasm64, // WebAssembly with 64-bit pointers ZigLLVM_wasm32, // WebAssembly with 32-bit pointers
ZigLLVM_wasm64, // WebAssembly with 64-bit pointers
ZigLLVM_renderscript32, // 32-bit RenderScript
ZigLLVM_renderscript64, // 64-bit RenderScript
ZigLLVM_LastArchType = ZigLLVM_wasm64 ZigLLVM_LastArchType = ZigLLVM_renderscript64
}; };
enum ZigLLVM_SubArchType { enum ZigLLVM_SubArchType {
@ -222,6 +229,8 @@ enum ZigLLVM_SubArchType {
ZigLLVM_ARMSubArch_v8_2a, ZigLLVM_ARMSubArch_v8_2a,
ZigLLVM_ARMSubArch_v8_1a, ZigLLVM_ARMSubArch_v8_1a,
ZigLLVM_ARMSubArch_v8, ZigLLVM_ARMSubArch_v8,
ZigLLVM_ARMSubArch_v8m_baseline,
ZigLLVM_ARMSubArch_v8m_mainline,
ZigLLVM_ARMSubArch_v7, ZigLLVM_ARMSubArch_v7,
ZigLLVM_ARMSubArch_v7em, ZigLLVM_ARMSubArch_v7em,
ZigLLVM_ARMSubArch_v7m, ZigLLVM_ARMSubArch_v7m,
@ -254,8 +263,10 @@ enum ZigLLVM_VendorType {
ZigLLVM_NVIDIA, ZigLLVM_NVIDIA,
ZigLLVM_CSR, ZigLLVM_CSR,
ZigLLVM_Myriad, ZigLLVM_Myriad,
ZigLLVM_AMD,
ZigLLVM_Mesa,
ZigLLVM_LastVendorType = ZigLLVM_Myriad ZigLLVM_LastVendorType = ZigLLVM_Mesa
}; };
enum ZigLLVM_OSType { enum ZigLLVM_OSType {
ZigLLVM_UnknownOS, ZigLLVM_UnknownOS,
@ -287,13 +298,15 @@ enum ZigLLVM_OSType {
ZigLLVM_ELFIAMCU, ZigLLVM_ELFIAMCU,
ZigLLVM_TvOS, // Apple tvOS ZigLLVM_TvOS, // Apple tvOS
ZigLLVM_WatchOS, // Apple watchOS ZigLLVM_WatchOS, // Apple watchOS
ZigLLVM_Mesa3D,
ZigLLVM_LastOSType = ZigLLVM_WatchOS ZigLLVM_LastOSType = ZigLLVM_Mesa3D
}; };
enum ZigLLVM_EnvironmentType { enum ZigLLVM_EnvironmentType {
ZigLLVM_UnknownEnvironment, ZigLLVM_UnknownEnvironment,
ZigLLVM_GNU, ZigLLVM_GNU,
ZigLLVM_GNUABI64,
ZigLLVM_GNUEABI, ZigLLVM_GNUEABI,
ZigLLVM_GNUEABIHF, ZigLLVM_GNUEABIHF,
ZigLLVM_GNUX32, ZigLLVM_GNUX32,
@ -301,12 +314,16 @@ enum ZigLLVM_EnvironmentType {
ZigLLVM_EABI, ZigLLVM_EABI,
ZigLLVM_EABIHF, ZigLLVM_EABIHF,
ZigLLVM_Android, ZigLLVM_Android,
ZigLLVM_Musl,
ZigLLVM_MuslEABI,
ZigLLVM_MuslEABIHF,
ZigLLVM_MSVC, ZigLLVM_MSVC,
ZigLLVM_Itanium, ZigLLVM_Itanium,
ZigLLVM_Cygnus, ZigLLVM_Cygnus,
ZigLLVM_AMDOpenCL, ZigLLVM_AMDOpenCL,
ZigLLVM_CoreCLR, ZigLLVM_CoreCLR,
ZigLLVM_LastEnvironmentType = ZigLLVM_CoreCLR ZigLLVM_LastEnvironmentType = ZigLLVM_CoreCLR
}; };
enum ZigLLVM_ObjectFormatType { enum ZigLLVM_ObjectFormatType {