Merge pull request #72 from kkebo/fix-actual-device

Author: kkebo

Makefile

@@ -7,7 +7,7 @@ SWIFT := swift
 SWIFT_BUILD_FLAGS := --triple $(TRIPLE) -c release -Xswiftc -Osize \
 					 --experimental-lto-mode=full -Xswiftc -experimental-hermetic-seal-at-link
 LD := clang -fuse-ld=lld
-LDFLAGS := --target=$(TRIPLE) -nostdlib -static -Wl,--gc-sections,--print-gc-sections,--strip-all,--allow-multiple-definition
+LDFLAGS := --target=$(TRIPLE) -nostdlib -static -Wl,--gc-sections,--print-gc-sections,--strip-all
 OBJCOPY := llvm-objcopy
 QEMU := qemu-system-aarch64
 

Package.swift

@@ -35,13 +35,12 @@ let package = Package(
         ),
         .target(
             name: "RaspberryPi",
-            dependencies: ["Font", "Support", "AsmSupport"],
+            dependencies: ["Font", "AsmSupport"],
             swiftSettings: swiftSettings + [
                 .enableExperimentalFeature("Volatile")
             ],
         ),
         .target(name: "Font", swiftSettings: swiftSettings),
-        .target(name: "Support", swiftSettings: swiftSettings),
         .target(name: "AsmSupport"),
     ],
 )

Sources/RaspberryPi/Framebuffer.swift

@@ -87,20 +87,22 @@ package struct Framebuffer<Depth: UnsignedInteger>: ~Copyable {
         // success?
         guard mboxCall(ch: .property) else { fatalError() }
 
-        let pixelCount = unsafe Int(mbox.29) / MemoryLayout<Depth>.stride
+        let pixelCount = unsafe Int(mbox.10 &* mbox.11)
+        let byteCount = unsafe mbox.29
+        let gpuAddr = unsafe mbox.28
 
         guard
             unsafe mbox.20 == depth,
-            unsafe mbox.28 != 0,  // pointer is not null
-            unsafe pixelCount == mbox.10 &* mbox.11
+            gpuAddr != 0,
+            byteCount >= pixelCount &* MemoryLayout<Depth>.size
         else { fatalError() }
 
         self.width = unsafe mbox.10
         self.height = unsafe mbox.11
         // swift-format-ignore: NeverForceUnwrap
         self.pixelOrder = unsafe .init(rawValue: mbox.24)!
         // GPU address to ARM address
-        let addr = unsafe UInt(mbox.28 & 0x3FFF_FFFF)
+        let addr = UInt(gpuAddr & 0x3FFF_FFFF)
         // swift-format-ignore: NeverForceUnwrap
         unsafe self.baseAddress = UnsafeMutableRawPointer(bitPattern: addr)!
             .bindMemory(to: Depth.self, capacity: pixelCount)

Sources/RaspberryPi/mbox.swift

@@ -13,7 +13,7 @@ let mboxFull: UInt32 = 0x8000_0000
 let mboxEmpty: UInt32 = 0x4000_0000
 
 @_alignment(16)
-struct Mbox: ~Copyable {
+struct Mbox {
     var `0`: UInt32 = 0
     var `1`: UInt32 = 0
     var `2`: UInt32 = 0