fasm:

change to common line endings (unix) to make and apply patches in more convenient way
add license.txt
remove local copy of struct.inc which wasn't used


git-svn-id: svn://kolibrios.org@3011 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/fasm/trunk/license.txt

@@ -0,0 +1,37 @@
+
+flat assembler  version 1.70
+Copyright (c) 1999-2012, Tomasz Grysztar.
+All rights reserved.
+
+This program is free for commercial and non-commercial use as long as
+the following conditions are adhered to.
+
+Copyright remains Tomasz Grysztar, and as such any Copyright notices
+in the code are not to be removed.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. 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.
+
+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 REGENTS 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.
+
+The licence and distribution terms for any publically available
+version or derivative of this code cannot be changed. i.e. this code
+cannot simply be copied and put under another distribution licence
+(including the GNU Public Licence).

programs/develop/fasm/trunk/messages.inc

@@ -48,5 +48,5 @@ _section_not_aligned_enough db 'section is not aligned enough',0
 _setting_already_specified db 'setting already specified',0
 _data_already_defined db 'data already defined',0
 _too_many_repeats db 'too many repeats',0
-_invoked_error db 'error directive invoked in source file',0
+_invoked_error db 'error directive encountered in source file',0
 _assertion_failed db 'assertion failed',0

programs/develop/fasm/trunk/struct.inc

@@ -1,180 +0,0 @@
-
-; Macroinstructions for defining data structures
-
-macro struct name
- { fields@struct equ name
-   match child parent, name \{ fields@struct equ child,fields@\#parent \}
-   sub@struct equ
-   struc db [val] \{ \common fields@struct equ fields@struct,.,db,<val> \}
-   struc dw [val] \{ \common fields@struct equ fields@struct,.,dw,<val> \}
-   struc du [val] \{ \common fields@struct equ fields@struct,.,du,<val> \}
-   struc dd [val] \{ \common fields@struct equ fields@struct,.,dd,<val> \}
-   struc dp [val] \{ \common fields@struct equ fields@struct,.,dp,<val> \}
-   struc dq [val] \{ \common fields@struct equ fields@struct,.,dq,<val> \}
-   struc dt [val] \{ \common fields@struct equ fields@struct,.,dt,<val> \}
-   struc rb count \{ fields@struct equ fields@struct,.,db,count dup (?) \}
-   struc rw count \{ fields@struct equ fields@struct,.,dw,count dup (?) \}
-   struc rd count \{ fields@struct equ fields@struct,.,dd,count dup (?) \}
-   struc rp count \{ fields@struct equ fields@struct,.,dp,count dup (?) \}
-   struc rq count \{ fields@struct equ fields@struct,.,dq,count dup (?) \}
-   struc rt count \{ fields@struct equ fields@struct,.,dt,count dup (?) \}
-   macro db [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,db,<val> \}
-   macro dw [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,dw,<val> \}
-   macro du [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,du,<val> \}
-   macro dd [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,dd,<val> \}
-   macro dp [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,dp,<val> \}
-   macro dq [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,dq,<val> \}
-   macro dt [val] \{ \common \local anonymous
-		     fields@struct equ fields@struct,anonymous,dt,<val> \}
-   macro rb count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,db,count dup (?) \}
-   macro rw count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,dw,count dup (?) \}
-   macro rd count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,dd,count dup (?) \}
-   macro rp count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,dp,count dup (?) \}
-   macro rq count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,dq,count dup (?) \}
-   macro rt count \{ \local anonymous
-		     fields@struct equ fields@struct,anonymous,dt,count dup (?) \}
-   macro union \{ fields@struct equ fields@struct,,union,<
-		  sub@struct equ union \}
-   macro struct \{ fields@struct equ fields@struct,,substruct,<
-		  sub@struct equ substruct \}
-   virtual at 0 }
-
-macro ends
- { match , sub@struct \{ restruc db,dw,du,dd,dp,dq,dt
-			 restruc rb,rw,rd,rp,rq,rt
-			 purge db,dw,du,dd,dp,dq,dt
-			 purge rb,rw,rd,rp,rq,rt
-			 purge union,struct
-			 match name=,fields,fields@struct \\{ fields@struct equ
-							      make@struct name,fields
-							      fields@\\#name equ fields \\}
-			 end virtual \}
-   match any, sub@struct \{ fields@struct equ fields@struct> \}
-   restore sub@struct }
-
-macro make@struct name,[field,type,def]
- { common
-    if $
-     display 'Error: definition of ',`name,' contains illegal instructions.',0Dh,0Ah
-     err
-    end if
-    local define
-    define equ name
-   forward
-    local sub
-    match , field \{ make@substruct type,name,sub def
-		     define equ define,.,sub, \}
-    match any, field \{ define equ define,.#field,type,<def> \}
-   common
-    match fields, define \{ define@struct fields \} }
-
-macro define@struct name,[field,type,def]
- { common
-    local list
-    list equ
-   forward
-    if ~ field eq .
-     name#field type def
-     sizeof.#name#field = $ - name#field
-    else
-     rb sizeof.#type
-    end if
-    local value
-    match any, list \{ list equ list, \}
-    list equ list <value>
-   common
-    sizeof.#name = $
-    restruc name
-    match values, list \{
-    struc name value \\{
-    match any, fields@struct \\\{ fields@struct equ fields@struct,.,name,<values> \\\}
-    match , fields@struct \\\{ label .
-   forward
-     match , value \\\\{ field type def \\\\}
-     match any, value \\\\{ field type value
-			   if ~ field eq .
-			    rb sizeof.#name#field - ($-field)
-			   end if \\\\}
-   common \\\} \\} \} }
-
-macro enable@substruct
- { macro make@substruct substruct,parent,name,[field,type,def]
-    \{ \common
-	\local define
-	define equ parent,name
-       \forward
-	\local sub
-	match , field \\{ match any, type \\\{ enable@substruct
-					       make@substruct type,name,sub def
-					       purge make@substruct
-					       define equ define,.,sub, \\\} \\}
-	match any, field \\{ define equ define,.\#field,type,<def> \\}
-       \common
-	match fields, define \\{ define@\#substruct fields \\} \} }
-
-enable@substruct
-
-macro define@union parent,name,[field,type,def]
- { common
-    virtual at 0
-   forward
-    if ~ field eq .
-     virtual at 0
-      parent#field type def
-      sizeof.#parent#field = $ - parent#field
-     end virtual
-     if sizeof.#parent#field > $
-      rb sizeof.#parent#field - $
-     end if
-    else if sizeof.#type > $
-     rb sizeof.#type - $
-    end if
-   common
-    sizeof.#name = $
-    end virtual
-    struc name [value] \{ \common
-    label .\#name
-    last@union equ
-   forward
-    match any, last@union \\{ virtual at .\#name
-			       field type def
-			      end virtual \\}
-    match , last@union \\{ match , value \\\{ field type def \\\}
-			   match any, value \\\{ field type value \\\} \\}
-    last@union equ field
-   common rb sizeof.#name - ($ - .\#name) \} }
-
-macro define@substruct parent,name,[field,type,def]
- { common
-    virtual at 0
-   forward
-    if ~ field eq .
-     parent#field type def
-     sizeof.#parent#field = $ - parent#field
-    else
-     rb sizeof.#type
-    end if
-    local value
-   common
-    sizeof.#name = $
-    end virtual
-    struc name value \{
-    label .\#name
-   forward
-     match , value \\{ field type def \\}
-     match any, value \\{ field type value
-			  if ~ field eq .
-			   rb sizeof.#parent#field - ($-field)
-			  end if \\}
-   common \} }