Skip to content

Move eclic hack into Rust #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcz-self merged 2 commits into from
Oct 23, 2025
Merged

Move eclic hack into Rust #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f2a491
eclic: Rewrite asm in Rust
Sep 25, 2025
f2fd9ce
Update readme
Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ Alternative to [gd32vf103-hal](https://github.com/luojia65/gd32vf103-hal)

## [Documentation](https://docs.rs/crate/gd32vf103xx-hal)

## Usage

This crate defines a linker script called "device.x". In order to build this crate correctly, you must notify the linker about it. For example, bu ensuring your `.cargo/config.toml` file contains the following:

```
[target.riscv32imac-unknown-none-elf]
rustflags = [
"-C", "link-arg=-Tdevice.x",
]
```

## License

Copyright 2019 [RISC-V team][team]
Expand Down
11 changes: 0 additions & 11 deletions assemble.sh
View file
Open in desktop

This file was deleted.

Binary file removed bin/gd32vf103xx-hal.a
View file
Open in desktop
Binary file not shown.
20 changes: 5 additions & 15 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,9 @@ use std::fs;
use std::path::PathBuf;

fn main() {
let target = env::var("TARGET").unwrap();
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let name = env::var("CARGO_PKG_NAME").unwrap();

if target.starts_with("riscv") {
fs::copy(
format!("bin/{}.a", name),
out_dir.join(format!("lib{}.a", name)),
).unwrap();

println!("cargo:rustc-link-lib=static={}", name);
println!("cargo:rustc-link-search={}", out_dir.display());
}

println!("cargo:rerun-if-changed=bin/{}.a", name);
let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
println!("cargo:rustc-link-search={}", out.display());
fs::copy("device.x", out.join("device.x")).unwrap();
println!("cargo:rerun-if-changed=device.x");
println!("cargo:rerun-if-changed=build.rs");
}
64 changes: 64 additions & 0 deletions device.x
View file
Open in desktop
Copy link
Copy Markdown
Member

@Disasm Disasm Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be in PAC? https://github.com/riscv-rust/gd32vf103-pac/blob/master/device.x

Copy link
Copy Markdown
Contributor Author

@dcz-self dcz-self Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, but it still works with PAC 0.4.0.
This is the 0.5.0 upgrade: #72
and I'd like for this to come in first: riscv-rust/gd32vf103-pac#13 so I don't have to update the same code multiple times.

Copy link
Copy Markdown
Member

@Disasm Disasm Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I remember, storing multiple files with the same name to different output directories leads to a situation when linker chooses a random one, so it works as expected only with a bit of luck. I would not rely on it.

Copy link
Copy Markdown
Contributor Author

@dcz-self dcz-self Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PAC 0.4.0 doesn't have device.x at all.

Copy link
Copy Markdown
Member

@Disasm Disasm Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see. Update to 0.5.0 should fix the issue then.

Copy link
Copy Markdown
Contributor Author

@dcz-self dcz-self Sep 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, there's no issue with this MR. It can be merged now, and later we can upgrade to pac 0.5.0 and remove the unnecessary linker script.

Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
PROVIDE(INT_SFT = DefaultHandler);
PROVIDE(INT_TMR = DefaultHandler);
PROVIDE(INT_BWEI = DefaultHandler);
PROVIDE(INT_PMOVI = DefaultHandler);
PROVIDE(WWDGT = DefaultHandler);
PROVIDE(EXTI_LVD = DefaultHandler);
PROVIDE(TAMPER = DefaultHandler);
PROVIDE(RTC = DefaultHandler);
PROVIDE(FMC = DefaultHandler);
PROVIDE(RCU = DefaultHandler);
PROVIDE(EXTI_LINE0 = DefaultHandler);
PROVIDE(EXTI_LINE1 = DefaultHandler);
PROVIDE(EXTI_LINE2 = DefaultHandler);
PROVIDE(EXTI_LINE3 = DefaultHandler);
PROVIDE(EXTI_LINE4 = DefaultHandler);
PROVIDE(DMA0_CHANNEL0 = DefaultHandler);
PROVIDE(DMA0_CHANNEL1 = DefaultHandler);
PROVIDE(DMA0_CHANNEL2 = DefaultHandler);
PROVIDE(DMA0_CHANNEL3 = DefaultHandler);
PROVIDE(DMA0_CHANNEL4 = DefaultHandler);
PROVIDE(DMA0_CHANNEL5 = DefaultHandler);
PROVIDE(DMA0_CHANNEL6 = DefaultHandler);
PROVIDE(ADC0_1 = DefaultHandler);
PROVIDE(CAN0_TX = DefaultHandler);
PROVIDE(CAN0_RX0 = DefaultHandler);
PROVIDE(CAN0_RX1 = DefaultHandler);
PROVIDE(CAN0_EWMC = DefaultHandler);
PROVIDE(EXTI_LINE9_5 = DefaultHandler);
PROVIDE(TIMER0_BRK = DefaultHandler);
PROVIDE(TIMER0_UP = DefaultHandler);
PROVIDE(TIMER0_TRG_CMT = DefaultHandler);
PROVIDE(TIMER0_CHANNEL = DefaultHandler);
PROVIDE(TIMER1 = DefaultHandler);
PROVIDE(TIMER2 = DefaultHandler);
PROVIDE(TIMER3 = DefaultHandler);
PROVIDE(I2C0_EV = DefaultHandler);
PROVIDE(I2C0_ER = DefaultHandler);
PROVIDE(I2C1_EV = DefaultHandler);
PROVIDE(I2C1_ER = DefaultHandler);
PROVIDE(SPI0 = DefaultHandler);
PROVIDE(SPI1 = DefaultHandler);
PROVIDE(USART0 = DefaultHandler);
PROVIDE(USART1 = DefaultHandler);
PROVIDE(USART2 = DefaultHandler);
PROVIDE(EXTI_LINE15_10 = DefaultHandler);
PROVIDE(RTC_ALARM = DefaultHandler);
PROVIDE(USBFS_WKUP = DefaultHandler);
PROVIDE(EXMC = DefaultHandler);
PROVIDE(TIMER4 = DefaultHandler);
PROVIDE(SPI2 = DefaultHandler);
PROVIDE(UART3 = DefaultHandler);
PROVIDE(UART4 = DefaultHandler);
PROVIDE(TIMER5 = DefaultHandler);
PROVIDE(TIMER6 = DefaultHandler);
PROVIDE(DMA1_CHANNEL0 = DefaultHandler);
PROVIDE(DMA1_CHANNEL1 = DefaultHandler);
PROVIDE(DMA1_CHANNEL2 = DefaultHandler);
PROVIDE(DMA1_CHANNEL3 = DefaultHandler);
PROVIDE(DMA1_CHANNEL4 = DefaultHandler);
PROVIDE(CAN1_TX = DefaultHandler);
PROVIDE(CAN1_RX0 = DefaultHandler);
PROVIDE(CAN1_RX1 = DefaultHandler);
PROVIDE(CAN1_EWMC = DefaultHandler);
PROVIDE(USBFS = DefaultHandler);
Loading
Loading