occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

compiler, firmware: Do not expose abort() to kernels 

This was only exposed for the assert implementation, and
does not exist on Zynq.
This commit is contained in:
David Nadlinger 2020-11-10 19:53:39 +01:00
parent 292043a0a7
commit bc6fbecbda
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/compiler/transforms/llvm_ir_generator.py
View File

@ -374,8 +374,6 @@ class LLVMIRGenerator:
llty = ll.FunctionType(llvoid, [self.llty_of_type(builtins.TException())]) llty = ll.FunctionType(llvoid, [self.llty_of_type(builtins.TException())])
elif name == "__artiq_reraise": elif name == "__artiq_reraise":
llty = ll.FunctionType(llvoid, []) llty = ll.FunctionType(llvoid, [])
elif name in "abort":
llty = ll.FunctionType(llvoid, [])
elif name == "memcmp": elif name == "memcmp":
llty = ll.FunctionType(lli32, [llptr, llptr, lli32]) llty = ll.FunctionType(lli32, [llptr, llptr, lli32])
elif name == "rpc_send": elif name == "rpc_send":
@ -1143,8 +1141,6 @@ class LLVMIRGenerator:
def process_Builtin(self, insn): def process_Builtin(self, insn):
if insn.op == "nop": if insn.op == "nop":
return self.llbuilder.call(self.llbuiltin("llvm.donothing"), []) return self.llbuilder.call(self.llbuiltin("llvm.donothing"), [])
if insn.op == "abort":
return self.llbuilder.call(self.llbuiltin("abort"), [])
elif insn.op == "is_some": elif insn.op == "is_some":
lloptarg = self.map(insn.operands[0]) lloptarg = self.map(insn.operands[0])
return self.llbuilder.extract_value(lloptarg, 0, return self.llbuilder.extract_value(lloptarg, 0,

1
artiq/firmware/ksupport/api.rs
View File

@ -63,7 +63,6 @@ static mut API: &'static [(&'static str, *const ())] = &[
api!(__powidf2), api!(__powidf2),
/* libc */ /* libc */
api!(abort = ::abort),
api!(memcmp, extern { fn memcmp(a: *const u8, b: *mut u8, size: usize); }), api!(memcmp, extern { fn memcmp(a: *const u8, b: *mut u8, size: usize); }),
/* libm */ /* libm */