mwojcik/nac3
1
0
Fork 0
forked from M-Labs/nac3
Code Pull Requests Activity

nac3artiq: add compile_method_to_mem

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2021-11-06 14:14:53 +08:00
parent 597857ccd0
commit 204baabfd2
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nac3artiq/demo/min_artiq.py
View File

@ -110,7 +110,7 @@ class Core:
obj = method
name = ""
compiler.compile_method(obj, name, args)
compiler.compile_method_to_file(obj, name, args, "module.elf")
@kernel
def reset(self):

20
nac3artiq/src/lib.rs
View File

@ -317,11 +317,12 @@ impl Nac3 {
Ok(())
}
fn compile_method(
fn compile_method_to_file(
&mut self,
obj: &PyAny,
method_name: String,
method_name: &str,
args: Vec<&PyAny>,
filename: &str,
py: Python,
) -> PyResult<()> {
let id_fun = PyModule::import(py, "builtins")?.getattr("id")?;
@ -464,7 +465,7 @@ impl Nac3 {
"--eh-frame-hdr".to_string(),
"-x".to_string(),
"-o".to_string(),
"module.elf".to_string(),
filename.to_string(),
];
if isa != Isa::Host {
linker_args.push("-T".to_string() + self.working_directory.path().join("kernel.ld").to_str().unwrap());
@ -484,6 +485,19 @@ impl Nac3 {
Ok(())
}
fn compile_method_to_mem(
&mut self,
obj: &PyAny,
method_name: &str,
args: Vec<&PyAny>,
py: Python,
) -> PyResult<Vec<u8>> {
let filename_path = self.working_directory.path().join("module.elf");
let filename = filename_path.to_str().unwrap();
self.compile_method_to_file(obj, method_name, args, filename, py)?;
Ok(fs::read(filename).unwrap())
}
}
#[pymodule]