version 1.4

Author: hdkigelcojp

Diff for: Makefile.build

@@ -12,7 +12,7 @@ bits-1 = 64
 CFLAGS = -m$(bits-$(CONFIG_64)) -mno-red-zone -mno-sse -nostdinc -g -O \
 -ffreestanding -fno-builtin -fno-stack-protector $(backtrace) \
 -fno-strict-aliasing -Wall $(CONSTANTS-1) -I$(DIR) -Iinclude
-ASFLAGS = -m$(bits-$(CONFIG_64)) -g -Wa,-I,$(DIR)
+ASFLAGS = -m$(bits-$(CONFIG_64)) -g -Wa,-I,$(DIR) -Wa,--divide
 LDFLAGS = -m$(bits-$(CONFIG_64)) -g -nostdlib
 outo_p = $(outo)_p
 outa_p = $(outa)_p

Diff for: Makefile.common

@@ -25,7 +25,7 @@ objects = .objects
 boptions = .boptions
 
 # OpenSSL
-OPENSSL_VERSION = 1.0.0g
+OPENSSL_VERSION = 1.0.0l
 
 # V
 V-makeopt-0 := -s

Diff for: Makefile.config

@@ -4,8 +4,8 @@ include $(CONFIG)
 
 # default configurations
 gcc_support_64 := \
-	$(shell gcc --target-help | grep -q x86_64: && echo -n 1 || echo -n 0)
-gcc_support_64 != gcc --target-help | grep -q x86_64: && echo -n 1 || echo -n 0
+	$(shell $(CC) --target-help | grep -q x86_64: && /bin/echo -n 1 || /bin/echo -n 0)
+gcc_support_64 != $(CC) --target-help | grep -q x86_64: && /bin/echo -n 1 || /bin/echo -n 0
 CONFIG_64 ?= $(gcc_support_64)
 CONFIG_DEBUG_GDB ?= 0
 CONFIG_SPINLOCK_DEBUG ?= 0
@@ -56,6 +56,7 @@ CONFIG_TCG_BIOS ?= $(CONFIG_64)
 CONFIG_BACKTRACE ?= 0
 CONFIG_VGA_INTEL_DRIVER ?= 0
 CONFIG_TTY_VGA ?= 0
+CONFIG_SHIFT_KEY_DEBUG ?= 0
 
 # config list
 CONFIGLIST :=
@@ -111,10 +112,11 @@ CONFIGLIST += CONFIG_TCG_BIOS=$(CONFIG_TCG_BIOS)[TCG BIOS support]
 CONFIGLIST += CONFIG_BACKTRACE=$(CONFIG_BACKTRACE)[Enable backtrace in panic]
 CONFIGLIST += CONFIG_VGA_INTEL_DRIVER=$(CONFIG_VGA_INTEL_DRIVER)[Enable vga_intel driver]
 CONFIGLIST += CONFIG_TTY_VGA=$(CONFIG_TTY_VGA)[VMM output using VGA driver]
+CONFIGLIST += CONFIG_SHIFT_KEY_DEBUG=$(CONFIG_SHIFT_KEY_DEBUG)[Debug shell with shift key while booting]
 
 .PHONY : update-config
 update-config :
-	echo -n '$(CONFIGLIST)' | tr '[' '#' | tr ']' '\n' | \
+	/bin/echo -n '$(CONFIGLIST)' | tr '[' '#' | tr ']' '\n' | \
 		sed 's/^ //' > $(CONFIG)
 
 .PHONY : config

Diff for: README

@@ -294,3 +294,37 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    PURPOSE.  */
 
 ---------------------------------------------------------------------------
+
+8) EFI Development Kit (EDK)
+
+Copyright (c) 2004, Intel Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  . Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ 
+  . Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+  . Neither the name of the Intel Corporation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------------------------

Diff for: bitvisor.lds

@@ -9,12 +9,17 @@ SECTIONS {
 	. = virt;
 	head = .;
 	. = virt + SIZEOF_HEADERS;
-	.text : AT (phys + (code - head)) {
+	.entry : AT (phys + (code - head)) {
 		code = .;
 		*(.entry)
+		*(.entry.text)
+		*(.entry.data)
+	} :all
+	.text : AT (phys + (text - head)) {
+		text = .;
 		*(.text)
 		codeend = .;
-	} :all
+	}
 	.data : AT (phys + (data - head)) {
 		data = .;
 		*(.data)
@@ -25,8 +30,8 @@ SECTIONS {
 		__process_builtin = .;
 		*(.processes)
 		__process_builtin_end = .;
-	/* }
-	.bss : AT (phys + (bss - head)) { */
+	}
+	.bss : AT (phys + (bss - head)) {
 		bss = .;
 		*(.bss)
 		*(COMMON)

Diff for: boot/loader/bootloader.s

@@ -38,177 +38,69 @@ entry:					# 0x7C00
 	.space	8			# 0x7C08 LBA
 	.space	4			# 0x7C10 1st module start offset
 	.space	4			# 0x7C14 2nd module start offset
-	#.short	0x27			# 0x7C10 GDTR
-	#.long	0x7C10			# 0x7C12
-	#.short	0			# 0x7C16
-	.quad	0x00CF9B000000FFFF	# 0x7C18 0x08 CODE32
-	.quad	0x008F93000000FFFF	# 0x7C20 0x10 DATA32 not big
-	.quad	0x00009B000000FFFF	# 0x7C28 0x18 CODE16
-	.quad	0x000093000000FFFF	# 0x7C30 0x20 DATA16
-start:					# 0x7C38
+start:					# 0x7C18
 	cli
 	push	%cs
 	pop	%ds
 	push	%cs
 	pop	%ss
-	mov	$0x7FFC,%sp	# B flag of the stack segment is off
-	mov	%sp,%bp
-
-	# Enable A20
-	in	$0x92,%al
-	or	$0x2,%al
-	out	%al,$0x92
-
-	# Read sectors
-	lea	0x7C00,%esi
-	mov	4(%si),%ecx	# length
-	pushl	%ecx
-	lea	16(%si),%ebx
-	pushl	4(%bx)
-	pushl	(%bx)
-	mov	%bx,(%bx)
-	mov	%ebx,2(%bx)
-	mov	$511,%bx
-	add	%ebx,%ecx
-	mov	$0x100000,%edi	# destination address
-	push	%edi
-	mov	$'L'|('o'<<8)|('a'<<16)|('d'<<24),%eax
-	call	print
-	shr	$9,%ecx
-	je	error
-	mov	%ecx,%eax
-	shr	$6,%eax
-	mov	%ax,(%bp)
-	mov	%ax,2(%bp)
-	mov	$'i'|('n'<<8)|('g'<<16)|(' '<<24),%eax
-	call	print
-readloop:
-	sti
-	pushl	%ecx
-	movw	$0x10,(%si)
-	mov	$0x40,%al
-	cmpl	%eax,%ecx
-	jb	readsmall
-	mov	%eax,%ecx
-readsmall:
-	mov	%cx,2(%si)
-	mov	$0x8000,%ax
-	movl	%eax,4(%si)
-	mov	$0x42,%ah
+	mov	$0x8000,%sp
+	mov	$0x7C00,%si
+	pushl	20(%si)			# 2nd module offset
+	pushl	16(%si)			# 1st module offset
+	pushl	4(%si)			# length
+	movl	$0xF000000,4(%si)	# address (segment 0xF00 offset 0x0)
+	pushw	6(%si)			# the segment 0xF00
+	mov	$2,%cx			# loop count 2
+1:
+	pusha
+	movl	$0x400010,(%si)		# size of packet (0x10) and 0x40 blocks
+	mov	$0x42,%ah		# extended read command
 	int	$0x13
-	jnc	copy
+	jc	error
+	popa
+	addw	$0x800,6(%si)		# segment += 0x800
+	addl	$0x40,8(%si)		# LBA += 0x40
+	adcl	$0,12(%si)		#
+	loop	1b
+	cmpl	$0x464C457F,0xF000	# ELF header correct?
+	jne	error
+	pushw	0xF018			# Get an entry point address < 64KiB
+	lretw
+1:
+	call	putchar
+	.byte	0x38
 error:
-	mov	$'E'|('r'<<8)|('r'<<16)|('o'<<24),%eax
-	call	print
-	mov	$'r'|('!'<<8)|('\r'<<16)|('\n'<<24),%eax
-	call	print
+	mov	$errormsg-entry+0x7C00,%si
+	cld
+	lodsb
+	test	%al,%al
+	jne	1b
+	xchg	%ah,%al
+	rol	$4,%al
+	call	hex4
+	ror	$4,%al
+	call	hex4
 	int	$0x16
 	int	$0x19
-toreal:
-	mov	%cx,%ds
-	mov	%cx,%es
-	mov	%cx,%ss
-	jc	error
-	pop	%ecx
-progressloop:
-	decw	2(%si)
-	js	readloop
-	lea	'.'|('\b'<<8),%eax
-	decw	(%bp)
-	jne	progressprint
-	pushw	2(%bp)
-	popw	(%bp)
-	cbtw
-progressprint:
-	call	print
-	dec	%ecx
-	jne	progressloop
-	mov	$'\r'|('\n'<<8),%ax
-	call	print
-copy:	
-	mov	$0x10,%bx
-	lgdt	(%bx,%si)		# GDTR
-	cli
-	mov	%cr0,%eax
-	inc	%ax
-	mov	%eax,%cr0
-	ljmp	$0x8,$to32-entry+0x7C00
-to16:
-	mov	$0x20,%bl
-	mov	%bx,%ds
-	mov	%bx,%es
-	mov	%bx,%ss
-	dec	%ax			# CF is not affected
-	mov	%eax,%cr0
-	ljmp	$0x0,$toreal-entry+0x7C00
-print:
-	pushal
+	jmp	.
+hex4:
+	pusha
+	and	$0xF,%al
+	add	$0x90,%al
+	daa
+	adc	$0x40,%al
+	daa
+	.byte	0x3C
+putchar:
+	pusha
 	mov	$7,%bx
 	mov	$0xE,%ah
 	int	$0x10
-	popal
-	shr	$8,%eax
-	jne	print
+	popa
 	ret
-	.code32
-to32:
-	mov	%ebx,%ds
-	mov	%ebx,%es
-	mov	%ebx,%ss
-	cld
-	jecxz	start32
-	addl	%ecx,8(%esi)
-	adcl	$0,12(%esi)
-	push	%esi
-	mov	4(%esi),%esi
-	shl	$7,%ecx			# CF should be zero after this
-	rep	movsl
-	pop	%esi
-error2:
-	ljmpw	$0x18,$to16-entry+0x7C00
-	# Start
-start32:
-	pop	%esi			# 0x100000
-	# ELF header check
-	cmpl	$0x464C457F,(%esi)	# ELF header correct?
-	stc				# Set CF
-	jne	error2			# No-
-	# Make a multiboot info
-	xor	%eax,%eax
-	lea	4(%bp),%edi
-	push	%edi			# Clear multiboot info
-	lea	88/4(%eax),%ecx
-	rep	stosl
-	pop	%ebx
-	mov	%dl,15(%ebx)		# Write a drive number
-	orb	$2,(%ebx)		# Set a boot device flag
-	# Modules
-	pop	%eax			# 1st module offset
-	test	%eax,%eax
-	je	dojmp
-	mov	%edi,24(%ebx)		# Write a modules structure address
-	orb	$8,(%ebx)		# Set a mods flag
-	add	%esi,%eax		# Calculate the address of the module
-	stosl				# Store the 1st module start address
-	pop	%eax			# 2nd module offset
-	test	%eax,%eax
-	je	modend
-	add	%esi,%eax		# Calculate the address of the module
-	stosl				# Store the 1st module end address
-	stosl				# unused
-	stosl				# unused
-	incl	20(%ebx)		# Increment modules count
-	stosl				# Store the 2nd module start address
-modend:
-	pop	%eax			# end of the data
-	add	%esi,%eax		# Calculate the address
-	stosl				# Store the module end address
-	stosl				# unused
-	stosl				# unused
-	incl	20(%ebx)		# Increment modules count
-dojmp:
-	mov	0x18(%esi),%si		# Get an entry point address < 64KiB
-	jmp	*%esi
+errormsg:
+	.string	"Load error "
 
 	.org	entry+0x1FE
 	.byte	0x55