M-Labs/artiq-zynq
10
1
Fork 20
Code Issues 13 Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:master
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
M-Labs:release-6
jcoates:dwarf-target2-ttype
jcoates:master
jcoates:release-6
jcoates:release-7
..
compare: jcoates:dwarf-target2-ttype
Branches Tags
jcoates:dwarf-target2-ttype
jcoates:master
jcoates:release-6
jcoates:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7
M-Labs:release-6

No commits in common. "master" and "dwarf-target2-ttype" have entirely different histories.
master ... dwarf-targ

16 changed files with 38 additions and 48 deletions
Show Stats Expand all files Collapse all files

36
flake.lock generated
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1739435991,
"narHash": "sha256-mmS2XPIh9EeUGvJQYmlHV0k/UCYmQ0HFmhhETKW/t2k=",
"lastModified": 1736946744,
"narHash": "sha256-RKqrWcJfkLlm5JYVfz46KOVg1FYch1pNkKDpW5VzehU=",
"ref": "refs/heads/master",
"rev": "77029874364ff8493081e8000ef964c9ba1ca965",
"revCount": 9155,
"rev": "33c91d73bb768a06fa427c237b124916261c5ab9",
"revCount": 9135,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
@ -70,11 +70,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1739214665,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"lastModified": 1736798957,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
@ -158,11 +158,11 @@
"src-migen": {
"flake": false,
"locked": {
"lastModified": 1738906518,
"narHash": "sha256-GproDJowtcgbccsT+I0mObzFhE483shcS8MSszKXwlc=",
"lastModified": 1735131698,
"narHash": "sha256-P4vaF+9iVekRAC2/mc9G7IwI6baBpPAxiDQ8uye4sAs=",
"owner": "m-labs",
"repo": "migen",
"rev": "2828df54594673653a641ab551caf6c6b1bfeee5",
"rev": "4c2ae8dfeea37f235b52acb8166f12acaaae4f7c",
"type": "github"
},
"original": {
@ -174,11 +174,11 @@
"src-misoc": {
"flake": false,
"locked": {
"lastModified": 1739428011,
"narHash": "sha256-ymvkR6ldCp+Kj29YGnaVuoM9Vi2GNxaqPlK0DWOCcgQ=",
"lastModified": 1736416570,
"narHash": "sha256-tbcN/fzejZIaYbTbwk8Ir1glYevESqMinMeDB3z8oxg=",
"ref": "refs/heads/master",
"rev": "47a3d8096dfae234599fd5406807cf2d92b6a351",
"revCount": 2473,
"rev": "1f5318e9edc1085ac77e9b85b8f5e03371dba54c",
"revCount": 2464,
"submodules": true,
"type": "git",
"url": "https://github.com/m-labs/misoc.git"
@ -229,11 +229,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1739437497,
"narHash": "sha256-hqsma8ZGBwAcr0OJBcqZLlT8EuhcCW7aYe96Nz153Bs=",
"lastModified": 1734668221,
"narHash": "sha256-X0U2yPmlsD3VLBZQyfWv8qw04Qn0qFWIONJUPPigB0U=",
"ref": "refs/heads/master",
"rev": "1c3912e34e43f087a8427509dfb3785b04b6a33e",
"revCount": 679,
"rev": "213529cf7a50aa1b2d9ffdf575e3e38202ff9bd6",
"revCount": 666,
"type": "git",
"url": "https://git.m-labs.hk/m-labs/zynq-rs"
},

12
flake.nix
View File

@ -135,13 +135,13 @@
pkgs.gnumake
(pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ]))
zynqpkgs.cargo-xbuild
pkgs.llvmPackages_14.llvm
pkgs.llvmPackages_14.clang-unwrapped
pkgs.llvmPackages_13.llvm
pkgs.llvmPackages_13.clang-unwrapped
];
buildPhase = ''
export ZYNQ_REV=${zynqRev}
export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library"
export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include"
export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include"
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
export ZYNQ_RS=${zynq-rs}
make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}
@ -376,8 +376,8 @@
name = "artiq-zynq-dev-shell";
buildInputs = with pkgs; [
rust
llvmPackages_14.llvm
llvmPackages_14.clang-unwrapped
llvmPackages_13.llvm
llvmPackages_13.clang-unwrapped
gnumake
cacert
zynqpkgs.cargo-xbuild
@ -392,7 +392,7 @@
];
ZYNQ_REV="${zynqRev}";
XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include";
CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include";
ZYNQ_RS = "${zynq-rs}";
OPENOCD_ZYNQ = "${zynq-rs}/openocd";
SZL = "${zynqpkgs.szl}";

1
src/.cargo/config
View File

@ -1,6 +1,7 @@
[target.armv7-none-eabihf]
rustflags = [
"-C", "link-arg=-Tlink.x",
"-C", "target-feature=a9,armv7-a,neon",
"-C", "target-cpu=cortex-a9",
]

4
src/Cargo.lock generated
View File

@ -82,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "compiler_builtins"
version = "0.1.70"
version = "0.1.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80873f979f0a344a4ade87c2f70d9ccf5720b83b10c97ec7cd745895d021e85a"
checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2"
[[package]]
name = "core_io"

2
src/armv7-none-eabihf.json
View File

@ -4,7 +4,7 @@
"emit-debug-gdb-scripts": false,
"env": "",
"executables": true,
"features": "+v7,+vfp3,-d32,+thumb2,+neon,+a9,+armv7-a",
"features": "+v7,+vfp3,-d32,+thumb2,-neon",
"is-builtin": false,
"linker": "rust-lld",
"linker-flavor": "ld.lld",

3
src/libboard_artiq/src/drtioaux.rs
View File

@ -1,4 +1,4 @@
use core::{arch::asm, slice};
use core::slice;
use core_io::{Error as IoError, ErrorKind as IoErrorKind};
use crc;
@ -39,7 +39,6 @@ pub fn copy_work_buffer(src: *mut u32, dst: *mut u32, len: isize) {
// fix for artiq-zynq#344
unsafe {
for i in 0..(len / 4) {
asm!("", options(preserves_flags, nostack, readonly));
*dst.offset(i) = *src.offset(i);
}
}

2
src/libboard_artiq/src/fiq.rs
View File

@ -1,5 +1,3 @@
use core::arch::asm;
use libboard_zynq::{println, stdio};
use libcortex_a9::{interrupt_handler, regs::MPIDR};
use libregister::RegisterR;

1
src/libboard_artiq/src/lib.rs
View File

@ -1,6 +1,7 @@
#![no_std]
#![feature(never_type)]
#![feature(naked_functions)]
#![feature(asm)]
extern crate core_io;
extern crate crc;

1
src/libio/lib.rs
View File

@ -1,5 +1,6 @@
#![no_std]
#![feature(never_type)]
#![feature(asm)]
#[cfg(feature = "alloc")]
extern crate alloc;

3
src/libksupport/src/irq.rs
View File

@ -1,5 +1,4 @@
use core::{arch::asm,
sync::atomic::{AtomicBool, Ordering}};
use core::sync::atomic::{AtomicBool, Ordering};
use libboard_zynq::{gic, mpcore, println, stdio};
use libcortex_a9::{asm, interrupt_handler, notify_spin_lock, regs::MPIDR, spin_lock_yield};

5
src/libksupport/src/kernel/core1.rs
View File

@ -8,7 +8,7 @@ use dyld::{self, elf::EXIDX_Entry, Library};
use libboard_zynq::{gic, mpcore};
use libcortex_a9::{asm::{dsb, isb},
cache::{bpiall, dcci_slice, iciallu},
sync_channel};
enable_fpu, sync_channel};
use libsupport_zynq::ram;
use log::{debug, error, info};
@ -25,14 +25,12 @@ extern "C" {
}
unsafe fn attribute_writeback(typeinfo: *const ()) {
#[repr(C)]
struct Attr {
offset: usize,
tag: CSlice<'static, u8>,
name: CSlice<'static, u8>,
}
#[repr(C)]
struct Type {
attributes: *const *const Attr,
objects: *const *const (),
@ -128,6 +126,7 @@ impl KernelImage {
#[no_mangle]
pub extern "C" fn main_core1() {
enable_fpu();
debug!("Core1 started");
ram::init_alloc_core1();

2
src/libksupport/src/lib.rs
View File

@ -1,8 +1,10 @@
#![no_std]
#![allow(incomplete_features)]
#![feature(c_variadic)]
#![feature(const_btree_new)]
#![feature(inline_const)]
#![feature(naked_functions)]
#![feature(asm)]
#[macro_use]
extern crate alloc;

1
src/runtime/src/main.rs
View File

@ -4,7 +4,6 @@
#![feature(alloc_error_handler)]
#![feature(const_btree_new)]
#![feature(panic_info_message)]
#![feature(lang_items)]
#[macro_use]
extern crate alloc;

4
src/runtime/src/panic.rs
View File

@ -71,7 +71,3 @@ fn soft_panic(info: &core::panic::PanicInfo) -> ! {
};
soft_panic_main(timer, cfg);
}
#[lang = "eh_personality"]
#[no_mangle]
pub extern "C" fn rust_eh_personality() {}

4
src/rustfmt.toml
View File

@ -19,7 +19,7 @@ fn_single_line = false
where_single_line = true
imports_indent = "Visual"
imports_layout = "Mixed"
imports_granularity = "Crate"
merge_imports = true
group_imports = "StdExternalCrate"
reorder_imports = true
reorder_modules = true
@ -54,7 +54,7 @@ use_field_init_shorthand = false
force_explicit_abi = true
condense_wildcard_suffixes = false
color = "Auto"
required_version = "1.4.38"
required_version = "1.4.37"
unstable_features = false
disable_all_formatting = false
skip_children = false

5
src/satman/src/main.rs
View File

@ -1,7 +1,6 @@
#![no_std]
#![no_main]
#![feature(alloc_error_handler, never_type, panic_info_message)]
#![feature(lang_items)]
#[macro_use]
extern crate log;
@ -1811,7 +1810,3 @@ pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! {
loop {}
}
#[lang = "eh_personality"]
#[no_mangle]
pub extern "C" fn rust_eh_personality() {}