Browse Source

binary cleanup, grub config + iso deploy fix

mntmn 8 years ago
parent
commit
498f4f8510
7 changed files with 38 additions and 3 deletions
  1. 2 0
      .gitignore
  2. 1 1
      build/386iso/boot/grub/grub.cfg
  3. BIN
      build/386iso/boot/interim.386
  4. 1 1
      deploy_386.sh
  5. 1 1
      devices/grub.cfg
  6. 33 0
      i386-ops.s
  7. BIN
      interim386.iso

+ 2 - 0
.gitignore

@@ -10,3 +10,5 @@ build/*.elf
 newlib
 .#*
 build/interim.bin
+interim386.iso
+build/386iso/boot/interim.386

+ 1 - 1
build/386iso/boot/grub/grub.cfg

@@ -1,3 +1,3 @@
-menuentry "interim.386" {
+menuentry "interim/386" {
 	multiboot /boot/interim.386
 }

BIN
build/386iso/boot/interim.386


+ 1 - 1
deploy_386.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 mkdir -p build/386iso/isodir
 mkdir -p build/386iso/boot
-cp build/interim.386 build/386iso/boot/interim.386
+cp build/interim.bin build/386iso/boot/interim.386
 mkdir -p build/386iso/boot/grub
 cp devices/grub.cfg build/386iso/boot/grub/grub.cfg
 grub-mkrescue -o interim386.iso build/386iso

+ 1 - 1
devices/grub.cfg

@@ -1,3 +1,3 @@
-menuentry "myos" {
+menuentry "interim/386" {
 	multiboot /boot/interim.386
 }

+ 33 - 0
i386-ops.s

@@ -0,0 +1,33 @@
+mov $0xdeadbeef, %eax
+mov $0xdeadbeef, %edi
+mov $0xdeadbeef, %esi
+mov $0xdeadbeef, %edx
+mov $0xdeadbeef, %ecx
+mov $0xdeadbeef, %ebx
+mov %eax, %edi
+mov %eax, %esi
+mov %eax, %edx
+mov %eax, %ecx
+mov %eax, %ebx
+
+mov %ebx, %eax
+mov %ebx, %edi
+mov %ebx, %esi
+mov %ebx, %edx
+mov %ebx, %ecx
+mov %ebx, %ebx
+
+mov %esi, %edi
+mov (%esi), %edi
+mov (%esi), %esi
+mov (%edi), %edi
+add %esi, %edi
+add %edi, %esi
+add %edi, %eax
+add %esi, %eax
+
+push %edi
+push %esi
+call *%eax
+add $8, %esp
+ret

BIN
interim386.iso