Skip to content

Commit

Permalink
Updated 27_day/harib24g to 31_day/harib28a after finished reading the…
Browse files Browse the repository at this point in the history
… book
  • Loading branch information
jeffreyc2017 committed Jul 18, 2024
1 parent 73307d2 commit bfda4af
Show file tree
Hide file tree
Showing 35 changed files with 63 additions and 250 deletions.
25 changes: 13 additions & 12 deletions docs/chapters.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,18 +203,19 @@
| | 4 | harib25d | 命令行 API | |
| | 5 | harib25e | 日文文字显示(1) | |
| | 6 | harib25f | 日文文字显示(2) | |
| | 7 | harib25g | 日文文字显示(3) | 从此 ipl10->ipl20 |
| 29 day | 1 | harib26a | | |
| | 2 | harib26b | | 此处引入 tek 压缩[^9] |
| | 3 | harib26c | | |
| | 4 | harib26d | | |
| | 5 | harib26e | | |
| 30 day | 1 | harib27a | | |
| | 2 | harib27b | | |
| | 3 | harib27c | | |
| | 4 | harib27d | | |
| | 5 | harib27e | | 从此 ipl20->ipl09 |
| | 6 | harib27f | | |
| | 7 | harib25g | 日文文字显示(3) | 从此 ipl10->ipl20。typeipl.hrb 用于显示 ipl10.nas,由于此文件从这里开始不存在,typeipl 无显示输出 |
| 29 day | 1 | harib26a | 修复 bug | |
| | 2 | harib26b | 文件压缩 | 此处引入 tek 压缩[^9] |
| | 3 | | 标准函数 | |
| | 4 | harib26c | 非矩形窗口 | |
| | 5 | harib26d | bball | |
| | 6 | harib26e | 外星人游戏 | |
| 30 day | 1 | harib27a | 命令行计算器 | |
| | 2 | harib27b | 文本阅览器 | |
| | 3 | harib27c | MML 播放器 | |
| | 4 | harib27d | 图片阅览器 | JPEG 图片显示有问题 |
| | 5 | harib27e | IPL 的改良 | 从此 ipl20->ipl09。在 Linux 上查看 img 文件是 0x430a0,需要 15 个柱面,因为没有使用 tek 压缩字库文件。将 9 改为 15(此值因开发环境不同可能有差异) |
| | 6 | harib27f | 光盘启动 | |

[^1]: 见 utils/libc.
[^5]: JMP location.
Expand Down
14 changes: 12 additions & 2 deletions docs/modifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ so changed the hlt.nas:
CALL 2*8:0xca4
```
## 30_day
## 30_day harib27e/f
In 27d,e,f renamed bmp.nasm to bmp.nas so it can be found by the Makefile and compiled.
在 Linux 上查看 img 文件是 0x430a0,需要 15 个柱面,因为没有使用 tek 压缩。将 9 改为 15(此值因开发环境不同可能有差异)
```sh
CYLS EQU 9
```
to
```sh
CYLS EQU 15
```
1 change: 1 addition & 0 deletions docs/references.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
- https://github.com/d0iasm/haribote-os

- https://viterbi-web.usc.edu/~yudewei/main/sources/books/30天自制操作系统/
- https://www.linux.com
11 changes: 1 addition & 10 deletions projects/27_day/harib24g/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25b/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25c/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25d/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25f/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/28_day/harib25g/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/29_day/harib26a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/29_day/harib26b/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/29_day/harib26c/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/29_day/harib26d/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/29_day/harib26e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/30_day/harib27a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/30_day/harib27b/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/30_day/harib27c/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
11 changes: 1 addition & 10 deletions projects/30_day/harib27d/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
4 changes: 4 additions & 0 deletions projects/30_day/harib27d/gview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ default :

# ファイル生成規則

bmp.obj: bmp.nasm
$(NASM) $(NASM_FLAGS) -f elf32 -o $@ $< -l $*.lst

$(APP).bim : $(APP).obj bmp.obj jpeg.obj $(APILIBPATH)apilib.lib
$(LD) $(APP_LDFLAGS) $^ -o $@ -T $(HRB_LDS) -e STACK_SIZE=$(patsubst %k,%,$(STACK))*1024

Expand Down Expand Up @@ -89,6 +92,7 @@ clean :
-$(DEL) *.lst
-$(DEL) gview.obj
-$(DEL) jpeg.obj
-$(DEL) bmp.obj
-$(DEL) *.map
-$(DEL) *.bim
-$(DEL) *.org
Expand Down
File renamed without changes.
11 changes: 1 addition & 10 deletions projects/30_day/harib27e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,7 @@ run_full: full run
run_os: haribote.img run

clean:
-$(DEL) *.bin
-$(DEL) *.lst
-$(DEL) *.elf
-$(DEL) *.o
-$(DEL) *.obj
-$(DEL) *.map
-$(DEL) *.hrb
-$(DEL) haribote.sys
-$(DEL) apilib.lib
-$(DEL) hankaku.asm
# ‰œ‚à‚µ‚È‚¢

src_only: clean
-$(DEL) $(IMG)
Expand Down
Loading

0 comments on commit bfda4af

Please sign in to comment.