M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

libsupport_zynq/ram: use core0 allocator by default.

This commit is contained in:
pca006132 2020-07-28 12:20:25 +08:00
parent 5850401d72
commit 84041a3154
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsupport_zynq/src/ram.rs
View File

@ -19,7 +19,7 @@ unsafe impl Sync for CortexA9Alloc {}
unsafe impl GlobalAlloc for CortexA9Alloc { unsafe impl GlobalAlloc for CortexA9Alloc {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 { unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
if MPIDR.read().cpu_id() == 0 { if cfg!(not(feature = "alloc_core")) || MPIDR.read().cpu_id() == 0 {
self.0.get().as_mut() self.0.get().as_mut()
} else { } else {
self.1.get().as_mut() self.1.get().as_mut()
@ -31,7 +31,7 @@ unsafe impl GlobalAlloc for CortexA9Alloc {
} }
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) { unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
if MPIDR.read().cpu_id() == 0 { if cfg!(not(feature = "alloc_core")) || MPIDR.read().cpu_id() == 0 {
self.0.get().as_mut() self.0.get().as_mut()
} else { } else {
self.1.get().as_mut() self.1.get().as_mut()
@ -83,7 +83,7 @@ pub fn init_alloc_core1() {
fn alloc_error(layout: core::alloc::Layout) -> ! { fn alloc_error(layout: core::alloc::Layout) -> ! {
let id = MPIDR.read().cpu_id(); let id = MPIDR.read().cpu_id();
let heap = unsafe { let heap = unsafe {
if id == 0 { if cfg!(not(feature = "alloc_core")) || id == 0 {
ALLOCATOR.0.get() ALLOCATOR.0.get()
} else { } else {
ALLOCATOR.1.get() ALLOCATOR.1.get()