diff --git a/src/parsers/bits.c b/src/parsers/bits.c index 4663fe2a20a45e7a93163f97699d7062f4eb240a..6fe71e798f59dd613cf7f4909d034a39049d947c 100644 --- a/src/parsers/bits.c +++ b/src/parsers/bits.c @@ -82,9 +82,9 @@ static bool bits_llvm(HLLVMParserCompileContext *ctxt, * i32 env_->length, * i8 signext env_->signedp) */ - read_bits_name_len = snprintf(NULL, 0, "read_bits_%p", p); + read_bits_name_len = snprintf(NULL, 0, "bits_read_bits_%p", p); read_bits_name = h_new(char, read_bits_name_len + 1); - snprintf(read_bits_name, read_bits_name_len + 1, "read_bits_%p", p); + snprintf(read_bits_name, read_bits_name_len + 1, "bits_read_bits_%p", p); bits = LLVMBuildCall(ctxt->builder, LLVMGetNamedFunction(ctxt->mod, "h_read_bits"), bits_args, 3, read_bits_name); diff --git a/src/parsers/ch.c b/src/parsers/ch.c index bdace2204a7ccaf415706da31c139a728903678c..0ae2b713b883f725e435a53a695329a418c90a82 100644 --- a/src/parsers/ch.c +++ b/src/parsers/ch.c @@ -132,17 +132,17 @@ static bool ch_llvm(HLLVMParserCompileContext *ctxt, * %read_bits = call i64 @h_read_bits(%struct.HInputStream_* %8, * i32 8, i8 signext 0) */ - ch_read_bits_name_len = snprintf(NULL, 0, "read_bits_%p", p); + ch_read_bits_name_len = snprintf(NULL, 0, "ch_read_bits_%p", p); ch_read_bits_name = h_new(char, ch_read_bits_name_len + 1); snprintf(ch_read_bits_name, ch_read_bits_name_len + 1, - "read_bits_%p", p); + "ch_read_bits_%p", p); bits = LLVMBuildCall(ctxt->builder, LLVMGetNamedFunction(ctxt->mod, "h_read_bits"), bits_args, 3, ch_read_bits_name); /* %2 = trunc i64 %read_bits to i8 */ - ch_r_name_len = snprintf(NULL, 0, "r_%p", p); + ch_r_name_len = snprintf(NULL, 0, "ch_r_%p", p); ch_r_name = h_new(char, ch_r_name_len + 1); - snprintf(ch_r_name, ch_r_name_len + 1, "r_%p", p); + snprintf(ch_r_name, ch_r_name_len + 1, "ch_r_%p", p); r = LLVMBuildTrunc(ctxt->builder, bits, LLVMInt8Type(), ch_r_name); /* @@ -150,9 +150,9 @@ static bool ch_llvm(HLLVMParserCompileContext *ctxt, * * %"c == r" = icmp eq i8 -94, %2 ; the -94 comes from c_ */ - ch_icmp_name_len = snprintf(NULL, 0, "icmp_%p", p); + ch_icmp_name_len = snprintf(NULL, 0, "ch_icmp_%p", p); ch_icmp_name = h_new(char, ch_icmp_name_len + 1); - snprintf(ch_icmp_name, ch_icmp_name_len + 1, "icmp_%p", p); + snprintf(ch_icmp_name, ch_icmp_name_len + 1, "ch_icmp_%p", p); cval = (uint8_t)(uintptr_t)(p->env); c = LLVMConstInt(LLVMInt8Type(), cval, 0); icmp = LLVMBuildICmp(ctxt->builder, LLVMIntEQ, c, r, ch_icmp_name); @@ -178,9 +178,9 @@ static bool ch_llvm(HLLVMParserCompileContext *ctxt, * %rv = phi %struct.HParseResult_.3* [ %make_result, %ch_success ], * [ null, %ch_entry ] */ - ch_rv_name_len = snprintf(NULL, 0, "rv_%p", p); + ch_rv_name_len = snprintf(NULL, 0, "ch_rv_%p", p); ch_rv_name = h_new(char, ch_rv_name_len + 1); - snprintf(ch_rv_name, ch_rv_name_len + 1, "rv_%p", p); + snprintf(ch_rv_name, ch_rv_name_len + 1, "ch_rv_%p", p); rv = LLVMBuildPhi(ctxt->builder, ctxt->llvm_parseresultptr, ch_rv_name); rv_phi_incoming_blocks[0] = success; rv_phi_incoming_values[0] = mr;