[ro-oslib-commits] SF.net SVN: ro-oslib: [275] branches/simplified-build/!OsLib/Source/Test/ Test

[<jt...@us...>]

Revision: 275
          http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=275&view=rev
Author:   jtytgat
Date:     2007-06-19 16:59:51 -0700 (Tue, 19 Jun 2007)

Log Message:
-----------
- Get AOF and ELF test in sync.
- Update svn:ignore property.
- Make test_s a standalone program, not an AOF/ELF object file.

Modified Paths:
--------------
    branches/simplified-build/!OsLib/Source/Test/Test/Makefile
    branches/simplified-build/!OsLib/Source/Test/Test/test.asm
    branches/simplified-build/!OsLib/Source/Test/Test/test.gas

Property Changed:
----------------
    branches/simplified-build/!OsLib/Source/Test/Test/


Property changes on: branches/simplified-build/!OsLib/Source/Test/Test
___________________________________________________________________
Name: svn:ignore
   - *,ff8
h.oslib
oslib.h
Hdr.OSLib
OSLib.Hdr
bin
o
l
   + *,ff8
all_oslib.h
all_oslib.Hdr


Modified: branches/simplified-build/!OsLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/Makefile	2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/Makefile	2007-06-19 23:59:51 UTC (rev 275)
@@ -17,7 +17,8 @@
 	$(CXX) -o $@ -I$(TOPHEADERDIR) $< $(OSLIBLIB)
 
 test_s: test$(ASMEXT) all_oslib.Hdr
-	$(AS) -o $@ -I$(TOPHEADERDIR) $<
+	$(AS) -o $@.o -I$(TOPHEADERDIR) $<
+	$(CC) -o $@ $@.o
 
 small_test.o: small_test$(ASMEXT) all_oslib.Hdr
 	$(AS) -o $@ -I$(TOPHEADERDIR) $<

Modified: branches/simplified-build/!OsLib/Source/Test/Test/test.asm
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/test.asm	2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/test.asm	2007-06-19 23:59:51 UTC (rev 275)
@@ -1,25 +1,24 @@
 ; Test assembler headers
    	GET	all_oslib.Hdr		; gets all OSLib headers
 
-	EXPORT	|entry|
-	EXPORT  |exit|
+	EXPORT	|_main|
 
 	AREA	code, CODE
 	ENTRY
 
-|entry|	SWI	XOS_GetEnv		; get the environment
-	MOVVS 	pc, lr			; exit on error
+|_main|	SWI	XOS_GetEnv		; get the environment
+	SWIVS	OS_GenerateError	; exit on error
 
 	MOV	sp, r1			; set up a stack
 
-	STMFD 	sp!, {lr}		; save the return address
-
-	ADR 	R0, message		; write the message std out
+	STMFD	sp!, {lr}		; save the return address
+	ADR	R0, message		; write the message std out
 	SWI	OS_Write0
 
 	SWI	OS_NewLine
+	LDMFD	sp!, {lr}
 
-|exit|	ldmfd	sp!, {pc}		; return
+	SWI	OS_Exit			; return
 
 message	=	"Hello World from ObjAsm",0
 

Modified: branches/simplified-build/!OsLib/Source/Test/Test/test.gas
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/test.gas	2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/test.gas	2007-06-19 23:59:51 UTC (rev 275)
@@ -4,21 +4,19 @@
 #include "all_oslib.Hdr"
 
 	.text
-	.global	entry
+	.global	_main
 
-entry:	SWI	XOS_GetEnv		@ get the environment
-	sWIVS	OS_GenerateError	@ exit on error
+_main:	SWI	XOS_GetEnv		@ get the environment
+	SWIVS	OS_GenerateError	@ exit on error
 
 	MOV	sp, r1			@ set up a stack
 
 	STMFD 	sp!, {lr}		@ save the return address
-
 	ADR 	R0, message		@ write the message std out
 	SWI	OS_Write0
 	SWI	OS_NewLine
+	LDMFD	sp!, {lr}		@ return
 
-	ldmfd	sp!, {lr}		@ return
-exit:
 	SWI	OS_Exit
 
 message:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.