authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-08 16:39:00-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-08 16:39:00-05:00
log18cf2568173dfdcdda5c030fe9908b5a642dc165
treea48066338b800bb62ced05d6ebaa7ef32510b725
parent0dd3bbf6e8deba576ac7130354e3d1a7f20e7310
parent3577a80bb67923c0c165bd3c6e57ef3248e1b59c

Merge branch 'master' into self-hosted

5 files changed, 46 insertions(+), 9 deletions(-)

src/analyze.hpp+1
......@@ -180,5 +180,6 @@ void add_link_lib_symbol(CodeGen *g, Buf *lib_name, Buf *symbol_name);
180180
181181uint32_t get_abi_alignment(CodeGen *g, TypeTableEntry *type_entry);
182182TypeTableEntry *get_align_amt_type(CodeGen *g);
183PackageTableEntry *new_anonymous_package(void);
183184
184185#endif
src/codegen.cpp+4
......@@ -55,6 +55,10 @@ static PackageTableEntry *new_package(const char *root_src_dir, const char *root
5555 return entry;
5656}
5757
58PackageTableEntry *new_anonymous_package(void) {
59 return new_package("", "");
60}
61
5862CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out_type, BuildMode build_mode,
5963 Buf *zig_lib_dir)
6064{
src/ir.cpp+3
......@@ -14052,6 +14052,9 @@ static TypeTableEntry *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruc
1405214052 ImportTableEntry *child_import = allocate<ImportTableEntry>(1);
1405314053 child_import->decls_scope = create_decls_scope(node, nullptr, nullptr, child_import);
1405414054 child_import->c_import_node = node;
14055 child_import->package = new_anonymous_package();
14056 child_import->package->package_table.put(buf_create_from_str("builtin"), ira->codegen->compile_var_package);
14057 child_import->package->package_table.put(buf_create_from_str("std"), ira->codegen->std_package);
1405514058
1405614059 ZigList<ErrorMsg *> errors = {0};
1405714060
src/translate_c.cpp+37-8
......@@ -173,6 +173,14 @@ static AstNode * trans_create_node(Context *c, NodeType id) {
173173 return node;
174174}
175175
176static AstNode *trans_create_node_if(Context *c, AstNode *cond_node, AstNode *then_node, AstNode *else_node) {
177 AstNode *node = trans_create_node(c, NodeTypeIfBoolExpr);
178 node->data.if_bool_expr.condition = cond_node;
179 node->data.if_bool_expr.then_block = then_node;
180 node->data.if_bool_expr.else_node = else_node;
181 return node;
182}
183
176184static AstNode *trans_create_node_float_lit(Context *c, double value) {
177185 AstNode *node = trans_create_node(c, NodeTypeFloatLiteral);
178186 node->data.float_literal.bigfloat = allocate<BigFloat>(1);
......@@ -4077,14 +4085,35 @@ static AstNode *parse_ctok_primary_expr(Context *c, CTokenize *ctok, size_t *tok
40774085 }
40784086 *tok_i += 1;
40794087
4080 if (inner_node->type == NodeTypeAddrOfExpr) {
4081 AstNode *call_node = trans_create_node_builtin_fn_call_str(c, "ptrCast");
4082 call_node->data.fn_call_expr.params.append(inner_node);
4083 call_node->data.fn_call_expr.params.append(node_to_cast);
4084 return call_node;
4085 } else {
4086 return trans_create_node_cast(c, inner_node, node_to_cast);
4087 }
4088
4089 //if (@typeId(@typeOf(x)) == @import("builtin").TypeId.Pointer)
4090 // @ptrCast(dest, x)
4091 //else if (@typeId(@typeOf(x)) == @import("builtin").TypeId.Integer)
4092 // @intToPtr(dest, x)
4093 //else
4094 // (dest)(x)
4095
4096 AstNode *import_builtin = trans_create_node_builtin_fn_call_str(c, "import");
4097 import_builtin->data.fn_call_expr.params.append(trans_create_node_str_lit_non_c(c, buf_create_from_str("builtin")));
4098 AstNode *typeid_type = trans_create_node_field_access_str(c, import_builtin, "TypeId");
4099 AstNode *typeid_pointer = trans_create_node_field_access_str(c, typeid_type, "Pointer");
4100 AstNode *typeid_integer = trans_create_node_field_access_str(c, typeid_type, "Int");
4101 AstNode *typeof_x = trans_create_node_builtin_fn_call_str(c, "typeOf");
4102 typeof_x->data.fn_call_expr.params.append(node_to_cast);
4103 AstNode *typeid_value = trans_create_node_builtin_fn_call_str(c, "typeId");
4104 typeid_value->data.fn_call_expr.params.append(typeof_x);
4105
4106 AstNode *outer_if_cond = trans_create_node_bin_op(c, typeid_value, BinOpTypeCmpEq, typeid_pointer);
4107 AstNode *inner_if_cond = trans_create_node_bin_op(c, typeid_value, BinOpTypeCmpEq, typeid_integer);
4108 AstNode *inner_if_then = trans_create_node_builtin_fn_call_str(c, "intToPtr");
4109 inner_if_then->data.fn_call_expr.params.append(inner_node);
4110 inner_if_then->data.fn_call_expr.params.append(node_to_cast);
4111 AstNode *inner_if_else = trans_create_node_cast(c, inner_node, node_to_cast);
4112 AstNode *inner_if = trans_create_node_if(c, inner_if_cond, inner_if_then, inner_if_else);
4113 AstNode *outer_if_then = trans_create_node_builtin_fn_call_str(c, "ptrCast");
4114 outer_if_then->data.fn_call_expr.params.append(inner_node);
4115 outer_if_then->data.fn_call_expr.params.append(node_to_cast);
4116 return trans_create_node_if(c, outer_if_cond, outer_if_then, inner_if);
40884117 }
40894118 case CTokIdDot:
40904119 case CTokIdEOF:
test/translate_c.zig+1-1
......@@ -1192,6 +1192,6 @@ pub fn addCases(cases: &tests.TranslateCContext) {
11921192 cases.add("macro pointer cast",
11931193 \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)
11941194 ,
1195 \\pub const NRF_GPIO = @ptrCast(&NRF_GPIO_Type, NRF_GPIO_BASE);
1195 \\pub const NRF_GPIO = if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Pointer) @ptrCast(&NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Int) @intToPtr(&NRF_GPIO_Type, NRF_GPIO_BASE) else (&NRF_GPIO_Type)(NRF_GPIO_BASE);
11961196 );
11971197}