From 9940b56570bd790c28313461a206c57cf6607b31 Mon Sep 17 00:00:00 2001
From: Ben Fiedler <ben.fiedler@inf.ethz.ch>
Date: Thu, 20 Jun 2024 21:29:48 +0200
Subject: [PATCH 1/2] Remove demo hack that marked whole interconnect as
context
---
src/specs/morello.rs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/specs/morello.rs b/src/specs/morello.rs
index 9b6d48b..f1ee60a 100644
--- a/src/specs/morello.rs
+++ b/src/specs/morello.rs
@@ -225,11 +225,10 @@ impl Morello {
let ap_core1 = dn.add_address_space("ap_core1", "", 0x0, 0x4000_0000_0000)?;
let ap_core2 = dn.add_address_space("ap_core2", "", 0x0, 0x4000_0000_0000)?;
let ap_core3 = dn.add_address_space("ap_core3", "", 0x0, 0x4000_0000_0000)?;
- //dn.mark_context(ap_core0, "");
- //dn.mark_context(ap_core1, "");
- //dn.mark_context(ap_core2, "");
- //dn.mark_context(ap_core3, "");
- dn.mark_context(ap_memory_map, "HACK: mark memory map as context since it has the same view.\nIt takes too long (>3h) when the ap_cores are contexts too");
+ dn.mark_context(ap_core0, "");
+ dn.mark_context(ap_core1, "");
+ dn.mark_context(ap_core2, "");
+ dn.mark_context(ap_core3, "");
dn.add_mapping(ap_core0, ap_memory_map, 0x0, 0x0, 0x4000_0000_0000, "")?;
dn.add_mapping(ap_core1, ap_memory_map, 0x0, 0x0, 0x4000_0000_0000, "")?;
--
GitLab
From 4aabe055711cdc3c2569668576dcde374db6ec6a Mon Sep 17 00:00:00 2001
From: Ben Fiedler <ben.fiedler@inf.ethz.ch>
Date: Thu, 20 Jun 2024 21:30:44 +0200
Subject: [PATCH 2/2] Fix morello model with respect to alignment
---
src/specs/morello.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/specs/morello.rs b/src/specs/morello.rs
index f1ee60a..5dfeb88 100644
--- a/src/specs/morello.rs
+++ b/src/specs/morello.rs
@@ -440,7 +440,7 @@ impl Morello {
ap_memory_map,
0x0,
0x0,
- 0x3FFF_FFFF_FFFF,
+ 0x4000_0000_0000,
"",
)?;
let dpu_memory_map = dn.add_address_space("dpu_memory_map", "", 0x0, 0x4000_0000_0000)?;
@@ -450,7 +450,7 @@ impl Morello {
ap_memory_map,
0x0,
0x0,
- 0x3FFF_FFFF_FFFF,
+ 0x4000_0000_0000,
"",
)?;
--
GitLab