[LinksOS CVS Commit]linksos/main strap.asm,1.3,1.4

[<kye...@us...>]

Update of /cvsroot/linksos/linksos/main
In directory sc8-pr-cvs1:/tmp/cvs-serv31175

Modified Files:
	strap.asm 
Log Message:


strap.asm NASM 32-BIT RELOCATION FIX
Changed 16 bit declaration to 32 bit, and changed 3 lines to make them conform
with this structure. Now Compiles + Links with all versions of NASM (but does
not link with DJGPP LD)

Reason = Bug Fix
a=kyethespy
b=16


Index: strap.asm
===================================================================
RCS file: /cvsroot/linksos/linksos/main/strap.asm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** strap.asm	28 Dec 2002 21:23:25 -0000	1.3
--- strap.asm	29 Dec 2002 07:54:00 -0000	1.4
***************
*** 1,20 ****
  ;-----------------------------------------------------------------------------
! ;-	filename:	strap.asm													--
! ;-	creation date:	unknown													--
! ;-	author:	Charles Banas													--
! ;-  version: 0.01															--
  ;-----------------------------------------------------------------------------
! ;-	revision history:														--
! ;-		12/22/2002 - 1136 MST - Charles Banas								--
! ;-			prepared for CVS commit.  added comments.						--
  ;-----------------------------------------------------------------------------
! ;-	description:															--
! ;-		this file provides the ability for the kernel to boot with a		--
! ;-		minimal bootloader that does not provide A20 or p-mode support.		--
! ;-		if the kernel is used in conjunction with GRUB or similar			--
! ;-		bootloaders, multiboot.s is linked rather than this file.			--
  ;-----------------------------------------------------------------------------
  
! [BITS 16]
  [SECTION .text]
  [GLOBAL _start]
--- 1,27 ----
  ;-----------------------------------------------------------------------------
! ;	filename:	strap.asm													
! ;	creation date:	unknown													
! ;	author:	Charles Banas
! ;	Edited by Kye Lewis (kye...@us...)												
! ;       version: 0.02														
  ;-----------------------------------------------------------------------------
! ;	revision history:														
! ;		12/22/2002 - 1136 MST - Charles Banas								
! ;			prepared for CVS commit.  added comments.
! 
! ;		20021229 -   0738GMT - Kye Lewis (kye...@us...)
! 
! ;			Changed so the file links and compiles on NASM correctly
! ;			Changed BITS 16 to BITS 32, and fixed 3 other lines.
! 					
  ;-----------------------------------------------------------------------------
! ;	description:															
! ;		this file provides the ability for the kernel to boot with a		
! ;		minimal bootloader that does not provide A20 or p-mode support.		
! 			
  ;-----------------------------------------------------------------------------
  
! ;[BITS 16]
! [BITS 32]
  [SECTION .text]
  [GLOBAL _start]
***************
*** 43,47 ****
  	sti
  
! 	mov		si,booting
  	call	_disp_str
  
--- 50,54 ----
  	sti
  
! 	mov		si,[booting]
  	call	_disp_str
  
***************
*** 74,78 ****
  	or		al,1
  	mov		cr0,eax
! 	mov		si,pmodeswitch
  	call	_disp_str
  	jmp		SYS_CODE_SEL:do_pm
--- 81,85 ----
  	or		al,1
  	mov		cr0,eax
! 	mov		si,[pmodeswitch]
  	call	_disp_str
  	jmp		SYS_CODE_SEL:do_pm
***************
*** 83,87 ****
  ;	dumps because a20 is not set
  _a20_dump:
! 	mov		si,a20fail
  	call	_disp_str
  ;	xor		ax,ax
--- 90,94 ----
  ;	dumps because a20 is not set
  _a20_dump:
! 	mov		si,[a20fail]
  	call	_disp_str
  ;	xor		ax,ax
***************
*** 281,285 ****
  ; Protected-mode segment
  ;---------------
! [BITS 32]
  do_pm:
  	mov		ax,SYS_DATA_SEL		; now in 32-bit pmode
--- 288,292 ----
  ; Protected-mode segment
  ;---------------
! 
  do_pm:
  	mov		ax,SYS_DATA_SEL		; now in 32-bit pmode