Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
837d69a44b | ||
|
|
f0d5eb21f1 | ||
|
|
07e9095582 | ||
|
|
72769fbef7 | ||
|
|
95599c0e7c | ||
|
|
fcaafa0d12 | ||
|
|
e490b95f1d | ||
|
|
b601080960 | ||
|
|
27177979a2 | ||
|
|
f88a282893 | ||
|
|
ff4c597ff3 | ||
|
|
24c371cab1 | ||
|
|
7588a4c9cb | ||
|
|
5cb415c76b | ||
|
|
118d8b0c03 | ||
|
|
28caca3bcc | ||
|
|
6476a774dc | ||
|
|
e791edb02a | ||
|
|
da36f6fabb | ||
|
|
97e1a18253 | ||
|
|
88a850e8fc | ||
|
|
10c9194c5f | ||
|
|
94b477d8f7 | ||
|
|
ba38f4fd19 |
-66
@@ -1,66 +0,0 @@
|
|||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: build
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: build-image
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
repo: t3hn3rd/asuro-build
|
|
||||||
tags: latest
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
registry: docker.io
|
|
||||||
username:
|
|
||||||
from_secret: docker_username
|
|
||||||
password:
|
|
||||||
from_secret: docker_password
|
|
||||||
|
|
||||||
- name: compile
|
|
||||||
image: t3hn3rd/asuro-build:latest
|
|
||||||
depends_on:
|
|
||||||
- build-image
|
|
||||||
commands:
|
|
||||||
- git fetch --tags
|
|
||||||
- find . -type f -print0 | xargs -0 dos2unix
|
|
||||||
- chmod +x /drone/src/*.sh
|
|
||||||
- /drone/src/compile.sh
|
|
||||||
|
|
||||||
- name: upload-iso-artifact
|
|
||||||
image: alpine/git
|
|
||||||
depends_on:
|
|
||||||
- compile
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
environment:
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
commands:
|
|
||||||
- apk add --no-cache curl
|
|
||||||
- chmod +w Asuro.iso
|
|
||||||
- cp Asuro.iso "Asuro-$(git rev-parse --short HEAD).iso"
|
|
||||||
- echo "Uploading Asuro-$(git rev-parse --short HEAD).iso to Gitea Packages..."
|
|
||||||
- |
|
|
||||||
curl -X PUT "https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/$(git rev-parse --short HEAD)/Asuro.iso" \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
|
|
||||||
- echo "Updating latest ISO reference..."
|
|
||||||
- |
|
|
||||||
curl -X DELETE https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" || echo "No previous latest version found."
|
|
||||||
- |
|
|
||||||
curl -X PUT https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
|
|
||||||
|
|
||||||
- name: msg status
|
|
||||||
image: appleboy/drone-discord
|
|
||||||
failure: ignore
|
|
||||||
depends_on:
|
|
||||||
- compile
|
|
||||||
when:
|
|
||||||
status: [success, failure, changed]
|
|
||||||
settings:
|
|
||||||
webhook_id:
|
|
||||||
from_secret: discord_webhook_id
|
|
||||||
webhook_token:
|
|
||||||
from_secret: discord_webhook_secret
|
|
||||||
message: "**Asuro Build**\n\n{{#success build.status}}✅ Build successful!\n\n{{else}}❌ Build failed!\n\n{{/success}}Repository: `{{repo.namespace}}/{{repo.name}}`\nBranch: `{{commit.branch}}`\nCommit: `{{commit.sha}}`\nAuthor: `{{commit.author}} <{{commit.email}}>`\n\nGitea Diff: [Link](<{{commit.link}}>)\nDrone Build: [Link](<{{build.link}}>)\n\nMessage: {{commit.message}}"
|
|
||||||
+1
-8
@@ -1,8 +1 @@
|
|||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
lvglh/** linguist-vendored
|
|
||||||
lvgl/** linguist-vendored
|
|
||||||
.vscode/* linguist-vendored
|
|
||||||
lib/* linguist-generated
|
|
||||||
release/* linguist-generated
|
|
||||||
iso/* linguist-generated
|
|
||||||
*.asm linguist-detectable
|
|
||||||
@@ -11,10 +11,3 @@
|
|||||||
/*.img
|
/*.img
|
||||||
src/include/asuro.pas
|
src/include/asuro.pas
|
||||||
localenv.json
|
localenv.json
|
||||||
/lvgl/
|
|
||||||
dockerout.txt
|
|
||||||
AGENTS.md
|
|
||||||
lessons_learnt.md
|
|
||||||
*.log
|
|
||||||
/doc/*.md
|
|
||||||
wasuro
|
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
stages:
|
||||||
|
- Compile Versions
|
||||||
|
- Compile Sources
|
||||||
|
- Link
|
||||||
|
- Generate Documentation
|
||||||
|
- Deploy
|
||||||
|
|
||||||
|
cache:
|
||||||
|
- key: ${CI_COMMIT_REF_SLUG}
|
||||||
|
paths:
|
||||||
|
- lib/*.o
|
||||||
|
- bin/kernel.bin
|
||||||
|
- doc
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- chmod +x *.sh
|
||||||
|
|
||||||
|
versions:
|
||||||
|
stage: Compile Versions
|
||||||
|
script:
|
||||||
|
- ./compile_vergen.sh
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- release/*.svg
|
||||||
|
- src/include/asuro.pas
|
||||||
|
|
||||||
|
compile_sources:
|
||||||
|
stage: Compile Sources
|
||||||
|
script:
|
||||||
|
- rm -f lib/*.so
|
||||||
|
- ./compile_sources.sh
|
||||||
|
needs:
|
||||||
|
- versions
|
||||||
|
|
||||||
|
link:
|
||||||
|
stage: Link
|
||||||
|
script:
|
||||||
|
- ./compile_stub.sh
|
||||||
|
- ./compile_link.sh
|
||||||
|
needs:
|
||||||
|
- versions
|
||||||
|
- compile_sources
|
||||||
|
|
||||||
|
isogen:
|
||||||
|
stage: Deploy
|
||||||
|
script:
|
||||||
|
- ./compile_isogen.sh
|
||||||
|
- ./compile_sumgen.sh
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- ./Asuro.iso
|
||||||
|
- ./release/checksum.svg
|
||||||
|
needs:
|
||||||
|
- link
|
||||||
|
|
||||||
|
docgen:
|
||||||
|
stage: Generate Documentation
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- develop
|
||||||
|
script:
|
||||||
|
- ./compile_sourcelist.sh
|
||||||
|
- ./compile_docs.sh
|
||||||
|
# Remove comments when we want to use gitlab pages.
|
||||||
|
#- cp doc public
|
||||||
|
allow_failure: true
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- doc
|
||||||
|
#- public/*
|
||||||
|
#- ./sources.list
|
||||||
|
needs:
|
||||||
|
- versions
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
# Map all Aaron identities to a single preferred identity
|
|
||||||
Aaron Hance <[email protected]> aaron <aaron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
|
|
||||||
Aaron Hance <[email protected]> aaronhance <[email protected]>
|
|
||||||
Aaron Hance <[email protected]> aaron hance <[email protected]>
|
|
||||||
Aaron Hance <[email protected]> Aaron <[email protected]>
|
|
||||||
|
|
||||||
# Map all Kieron identities to a single preferred identity
|
|
||||||
Kieron Morris <[email protected]> kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
|
|
||||||
Kieron Morris <[email protected]> Kieron <[email protected]>
|
|
||||||
Kieron Morris <[email protected]> t3hn3rd <[email protected]>
|
|
||||||
|
|
||||||
# Map goose's multiple identities
|
|
||||||
goose <goose@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c> goose <[email protected]>
|
|
||||||
+3
-3
@@ -5,18 +5,18 @@ VOLUME ["/code"]
|
|||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN dpkg --add-architecture i386
|
RUN dpkg --add-architecture i386
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib && \
|
curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
|
||||||
apt-get clean my room
|
apt-get clean my room
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
SHELL ["/bin/bash", "-c"]
|
||||||
ARG FPC_VERSION=3.2.2
|
ARG FPC_VERSION=2.6.4
|
||||||
RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
|
RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
|
||||||
pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
|
pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
|
||||||
rm -rf fpc-$FPC_VERSION.i386-linux
|
rm -rf fpc-$FPC_VERSION.i386-linux
|
||||||
|
|
||||||
COPY compile.sh /compile.sh
|
COPY compile.sh /compile.sh
|
||||||
ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
|
ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
|
||||||
RUN chmod +x /usr/bin/semver
|
RUN mkdir /code && chmod +x /usr/bin/semver
|
||||||
WORKDIR /code
|
WORKDIR /code
|
||||||
RUN find . -type f -print0 | xargs -0 dos2unix
|
RUN find . -type f -print0 | xargs -0 dos2unix
|
||||||
ENTRYPOINT ["/bin/bash", "-c"]
|
ENTRYPOINT ["/bin/bash", "-c"]
|
||||||
|
|||||||
+15
-21
@@ -7,7 +7,7 @@ echo "Asuro Compilation"
|
|||||||
echo " "
|
echo " "
|
||||||
|
|
||||||
#Compile Stub.asm
|
#Compile Stub.asm
|
||||||
rm -f lib/*
|
rm lib/*
|
||||||
|
|
||||||
runOrFail() {
|
runOrFail() {
|
||||||
local binary=$1
|
local binary=$1
|
||||||
@@ -20,32 +20,26 @@ runOrFail() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
declare -a run_steps=(
|
runOrFail $(pwd)/compile_stub.sh "Failed to compile stub!"
|
||||||
"compile_stub.sh" "Failed to compile stub!"
|
|
||||||
"compile_vergen.sh" "Versions failed to compile"
|
|
||||||
"compile_lvgl.sh" "Failed to compile LVGL!"
|
|
||||||
"compile_wasuro.sh" "Failed to pull Wasuro!"
|
|
||||||
"compile_sources.sh" "Failed to compile FPC Sources!"
|
|
||||||
"compile_link.sh" "Failed linking!"
|
|
||||||
"compile_isogen.sh" "Failed to create ISO!"
|
|
||||||
)
|
|
||||||
|
|
||||||
for ((i=0; i<${#run_steps[@]}; i+=2))
|
#Generate .pas with versioning headers.
|
||||||
do
|
runOrFail $(pwd)/compile_vergen.sh "Versions failed to compile"
|
||||||
if [ "$ERRCOUNT" -eq "0" ]
|
|
||||||
then
|
#Compile all .pas sources
|
||||||
script=$(pwd)/"${run_steps[$i]}"
|
runOrFail $(pwd)/compile_sources.sh "Failed to compile FPC Sources!"
|
||||||
message="${run_steps[$i+1]}"
|
|
||||||
runOrFail "$script" "$message"
|
#Link into a binary.
|
||||||
fi
|
runOrFail $(pwd)/compile_link.sh "Failed linking!"
|
||||||
done
|
|
||||||
|
#Generate an ISO with GRUB as the Bootloader.
|
||||||
|
runOrFail ./compile_isogen.sh "Failed to create ISO!"
|
||||||
|
|
||||||
#Call generate final artifacts based on failure or success of the above.
|
#Call generate final artifacts based on failure or success of the above.
|
||||||
if [ "$ERRCOUNT" -ne "0" ]
|
if [ "$ERRCOUNT" -ne "0" ]
|
||||||
then
|
then
|
||||||
. ./compile_finish.sh "failed"
|
./compile_finish.sh "failed"
|
||||||
else
|
else
|
||||||
. ./compile_finish.sh "success"
|
./compile_finish.sh "success"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
+1
-6
@@ -14,9 +14,4 @@ done;
|
|||||||
objstring=lib/stub.o" "$objstring
|
objstring=lib/stub.o" "$objstring
|
||||||
echo "Object Files: "$objstring
|
echo "Object Files: "$objstring
|
||||||
echo " "
|
echo " "
|
||||||
|
ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring
|
||||||
# Find libgcc for i386 (needed by LVGL compiled with gcc)
|
|
||||||
LIBGCC=$(gcc -m32 -print-libgcc-file-name)
|
|
||||||
echo "libgcc: ${LIBGCC}"
|
|
||||||
|
|
||||||
ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group
|
|
||||||
-132
@@ -1,132 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
|
|
||||||
# Clone & compile in /tmp (fast container-local fs).
|
|
||||||
# Cache liblvgl.a on host mount (/code/lvgl/) to skip rebuild.
|
|
||||||
set -e
|
|
||||||
|
|
||||||
LVGL_VERSION="v9.2.2"
|
|
||||||
LVGL_REPO="https://github.com/lvgl/lvgl.git"
|
|
||||||
LVGL_DIR="/tmp/lvgl"
|
|
||||||
OBJ_DIR="/tmp/lvgl_obj"
|
|
||||||
CONF_DIR="$(pwd)/lvglh"
|
|
||||||
OUT_DIR="$(pwd)/lib"
|
|
||||||
CACHE_DIR="/code/lvgl"
|
|
||||||
|
|
||||||
CC="gcc"
|
|
||||||
CFLAGS="-m32 -march=i686 -ffreestanding \
|
|
||||||
-fno-builtin -fno-stack-protector -fno-pic -fno-pie \
|
|
||||||
-O2 -Wall -Wno-unused-function -Wno-unused-variable \
|
|
||||||
-I${CONF_DIR} \
|
|
||||||
-I${LVGL_DIR} \
|
|
||||||
-I${LVGL_DIR}/.. \
|
|
||||||
-DLV_CONF_INCLUDE_SIMPLE"
|
|
||||||
|
|
||||||
echo " "
|
|
||||||
echo "======================="
|
|
||||||
echo " "
|
|
||||||
echo "Compiling LVGL..."
|
|
||||||
echo " "
|
|
||||||
|
|
||||||
# If cached liblvgl.a exists on host mount, just copy it and skip everything
|
|
||||||
if [ -f "${CACHE_DIR}/liblvgl.a" ]; then
|
|
||||||
echo "Found cached liblvgl.a in ${CACHE_DIR}, copying to ${OUT_DIR}..."
|
|
||||||
cp "${CACHE_DIR}/liblvgl.a" "${OUT_DIR}/liblvgl.a"
|
|
||||||
echo "(Delete lvgl/liblvgl.a to force a full rebuild.)"
|
|
||||||
echo " "
|
|
||||||
echo "LVGL compilation complete (cached)."
|
|
||||||
echo " "
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clone LVGL into /tmp (container-local)
|
|
||||||
rm -rf "$LVGL_DIR"
|
|
||||||
echo "Downloading LVGL ${LVGL_VERSION}..."
|
|
||||||
git clone --depth 1 --branch "${LVGL_VERSION}" "${LVGL_REPO}" "${LVGL_DIR}" 2>&1
|
|
||||||
echo "Download complete."
|
|
||||||
|
|
||||||
# Gather all LVGL .c source files (core library only, no demos/examples)
|
|
||||||
SOURCES=$(find "${LVGL_DIR}/src" -name '*.c' -not -path '*/test/*')
|
|
||||||
TOTAL=$(echo "$SOURCES" | wc -l)
|
|
||||||
echo "Found ${TOTAL} LVGL source files."
|
|
||||||
|
|
||||||
# Compile each .c file to .o (container-local)
|
|
||||||
rm -rf "$OBJ_DIR"
|
|
||||||
mkdir -p "$OBJ_DIR"
|
|
||||||
|
|
||||||
COUNT=0
|
|
||||||
ERRORS=0
|
|
||||||
for src in $SOURCES; do
|
|
||||||
COUNT=$((COUNT + 1))
|
|
||||||
rel="${src#${LVGL_DIR}/src/}"
|
|
||||||
obj_path="${OBJ_DIR}/${rel%.c}.o"
|
|
||||||
mkdir -p "$(dirname "$obj_path")"
|
|
||||||
|
|
||||||
if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
|
|
||||||
echo "FAILED: $rel"
|
|
||||||
ERRORS=$((ERRORS + 1))
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $((COUNT % 50)) -eq 0 ]; then
|
|
||||||
echo " Compiled ${COUNT}/${TOTAL}..."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Compiled ${COUNT} files (${ERRORS} errors)."
|
|
||||||
|
|
||||||
if [ "$ERRORS" -ne 0 ]; then
|
|
||||||
echo "LVGL compilation FAILED with ${ERRORS} errors."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Archive into static library
|
|
||||||
OBJECTS=$(find "$OBJ_DIR" -name '*.o')
|
|
||||||
ar rcs "${OUT_DIR}/liblvgl.a" $OBJECTS
|
|
||||||
echo "Created ${OUT_DIR}/liblvgl.a"
|
|
||||||
|
|
||||||
# Compile custom LVGL extension files from lvglh/
|
|
||||||
LVGLH_SOURCES=$(find "${CONF_DIR}" -name '*.c' 2>/dev/null || true)
|
|
||||||
if [ -n "$LVGLH_SOURCES" ]; then
|
|
||||||
echo " "
|
|
||||||
echo "Compiling custom LVGL files from lvglh/..."
|
|
||||||
LVGLH_OBJ_DIR="/tmp/lvglh_obj"
|
|
||||||
rm -rf "$LVGLH_OBJ_DIR"
|
|
||||||
mkdir -p "$LVGLH_OBJ_DIR"
|
|
||||||
HCOUNT=0
|
|
||||||
HERRORS=0
|
|
||||||
for src in $LVGLH_SOURCES; do
|
|
||||||
HCOUNT=$((HCOUNT + 1))
|
|
||||||
rel="${src#${CONF_DIR}/}"
|
|
||||||
obj_path="${LVGLH_OBJ_DIR}/${rel%.c}.o"
|
|
||||||
mkdir -p "$(dirname "$obj_path")"
|
|
||||||
echo " [lvglh] $rel"
|
|
||||||
if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
|
|
||||||
echo " FAILED: $rel"
|
|
||||||
HERRORS=$((HERRORS + 1))
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo "Compiled ${HCOUNT} custom files (${HERRORS} errors)."
|
|
||||||
if [ "$HERRORS" -ne 0 ]; then
|
|
||||||
echo "Custom LVGL compilation FAILED."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
# Append custom objects into the existing archive
|
|
||||||
HOBJECTS=$(find "$LVGLH_OBJ_DIR" -name '*.o')
|
|
||||||
ar rcs "${OUT_DIR}/liblvgl.a" $HOBJECTS
|
|
||||||
echo "Updated ${OUT_DIR}/liblvgl.a with custom objects."
|
|
||||||
else
|
|
||||||
echo "No custom LVGL files in lvglh/."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Cache liblvgl.a and source to host mount for next build
|
|
||||||
echo "Caching LVGL to host mount..."
|
|
||||||
mkdir -p "$CACHE_DIR"
|
|
||||||
rm -rf ${CACHE_DIR}/* ${CACHE_DIR}/.[!.]* ${CACHE_DIR}/..?* 2>/dev/null || true
|
|
||||||
cp "${OUT_DIR}/liblvgl.a" "${CACHE_DIR}/liblvgl.a"
|
|
||||||
cp -a "$LVGL_DIR/src" "${CACHE_DIR}/src"
|
|
||||||
cp -a "$LVGL_DIR"/*.h "${CACHE_DIR}/" 2>/dev/null || true
|
|
||||||
cp -a "$OBJ_DIR" "${CACHE_DIR}/obj"
|
|
||||||
echo "Done."
|
|
||||||
|
|
||||||
echo " "
|
|
||||||
echo "LVGL compilation complete."
|
|
||||||
echo " "
|
|
||||||
+1
-7
@@ -4,10 +4,4 @@ echo "======================="
|
|||||||
echo " "
|
echo " "
|
||||||
echo "Compiling FPC Sources..."
|
echo "Compiling FPC Sources..."
|
||||||
echo " "
|
echo " "
|
||||||
# Build -Fu flags for all directories under src/ and wasuro/
|
fpc -Aelf -gw -n -va -O3 -Op3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas
|
||||||
FU_PATHS="-Fusrc -Fuwasuro"
|
|
||||||
for dir in $(find src wasuro -type d 2>/dev/null); do
|
|
||||||
FU_PATHS="$FU_PATHS -Fu$dir"
|
|
||||||
done
|
|
||||||
|
|
||||||
fpc -Aelf -gw -g -gl -n -v0e -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ $FU_PATHS src/kernel.pas
|
|
||||||
+1
-2
@@ -4,5 +4,4 @@ echo "======================="
|
|||||||
echo " "
|
echo " "
|
||||||
echo "Compiling Stub..."
|
echo "Compiling Stub..."
|
||||||
echo " "
|
echo " "
|
||||||
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
||||||
nasm -f elf src/stub/splash_tga.asm -o lib/splash_tga.o
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# compile_wasuro.sh — Pull Wasuro WASM runtime source into wasuro/
|
|
||||||
# Clones the repo (sparse, src/wasm only) and copies the Pascal sources
|
|
||||||
# into $PWD/wasuro so the FPC build can reference them via -Fu.
|
|
||||||
set -e
|
|
||||||
|
|
||||||
WASURO_REPO="https://gitea.spexeah.com/Spexeah/Wasuro.git"
|
|
||||||
WASURO_BRANCH="develop"
|
|
||||||
WASURO_TMP="/tmp/wasuro"
|
|
||||||
WASURO_OUT="$(pwd)/wasuro"
|
|
||||||
|
|
||||||
echo " "
|
|
||||||
echo "======================="
|
|
||||||
echo " "
|
|
||||||
echo "Pulling Wasuro WASM runtime..."
|
|
||||||
echo " "
|
|
||||||
|
|
||||||
# Skip if wasuro/ already has .pas files (cached from previous build)
|
|
||||||
if [ -n "$(find "${WASURO_OUT}" -name '*.pas' 2>/dev/null | head -1)" ]; then
|
|
||||||
echo "Wasuro sources already present in ${WASURO_OUT}, skipping pull."
|
|
||||||
echo " "
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clone sparse checkout (only src/wasm)
|
|
||||||
rm -rf "$WASURO_TMP"
|
|
||||||
git clone --depth 1 --branch "${WASURO_BRANCH}" --filter=blob:none --sparse \
|
|
||||||
"${WASURO_REPO}" "${WASURO_TMP}" 2>&1
|
|
||||||
cd "$WASURO_TMP"
|
|
||||||
git sparse-checkout set src/wasm 2>&1
|
|
||||||
cd -
|
|
||||||
|
|
||||||
echo "Copying src/wasm to ${WASURO_OUT}..."
|
|
||||||
rm -rf "$WASURO_OUT"
|
|
||||||
mkdir -p "$WASURO_OUT"
|
|
||||||
cp -a "${WASURO_TMP}/src/wasm/"* "$WASURO_OUT"/
|
|
||||||
rm -rf "$WASURO_TMP"
|
|
||||||
|
|
||||||
TOTAL=$(find "$WASURO_OUT" -name '*.pas' | wc -l)
|
|
||||||
echo "Copied ${TOTAL} Pascal source files."
|
|
||||||
echo " "
|
|
||||||
echo "Wasuro pull complete."
|
|
||||||
echo " "
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 MiB |
@@ -1 +0,0 @@
|
|||||||
Hello from the Asuro ISO!
|
|
||||||
+1
-12
@@ -2,7 +2,7 @@ ENTRY(loader)
|
|||||||
SECTIONS
|
SECTIONS
|
||||||
{
|
{
|
||||||
. = 0xC0100000;
|
. = 0xC0100000;
|
||||||
kernel_start = .;
|
|
||||||
.text : AT(ADDR(.text) - 0xC0000000)
|
.text : AT(ADDR(.text) - 0xC0000000)
|
||||||
{
|
{
|
||||||
text = .; _text = .; __text = .;
|
text = .; _text = .; __text = .;
|
||||||
@@ -33,15 +33,4 @@ SECTIONS
|
|||||||
. = ALIGN(4096);
|
. = ALIGN(4096);
|
||||||
}
|
}
|
||||||
end = .; _end = .; __end = .;
|
end = .; _end = .; __end = .;
|
||||||
kernel_end = .;
|
|
||||||
|
|
||||||
/DISCARD/ : {
|
|
||||||
*(.init_array*)
|
|
||||||
*(.fini_array*)
|
|
||||||
*(.ctors)
|
|
||||||
*(.dtors)
|
|
||||||
*(.eh_frame*)
|
|
||||||
*(.gcc_except_table*)
|
|
||||||
*(.note.GNU-stack)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
-12886
File diff suppressed because it is too large
Load Diff
-374
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+2709
File diff suppressed because it is too large
Load Diff
+5
-111
@@ -12,121 +12,15 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
{
|
{
|
||||||
ContextSwitcher - Custom IRQ0 handler for preemptive context switching.
|
ContextSwitcher - Switch Process Contexts when preempted.
|
||||||
|
|
||||||
Replaces the default ISR_32 with a naked assembly stub that saves the
|
@author(Kieron Morris <[email protected]>)
|
||||||
interrupted context (PUSHAD + segment regs), calls a Pascal helper to
|
|
||||||
dispatch timer hooks, send EOI, and run the scheduler, then restores
|
|
||||||
the next process context (or idles) via the returned ESP.
|
|
||||||
|
|
||||||
@author(Kieron Morris <[email protected]>)
|
|
||||||
}
|
}
|
||||||
unit contextswitcher;
|
unit contextswitcher;
|
||||||
|
|
||||||
{$ASMMODE intel}
|
|
||||||
|
|
||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
implementation;
|
||||||
idt, isrmanager, processmanager, proctypes, util, syslog, tracer;
|
|
||||||
|
|
||||||
{ Initialise: overwrite IDT gate 32 with our custom ISR. }
|
|
||||||
procedure init;
|
|
||||||
|
|
||||||
{ No idle ESP variable needed — idle is now a formal process (PID 0)
|
|
||||||
with its SavedESP managed like any other process. }
|
|
||||||
|
|
||||||
implementation
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
do_context_switch_work
|
|
||||||
Pascal helper called from the assembly ISR. Receives the current ESP
|
|
||||||
(pointing to the GS..EFLAGS save area), dispatches timer hooks, sends
|
|
||||||
EOI, runs the scheduler and returns the ESP for the next context.
|
|
||||||
Uses register calling convention: saved_esp in EAX, result in EAX.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
function do_context_switch_work(saved_esp : uint32) : uint32;
|
|
||||||
var
|
|
||||||
next : PProcessContext;
|
|
||||||
begin
|
|
||||||
{ 1. Save ESP into the current process }
|
|
||||||
processmanager.CurrentProcess^.SavedESP := saved_esp;
|
|
||||||
|
|
||||||
{ 2. Dispatch all hooks registered on interrupt 32 (timer hooks).
|
|
||||||
This fires TMR_0_ISR.Main which in turn fires BDA tick,
|
|
||||||
graphics refresh, USB hotplug, etc. }
|
|
||||||
isrmanager.dispatchHooks(32);
|
|
||||||
|
|
||||||
{ 3. Send End-Of-Interrupt to the master PIC }
|
|
||||||
outb($20, $20);
|
|
||||||
|
|
||||||
{ 4. Pick the next process to run (always returns non-nil; idle as fallback) }
|
|
||||||
next := processmanager.scheduler_pick_next;
|
|
||||||
processmanager.CurrentProcess := next;
|
|
||||||
|
|
||||||
{ 5. Return the selected process ESP }
|
|
||||||
do_context_switch_work := next^.SavedESP;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
context_switch_isr
|
|
||||||
Naked assembly ISR that replaces ISR_32 (IRQ0 / PIT timer).
|
|
||||||
|
|
||||||
Stack on entry (pushed by CPU):
|
|
||||||
[ESP+8] EFLAGS
|
|
||||||
[ESP+4] CS
|
|
||||||
[ESP+0] EIP
|
|
||||||
|
|
||||||
We push general-purpose and segment registers, call the Pascal helper,
|
|
||||||
switch ESP to the returned value, pop registers and IRETD.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
procedure context_switch_isr; assembler; nostackframe;
|
|
||||||
asm
|
|
||||||
{ Save all general-purpose registers (EAX,ECX,EDX,EBX,ESP,EBP,ESI,EDI) }
|
|
||||||
pushad
|
|
||||||
|
|
||||||
{ Save segment registers }
|
|
||||||
push ds
|
|
||||||
push es
|
|
||||||
push fs
|
|
||||||
push gs
|
|
||||||
|
|
||||||
{ Load kernel data segments }
|
|
||||||
mov ax, $10
|
|
||||||
mov ds, ax
|
|
||||||
mov es, ax
|
|
||||||
mov fs, ax
|
|
||||||
mov gs, ax
|
|
||||||
|
|
||||||
{ Call Pascal helper: EAX = current ESP (register calling convention).
|
|
||||||
Returns new ESP in EAX. }
|
|
||||||
mov eax, esp
|
|
||||||
call do_context_switch_work
|
|
||||||
mov esp, eax
|
|
||||||
|
|
||||||
{ Restore segment registers }
|
|
||||||
pop gs
|
|
||||||
pop fs
|
|
||||||
pop es
|
|
||||||
pop ds
|
|
||||||
|
|
||||||
{ Restore general-purpose registers }
|
|
||||||
popad
|
|
||||||
|
|
||||||
{ Return from interrupt }
|
|
||||||
iretd
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
init
|
|
||||||
Override IDT gate 32 with our custom ISR. Must be called AFTER
|
|
||||||
isrmanager.init so that the default gate has been set up first.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
procedure init;
|
|
||||||
begin
|
|
||||||
idt.set_gate(32, uint32(@context_switch_isr), $08, ISR_RING_0);
|
|
||||||
tracer.push_trace('contextswitcher.init');
|
|
||||||
end;
|
|
||||||
|
|
||||||
end.
|
end.
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user