Skip to content

Update things so that Luma builds again on recent nightly #26

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
ProfElements merged 2 commits into from
Dec 15, 2024
Merged

Update things so that Luma builds again on recent nightly #26

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
21baf5c
Change the target data-layout to match LLVM’s
linkmauve Dec 14, 2024
56fc048
Replace removed from_exposed_addr_mut() with as *mut u32
linkmauve Dec 14, 2024
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
34 changes: 12 additions & 22 deletions luma_core/src/ipc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
use core::ptr::from_exposed_addr_mut;

//bits 0..=31 = physical address of ipc request
const HW_IPC_PPCMSG: usize = 0xCD00_0000usize; //from_exposed_addr_mut(0xCD00_0000);
const HW_IPC_PPCMSG: *mut u32 = 0xCD00_0000 as *mut u32;

//bit 0 = X1 | Execute IPC request
//bit 1 = Y2 | Acknowledge IPC request
//bit 2 = Y1 | IPC request reply available
//bit 3 = X2 | Relaunch IPC
//bit 4 = IY1 | IPC request reply send out IPC interrupt
//bit 5 = IY2 | IPC request acknowledge sends out IPC interrupt
const HW_IPC_PPCCTRL: usize = 0xCD00_0004usize; //from_exposed_addr_mut(0xCD00_0004);
const HW_IPC_PPCCTRL: *mut u32 = 0xCD00_0004 as *mut u32;

//bits 0..=31 = physical address of ipc request
const HW_IPC_ARMMSG: usize = 0xCD00_0008usize; //from_exposed_addr_mut(0xCD00_0008);
const HW_IPC_ARMMSG: *mut u32 = 0xCD00_0008 as *mut u32;

//bit 0 = Y1 | IPC request reply available
//bit 1 = X2 | Relauch IPC
//bit 2 = X1 | Execute IPC request
//bit 3 = Y2 | Acknowledge IPC request
//bit 4 = IX1 | Execute ipc request send IPC interrupt
//bit 5 = IX2 | Relaunch IPC sends IPC interrupt
const HW_IPC_ARMCTRL: usize = 0xCD00_000Cusize; //from_exposed_addr_mut(0xCD00_000C);
const HW_IPC_ARMCTRL: *mut u32 = 0xCD00_000C as *mut u32;

/// IPC Message Address (for BOTH ARM AND PPC)
#[repr(transparent)]
Expand All @@ -32,23 +30,19 @@ impl IpcMessageAddress {
}

pub fn read_ppc() -> Self {
let hw_ipc_ppcmsg = from_exposed_addr_mut::<u32>(HW_IPC_PPCMSG);
Self(unsafe { hw_ipc_ppcmsg.read_volatile() })
Self(unsafe { HW_IPC_PPCMSG.read_volatile() })
}

pub fn write_ppc(self) {
let hw_ipc_ppcmsg = from_exposed_addr_mut::<u32>(HW_IPC_PPCMSG);
unsafe { hw_ipc_ppcmsg.write_volatile(self.0) }
unsafe { HW_IPC_PPCMSG.write_volatile(self.0) }
}

pub fn read_arm() -> Self {
let hw_ipc_armmsg = from_exposed_addr_mut::<u32>(HW_IPC_ARMMSG);
Self(unsafe { hw_ipc_armmsg.read_volatile() })
Self(unsafe { HW_IPC_ARMMSG.read_volatile() })
}

pub fn write_arm(self) {
let hw_ipc_armmsg = from_exposed_addr_mut::<u32>(HW_IPC_ARMMSG);
unsafe { hw_ipc_armmsg.write_volatile(self.0) }
unsafe { HW_IPC_ARMMSG.write_volatile(self.0) }
}

pub fn address(&self) -> u32 {
Expand Down Expand Up @@ -79,13 +73,11 @@ impl PpcIpcControl {
}

pub fn read() -> Self {
let hw_ipc_ppcctrl = from_exposed_addr_mut::<u32>(HW_IPC_PPCCTRL);
Self(unsafe { hw_ipc_ppcctrl.read_volatile() })
Self(unsafe { HW_IPC_PPCCTRL.read_volatile() })
}

pub fn write(self) {
let hw_ipc_ppcctrl = from_exposed_addr_mut::<u32>(HW_IPC_PPCCTRL);
unsafe { hw_ipc_ppcctrl.write_volatile(self.0) }
unsafe { HW_IPC_PPCCTRL.write_volatile(self.0) }
}

pub fn execute(&self) -> bool {
Expand Down Expand Up @@ -153,13 +145,11 @@ impl ArmIpcControl {
}

pub fn read() -> Self {
let hw_ipc_armctrl = from_exposed_addr_mut::<u32>(HW_IPC_ARMCTRL);
Self(unsafe { hw_ipc_armctrl.read_volatile() })
Self(unsafe { HW_IPC_ARMCTRL.read_volatile() })
}

pub fn write(self) {
let hw_ipc_armctrl = from_exposed_addr_mut::<u32>(HW_IPC_ARMCTRL);
unsafe { hw_ipc_armctrl.write_volatile(self.0) }
unsafe { HW_IPC_ARMCTRL.write_volatile(self.0) }
}

pub fn execute(&self) -> bool {
Expand Down
8 changes: 1 addition & 7 deletions luma_core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
//! **NOTE**: This is currently in a very experimental state and is subject to change.
#![no_std]
#![allow(unused_attributes)]
#![feature(
asm_experimental_arch,
box_into_boxed_slice,
allocator_api,
exposed_provenance,
strict_provenance
)]
#![feature(asm_experimental_arch, box_into_boxed_slice, allocator_api)]

extern crate alloc;

Expand Down
2 changes: 1 addition & 1 deletion powerpc-unknown-eabi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"cpu": "750",
"env": "newlib",
"exe-suffix": ".elf",
"data-layout": "E-m:e-p:32:32-i64:64-n32",
"data-layout": "E-m:e-p:32:32-Fn32-i64:64-n32",
"executables": true,
"has-rpath": true,
"llvm-target": "powerpc-unknown-eabi",
Expand Down