M-Labs/nac3
M-Labs/nac3
8
1
Fork 12
Code Issues 99 Pull Requests 18 Releases Wiki Activity

[core] irrt/string: Minor cleanup

Browse Source 
- Refactor __nac3_str_eq to always return bool
- Use `get_usize_dependent_function_name` to get IRRT func name
This commit is contained in:
David Mak 2024-12-30 14:04:42 +08:00
parent 456aefa6ee
commit fbf0053c24
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nac3core/irrt/irrt/string.hpp
View File

@ -4,20 +4,20 @@
namespace { namespace {
template<typename SizeT> template<typename SizeT>
SizeT __nac3_str_eq_impl(const char* str1, SizeT len1, const char* str2, SizeT len2) { bool __nac3_str_eq_impl(const char* str1, SizeT len1, const char* str2, SizeT len2) {
if (len1 != len2){ if (len1 != len2){
return 0; return 0;
} }
return (__builtin_memcmp(str1, str2, static_cast<SizeT>(len1)) == 0) ? 1 : 0; return __builtin_memcmp(str1, str2, static_cast<SizeT>(len1)) == 0;
} }
} // namespace } // namespace
extern "C" { extern "C" {
uint32_t nac3_str_eq(const char* str1, uint32_t len1, const char* str2, uint32_t len2) { bool nac3_str_eq(const char* str1, uint32_t len1, const char* str2, uint32_t len2) {
return __nac3_str_eq_impl<uint32_t>(str1, len1, str2, len2); return __nac3_str_eq_impl<uint32_t>(str1, len1, str2, len2);
} }
uint64_t nac3_str_eq64(const char* str1, uint64_t len1, const char* str2, uint64_t len2) { bool nac3_str_eq64(const char* str1, uint64_t len1, const char* str2, uint64_t len2) {
return __nac3_str_eq_impl<uint64_t>(str1, len1, str2, len2); return __nac3_str_eq_impl<uint64_t>(str1, len1, str2, len2);
} }
} }

24
nac3core/src/codegen/irrt/string.rs
View File

@ -1,7 +1,8 @@
use inkwell::values::{BasicValueEnum, CallSiteValue, IntValue, PointerValue}; use inkwell::values::{BasicValueEnum, CallSiteValue, IntValue, PointerValue};
use itertools::Either; use itertools::Either;
use crate::codegen::{macros::codegen_unreachable, CodeGenContext, CodeGenerator}; use super::get_usize_dependent_function_name;
use crate::codegen::{CodeGenContext, CodeGenerator};
/// Generates a call to string equality comparison. Returns an `i1` representing whether the strings are equal. /// Generates a call to string equality comparison. Returns an `i1` representing whether the strings are equal.
pub fn call_string_eq<'ctx, G: CodeGenerator + ?Sized>( pub fn call_string_eq<'ctx, G: CodeGenerator + ?Sized>(
@ -12,16 +13,14 @@ pub fn call_string_eq<'ctx, G: CodeGenerator + ?Sized>(
str2_ptr: PointerValue<'ctx>, str2_ptr: PointerValue<'ctx>,
str2_len: IntValue<'ctx>, str2_len: IntValue<'ctx>,
) -> IntValue<'ctx> { ) -> IntValue<'ctx> {
let (func_name, return_type) = match ctx.ctx.i32_type().get_bit_width() { let llvm_i1 = ctx.ctx.bool_type();
32 => ("nac3_str_eq", ctx.ctx.i32_type()),
64 => ("nac3_str_eq64", ctx.ctx.i64_type()),
bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
};
let func = ctx.module.get_function(func_name).unwrap_or_else(|| { let func_name = get_usize_dependent_function_name(generator, ctx, "nac3_str_eq");
let func = ctx.module.get_function(&func_name).unwrap_or_else(|| {
ctx.module.add_function( ctx.module.add_function(
func_name, &func_name,
return_type.fn_type( llvm_i1.fn_type(
&[ &[
str1_ptr.get_type().into(), str1_ptr.get_type().into(),
str1_len.get_type().into(), str1_len.get_type().into(),
@ -33,8 +32,8 @@ pub fn call_string_eq<'ctx, G: CodeGenerator + ?Sized>(
None, None,
) )
}); });
let result = ctx
.builder ctx.builder
.build_call( .build_call(
func, func,
&[str1_ptr.into(), str1_len.into(), str2_ptr.into(), str2_len.into()], &[str1_ptr.into(), str1_len.into(), str2_ptr.into(), str2_len.into()],
@ -43,6 +42,5 @@ pub fn call_string_eq<'ctx, G: CodeGenerator + ?Sized>(
.map(CallSiteValue::try_as_basic_value) .map(CallSiteValue::try_as_basic_value)
.map(|v| v.map_left(BasicValueEnum::into_int_value)) .map(|v| v.map_left(BasicValueEnum::into_int_value))
.map(Either::unwrap_left) .map(Either::unwrap_left)
.unwrap(); .unwrap()
generator.bool_to_i1(ctx, result)
} }