Skip to content

Commit

Permalink
. 修正udf引导代码。
Browse files Browse the repository at this point in the history 
  可启动U盘制作：把 grldr.pbr 的 udf 引导代码(0x1400起始)复制到U盘启动分区，
                 把 MBR 中的分区起始扇区(4字节)复制到启动分区的偏移0xc。
  • Loading branch information
yaya committed Oct 14, 2017
1 parent 106901a commit 3fe9735
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 56 deletions.
7 changes: 6 additions & 1 deletion ChangeLog_chenall.txt
View file
@@ -1,12 +1,17 @@
更新说明：
2017-10-14(yaya)
修正udf引导代码。
可启动U盘制作：把 grldr.pbr 的 udf 引导代码(0x1400起始)复制到U盘启动分区，
把 MBR 中的分区起始扇区(4字节)复制到启动分区的偏移0xc。

2017-10-05(yaya)
修正 --in-situ 参数。因嵌套会丢失插槽的 form_Smax，to_Smax。
增加 --swap-drive=DRIVE1=DRIVE2 参数，用于交换 FROM_DRIVE。

2017-10-04(yaya)
支持U盘使用udf文件系统。版本至2.01。
分区：使用 BOOTICE 分区，主引导记录选 Windows NT 6.x MBR。
格式化U盘：在Windows系统的cmd命令行：format u盘驱动器号: /fs:udf /q
可启动U盘制作：把grldr_hd_udf.bin复制到U盘逻辑0扇区。

2017-08-30(yaya)
displaymem 函数增加参数 --s，以 512 字节扇区的单位显示可用 RAM。
Expand Down
2 changes: 1 addition & 1 deletion build
View file
Expand Up @@ -13,7 +13,7 @@ RELEASE=grub4dos-${VER}-${DATE}
COPY_FILES="COPYING README_GRUB4DOS*.txt ChangeLog_*.txt \
config.sys default menu.lst grub.pif \
stage2/grldr stage2/grub.exe stage2/badgrub.exe stage2/grldr.mbr stage2/bootlace.com \
stage2/hmload.com stage2/grldr.pbr stage2/grldr_cd.bin stage2/grldr_hd_udf.bin"
stage2/hmload.com stage2/grldr.pbr stage2/grldr_cd.bin"

rm -rf *.zip *.7z *~ || exit $?
[ -z "$GRUB4DOS_TEMP" ] && GRUB4DOS_TEMP=/tmp/grub4dos-temp
Expand Down
2 changes: 1 addition & 1 deletion stage2/Makefile.am
View file
Expand Up @@ -137,7 +137,7 @@ bootlace.com: bootlacestart #Note: S
$(AM_V_at)cp bootlacestart bootlace.com && chmod a+x bootlace.com
$(AM_V_at)dd if=bootlace.com of=grldr.pbr bs=512 skip=57 count=10 #skip(1): "EB 58 90 00" position in the bootlace.com redress: skip +(-) 1
$(AM_V_at)dd if=bootlace.com of=grldr_cd.bin bs=512 skip=67 count=1 #skip(2): = skip(1) + 10
$(AM_V_at)dd if=bootlace.com of=grldr_hd_udf.bin bs=512 skip=68 count=2 #skip(3): = skip(2) + 1
$(AM_V_at)dd if=bootlace.com of=grldr.pbr bs=512 skip=68 seek=10 count=1 #skip(3): = skip(2) + 1
$(AM_V_at)cat grldr.mbr >> bootlace.com

hmloadstart_exec_SOURCES = hmloadstart.S
Expand Down
2 changes: 1 addition & 1 deletion stage2/Makefile.in
View file
Expand Up @@ -1801,7 +1801,7 @@ bootlace.com: bootlacestart #Note: S
$(AM_V_at)cp bootlacestart bootlace.com && chmod a+x bootlace.com
$(AM_V_at)dd if=bootlace.com of=grldr.pbr bs=512 skip=57 count=10 #skip(1): "EB 58 90 00" position in the bootlace.com redress: skip +(-) 1
$(AM_V_at)dd if=bootlace.com of=grldr_cd.bin bs=512 skip=67 count=1 #skip(2): = skip(1) + 10
$(AM_V_at)dd if=bootlace.com of=grldr_hd_udf.bin bs=512 skip=68 count=2 #skip(3): = skip(2) + 1
$(AM_V_at)dd if=bootlace.com of=grldr.pbr bs=512 skip=68 seek=10 count=1 #skip(3): = skip(2) + 1
$(AM_V_at)cat grldr.mbr >> bootlace.com

hmloadstart_exec-hmloadstart.$(OBJEXT): stage2_size.h
Expand Down
89 changes: 37 additions & 52 deletions stage2/grldrstart.S
View file
Expand Up @@ -9044,6 +9044,23 @@ udf_partition_start:
/* ******************** HD_UDF_bin start ****************************** */
Entry_hd_udf:

jmp 1f

. = Entry_hd_udf + 2
.byte 0x90
.ascii "UDF"

hd_utf16_tag:
.byte 0

hd_udf_partition_start:
.long 0

. = Entry_hd_udf + 0xc
partition_start:
.ascii "hide"

1:
cli
xorw %bx, %bx
movw %bx, %ss
Expand All @@ -9064,31 +9081,17 @@ Entry_hd_udf:
movw %bx, %ds
movw %bx, %es
movw $1, %bp
movb %dl, (driver - Entry_hd_udf)
//cs=ds=es=07c0 ss=0000
movl $1, %eax
movw $0x200, %bx
call load_hd_udf
1:
movw $0x1000, %bx
movl $0x40, %eax
movw $0x20, %cx

movl (partition_start - Entry_hd_udf), %eax
testl %eax, %eax
jne 1f
movb $0xff, %dh
1:
call load_hd_udf
pushw %cx
movw $5, %cx
leaw 1(%bx), %si
movw $(hd_udf_tag - Entry_hd_udf), %di //"BEA01"
repz cmpsb
popw %cx
je 1f
incl %eax
loop 1b
jmp 4f
1: //udf
movl $0x100, %eax //AnchorVolume
addl $0x100, %eax //AnchorVolume
call load_hd_udf
movl 0x14(%bx), %eax //MainVolume_ExtentLocation
addl (partition_start - Entry_hd_udf), %eax
1:
call load_hd_udf
cmpw $5, (%bx) //Partition
Expand All @@ -9097,6 +9100,7 @@ Entry_hd_udf:
jmp 1b
1:
movl 0xbc(%bx), %eax //FileSet
addl (partition_start - Entry_hd_udf), %eax
movl %eax, (hd_udf_partition_start - Entry_hd_udf)
call load_hd_udf
movl 0x194(%bx), %eax
Expand Down Expand Up @@ -9162,7 +9166,6 @@ Entry_hd_udf:
movw $0x2000, %di
call read_fileEntry
jc 4f
movw (driver - Entry_hd_udf), %dx
ljmp $0x2000, $0


Expand All @@ -9182,7 +9185,6 @@ load_hd_udf:
movl %eax, 8(%si) /* LBA lo 32 bits */
movl $0, 12(%si) /* LBA hi 32 bits */
movb $0x42, %ah
movb (driver - Entry_hd_udf), %dl
pushw %ds
pushw %es
int $0x13
Expand All @@ -9198,20 +9200,6 @@ load_hd_udf:
popaw
ret

. = Entry_hd_udf + 0x1b6
driver:
.byte 0, 0xff

. = Entry_hd_udf + 0x1be

.byte 0x80, 0, 0, 1, 7, 0xfe, 0xff, 0xff, 0x20, 0, 0, 0 , 0, 0, 0xf0, 0

. = Entry_hd_udf + 0x1fe

.word 0xAA55

. = Entry_hd_udf + 0x200

4:
movw $(msg_BootError_hd_udf - Entry_hd_udf), %si
1:
Expand All @@ -9233,6 +9221,7 @@ read_fileEntry:
//105
movw 0xa8(%bx), %si
movw 0xac(%bx), %cx
pushw %dx
movw $0, %dx
jmp 2f
1:
Expand All @@ -9250,17 +9239,20 @@ read_fileEntry:
1:
cmpw $0, %ax
jne 3f
pushw %dx
movw 0xd0(%bx), %si
movw 0xd4(%bx), %cx
movw $0x28, %dx
2:
addw %dx, %si
shrw $3, %cx
popw %dx
1:
movzwl 0xb4(%bx, %si), %eax
addl (hd_udf_partition_start - Entry_hd_udf), %eax
addl (hd_udf_partition_start - Entry_hd_udf), %eax //FileIdentifier

pushl %eax
movl 0xb0(%bx, %si), %eax
movl 0xb0(%bx, %si), %eax //File length in bytes */
andl $0x3fffffff, %eax
addl $0x1ff, %eax
shrl $9, %eax
Expand All @@ -9282,23 +9274,16 @@ read_fileEntry:
popw %es
ret

. = Entry_hd_udf + 0x3e0
. = Entry_hd_udf + 0x1f0

msg_BootError_hd_udf:
.ascii "No "

hd_udf_name:
.ascii "GRLDR\0\0\0\0\0\0\0\0"

hd_udf_tag:
.ascii "BEA01"

hd_utf16_tag:
.byte 0

hd_udf_partition_start:
.long 0

.ascii "GRLDR\0\0\0\0\0\0"

. = Entry_hd_udf + 0x1fe
.byte 0x55, 0xaa
/* ******************** HD_UDF_bin end ****************************** */
#endif //defined(GRLDR_INSTALL))

Expand Down

0 comments on commit 3fe9735

Please sign in to comment.