From 3382121c3a745575fe7ec755d341ed28d617926d Mon Sep 17 00:00:00 2001
From: Morten Delenk <morten@dark32.cf>
Date: Sat, 29 Apr 2017 11:06:31 +0000
Subject: [PATCH] added working LFB driver and some helper scripts

---
 .gitignore                            |  1 +
 buildtools/grub-iso.sh                |  2 +
 buildtools/mkfirm.py                  | 65 +++++++++++++++++++++++++++
 buildtools/sighax-firm.sh             |  3 ++
 iso/{grub2 => boot/grub}/grub.cfg     |  0
 kernel/hw/framebuffer/framebuffer.cpp | 18 ++++++--
 kernel/hw/pc/vesafb/vesafb.cpp        |  9 +++-
 kernel/src/main.cpp                   |  3 +-
 8 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100755 buildtools/grub-iso.sh
 create mode 100755 buildtools/mkfirm.py
 create mode 100755 buildtools/sighax-firm.sh
 rename iso/{grub2 => boot/grub}/grub.cfg (100%)

diff --git a/.gitignore b/.gitignore
index e2eab30..7c56a09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ build/
 __pycache__/
 *.iso
 iso/kernel
+*.firm
diff --git a/buildtools/grub-iso.sh b/buildtools/grub-iso.sh
new file mode 100755
index 0000000..135acd1
--- /dev/null
+++ b/buildtools/grub-iso.sh
@@ -0,0 +1,2 @@
+cp build/kernel/kernel iso
+grub-mkrescue -o bootable.iso iso
diff --git a/buildtools/mkfirm.py b/buildtools/mkfirm.py
new file mode 100755
index 0000000..8fe1011
--- /dev/null
+++ b/buildtools/mkfirm.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+import sys
+if len(sys.argv) < 4:
+    print("USAGE: mkfirm.py <kernel9.elf> <kernel11.elf> <output.firm>")
+print("WARNING: Currently you cannot install this FIRM, because YOU'LL BRICK YOUR 3DS!")
+sighax_sig = b'\x00'*256 #TODO insert sighax signature here.
+import struct
+import hashlib
+def get_elf_seg(f): #Return entry,section_beg,section_size,section
+    f.seek(0)
+    if f.read(4) != b"\x7FELF":
+        raise Exception("Not an ELF file!")
+    if f.read(1) != b"\x01":
+        raise Exception("ELF64s are not supported!")
+    if f.read(1) != b"\x01":
+        raise Exception("Little Endian ELF required!")
+    if f.read(1) != b"\x01":
+        raise Exception("Unknown ELF version!")
+    if struct.unpack("<H",f.read(2))[0] != 2:
+        raise Exception("Invalid ELF format")
+    if struct.unpack("<H",f.read(2))[0] != 0x28:
+        raise Exception("This is not an ELF for ARM!")
+    if struct.unpack("<I",f.read(4))[0] != 1:
+        raise Exception("Unknown ELF version!")
+    loadAddr = struct.unpack("<I",f.read(4))[0]
+    phoff = struct.unpack("<I",f.read(4))[0]
+    f.seek(0x2C)
+    no_ent = struct.unpack("<H",f.read(2))[0]
+    f.seek(phoff)
+    section_begin = 0
+    section_size = 0
+    section = b''
+    for ent in range(no_ent):
+        if struct.unpack("<I",f.read(4)) != 1:
+            continue
+        off,vaddr,filesz,memsz=struct.unpack("<IIxxxxII",f.read(20))
+        section_begin = vaddr
+        section_size = memsz
+        f.seek(off)
+        section = f.read(filesz)
+        section = section + b'\x00'*(memsz-filesz)
+        break
+    print("Loading section of size {} to {} with entrypoint {}".format(section_size,hex(section_begin),hex(loadAddr)))
+    return (loadAddr,section_begin,section_size,section)
+f1 = open(sys.argv[1],"rb")
+f2 = open(sys.argv[2],"rb")
+f3 = open(sys.argv[3],"wb")
+arm9_entry,arm9_section_beg,arm9_section_size,arm9_section = get_elf_seg(f1)
+arm11_entry,arm11_section_beg,arm11_section_size,arm11_section = get_elf_seg(f2)
+arm9_hash=hashlib.sha256(arm9_section).digest()
+arm11_hash=hashlib.sha256(arm11_section).digest()
+arm9_off = 0x200
+arm11_off = 0x200+arm9_section_size
+f.write(b'FIRM')
+f.write(struct.pack("<III",0,arm11_entry,arm9_entry))
+f.write(b'\x00'*0x30)
+def write_seg(section_beg, section_size, hash, off):
+    f.write(struct.pack("<IIII",off,section_beg,section_size,2))
+    f.write(hash)
+write_seg(arm9_section_beg,arm9_section_size,arm9_hash,arm9_off)
+write_seg(arm11_section_beg,arm11_section_size,arm11_hash,arm11_off)
+f.write(b'\x00'*0x60)
+f.write(sighax_sig)
+f.write(arm9_section)
+f.write(arm11_section)
diff --git a/buildtools/sighax-firm.sh b/buildtools/sighax-firm.sh
new file mode 100755
index 0000000..01df83d
--- /dev/null
+++ b/buildtools/sighax-firm.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "You need kernel9 in build/kernel/kernel9"
+buildtools/mkfirm.py build/kernel/kernel9 build/kernel/kernel sighax.firm
diff --git a/iso/grub2/grub.cfg b/iso/boot/grub/grub.cfg
similarity index 100%
rename from iso/grub2/grub.cfg
rename to iso/boot/grub/grub.cfg
diff --git a/kernel/hw/framebuffer/framebuffer.cpp b/kernel/hw/framebuffer/framebuffer.cpp
index 84dfe1e..0e4c459 100644
--- a/kernel/hw/framebuffer/framebuffer.cpp
+++ b/kernel/hw/framebuffer/framebuffer.cpp
@@ -7,8 +7,8 @@ auto Framebuffer::plotChar(int x, int y, int c) -> void {
     if (width == 16) this->x++;
     if (!width) return;
     int color;
-    for (int px = x * 8; px < (x * 8) + width; x++)
-        for (int py = y * 16; py < (y * 16) + 16; y++) {
+    for (int px = x * 8; px < (x * 8) + width; px++)
+        for (int py = y * 16; py < (y * 16) + 16; py++) {
             color = rgbColor;
             if (!useRGB) {
                 switch (curColor) {
@@ -32,7 +32,19 @@ auto Framebuffer::plotChar(int x, int y, int c) -> void {
                 rgbColor = color;
                 useRGB = true;
             }
-            plotPixel(px, py, color);
+            unsigned char *chara = (unsigned char *)font_ptr[c];
+            int bx = px - (x * 8);
+            int by = py - (y * 16);
+            if (width == 16) {
+                by *= 2;
+                if (bx > 7) {
+                    by++;
+                    bx -= 8;
+                }
+                plotPixel(px, py, (chara[by] & (1 << (7 - bx))) ? color : 0);
+            } else {
+                plotPixel(px, py, (chara[by] & (1 << (7 - bx))) ? color : 0);
+            }
         }
 }
 Framebuffer::Framebuffer(int height, int width) : TTY(height, width) {}
diff --git a/kernel/hw/pc/vesafb/vesafb.cpp b/kernel/hw/pc/vesafb/vesafb.cpp
index 15ee25e..1f4d9d5 100644
--- a/kernel/hw/pc/vesafb/vesafb.cpp
+++ b/kernel/hw/pc/vesafb/vesafb.cpp
@@ -1,8 +1,13 @@
 #include "vesafb.hpp"
 #include <stdint.h>
 auto VESAfb::plotPixel(int x, int y, int col) -> void {
-    int *lfb = (int *)((uintptr_t)(mb_info->framebuffer_addr));
-    lfb[y * mb_info->framebuffer_pitch + x] = col;
+    unsigned char *lfb = (unsigned char *)((uintptr_t)(mb_info->framebuffer_addr));
+    int off = y * mb_info->framebuffer_pitch / (mb_info->framebuffer_bpp / 8) + x;
+    off *= mb_info->framebuffer_bpp / 8;
+    for (int i = 0; i < mb_info->framebuffer_bpp / 8; i++) {
+        lfb[off++] = col;
+        col >>= 8;
+    }
 }
 VESAfb::VESAfb(multiboot_info_t *mb_info)
     : mb_info(mb_info), Framebuffer(mb_info->framebuffer_width / 8, mb_info->framebuffer_height / 16) {}
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index ba6b59b..753eb97 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -7,6 +7,7 @@ extern "C" void (*end_dtors)();
 void main() {
     for (auto ctor = &start_ctors; ctor < &end_ctors; ctor++) (**ctor)();
     drivers_init();
-    *out << "Hallo!\n";
+    *out << "Hello!\n";
+    *out << "テスト\n";
     for (auto dtor = &start_dtors; dtor != &end_dtors; dtor++) (**dtor)();
 }