1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/COPYING.txt	Sun May 02 12:25:17 2010 +0100
     1.3 @@ -0,0 +1,674 @@
     1.4 +                    GNU GENERAL PUBLIC LICENSE
     1.5 +                       Version 3, 29 June 2007
     1.6 +
     1.7 + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
     1.8 + Everyone is permitted to copy and distribute verbatim copies
     1.9 + of this license document, but changing it is not allowed.
    1.10 +
    1.11 +                            Preamble
    1.12 +
    1.13 +  The GNU General Public License is a free, copyleft license for
    1.14 +software and other kinds of works.
    1.15 +
    1.16 +  The licenses for most software and other practical works are designed
    1.17 +to take away your freedom to share and change the works.  By contrast,
    1.18 +the GNU General Public License is intended to guarantee your freedom to
    1.19 +share and change all versions of a program--to make sure it remains free
    1.20 +software for all its users.  We, the Free Software Foundation, use the
    1.21 +GNU General Public License for most of our software; it applies also to
    1.22 +any other work released this way by its authors.  You can apply it to
    1.23 +your programs, too.
    1.24 +
    1.25 +  When we speak of free software, we are referring to freedom, not
    1.26 +price.  Our General Public Licenses are designed to make sure that you
    1.27 +have the freedom to distribute copies of free software (and charge for
    1.28 +them if you wish), that you receive source code or can get it if you
    1.29 +want it, that you can change the software or use pieces of it in new
    1.30 +free programs, and that you know you can do these things.
    1.31 +
    1.32 +  To protect your rights, we need to prevent others from denying you
    1.33 +these rights or asking you to surrender the rights.  Therefore, you have
    1.34 +certain responsibilities if you distribute copies of the software, or if
    1.35 +you modify it: responsibilities to respect the freedom of others.
    1.36 +
    1.37 +  For example, if you distribute copies of such a program, whether
    1.38 +gratis or for a fee, you must pass on to the recipients the same
    1.39 +freedoms that you received.  You must make sure that they, too, receive
    1.40 +or can get the source code.  And you must show them these terms so they
    1.41 +know their rights.
    1.42 +
    1.43 +  Developers that use the GNU GPL protect your rights with two steps:
    1.44 +(1) assert copyright on the software, and (2) offer you this License
    1.45 +giving you legal permission to copy, distribute and/or modify it.
    1.46 +
    1.47 +  For the developers' and authors' protection, the GPL clearly explains
    1.48 +that there is no warranty for this free software.  For both users' and
    1.49 +authors' sake, the GPL requires that modified versions be marked as
    1.50 +changed, so that their problems will not be attributed erroneously to
    1.51 +authors of previous versions.
    1.52 +
    1.53 +  Some devices are designed to deny users access to install or run
    1.54 +modified versions of the software inside them, although the manufacturer
    1.55 +can do so.  This is fundamentally incompatible with the aim of
    1.56 +protecting users' freedom to change the software.  The systematic
    1.57 +pattern of such abuse occurs in the area of products for individuals to
    1.58 +use, which is precisely where it is most unacceptable.  Therefore, we
    1.59 +have designed this version of the GPL to prohibit the practice for those
    1.60 +products.  If such problems arise substantially in other domains, we
    1.61 +stand ready to extend this provision to those domains in future versions
    1.62 +of the GPL, as needed to protect the freedom of users.
    1.63 +
    1.64 +  Finally, every program is threatened constantly by software patents.
    1.65 +States should not allow patents to restrict development and use of
    1.66 +software on general-purpose computers, but in those that do, we wish to
    1.67 +avoid the special danger that patents applied to a free program could
    1.68 +make it effectively proprietary.  To prevent this, the GPL assures that
    1.69 +patents cannot be used to render the program non-free.
    1.70 +
    1.71 +  The precise terms and conditions for copying, distribution and
    1.72 +modification follow.
    1.73 +
    1.74 +                       TERMS AND CONDITIONS
    1.75 +
    1.76 +  0. Definitions.
    1.77 +
    1.78 +  "This License" refers to version 3 of the GNU General Public License.
    1.79 +
    1.80 +  "Copyright" also means copyright-like laws that apply to other kinds of
    1.81 +works, such as semiconductor masks.
    1.82 +
    1.83 +  "The Program" refers to any copyrightable work licensed under this
    1.84 +License.  Each licensee is addressed as "you".  "Licensees" and
    1.85 +"recipients" may be individuals or organizations.
    1.86 +
    1.87 +  To "modify" a work means to copy from or adapt all or part of the work
    1.88 +in a fashion requiring copyright permission, other than the making of an
    1.89 +exact copy.  The resulting work is called a "modified version" of the
    1.90 +earlier work or a work "based on" the earlier work.
    1.91 +
    1.92 +  A "covered work" means either the unmodified Program or a work based
    1.93 +on the Program.
    1.94 +
    1.95 +  To "propagate" a work means to do anything with it that, without
    1.96 +permission, would make you directly or secondarily liable for
    1.97 +infringement under applicable copyright law, except executing it on a
    1.98 +computer or modifying a private copy.  Propagation includes copying,
    1.99 +distribution (with or without modification), making available to the
   1.100 +public, and in some countries other activities as well.
   1.101 +
   1.102 +  To "convey" a work means any kind of propagation that enables other
   1.103 +parties to make or receive copies.  Mere interaction with a user through
   1.104 +a computer network, with no transfer of a copy, is not conveying.
   1.105 +
   1.106 +  An interactive user interface displays "Appropriate Legal Notices"
   1.107 +to the extent that it includes a convenient and prominently visible
   1.108 +feature that (1) displays an appropriate copyright notice, and (2)
   1.109 +tells the user that there is no warranty for the work (except to the
   1.110 +extent that warranties are provided), that licensees may convey the
   1.111 +work under this License, and how to view a copy of this License.  If
   1.112 +the interface presents a list of user commands or options, such as a
   1.113 +menu, a prominent item in the list meets this criterion.
   1.114 +
   1.115 +  1. Source Code.
   1.116 +
   1.117 +  The "source code" for a work means the preferred form of the work
   1.118 +for making modifications to it.  "Object code" means any non-source
   1.119 +form of a work.
   1.120 +
   1.121 +  A "Standard Interface" means an interface that either is an official
   1.122 +standard defined by a recognized standards body, or, in the case of
   1.123 +interfaces specified for a particular programming language, one that
   1.124 +is widely used among developers working in that language.
   1.125 +
   1.126 +  The "System Libraries" of an executable work include anything, other
   1.127 +than the work as a whole, that (a) is included in the normal form of
   1.128 +packaging a Major Component, but which is not part of that Major
   1.129 +Component, and (b) serves only to enable use of the work with that
   1.130 +Major Component, or to implement a Standard Interface for which an
   1.131 +implementation is available to the public in source code form.  A
   1.132 +"Major Component", in this context, means a major essential component
   1.133 +(kernel, window system, and so on) of the specific operating system
   1.134 +(if any) on which the executable work runs, or a compiler used to
   1.135 +produce the work, or an object code interpreter used to run it.
   1.136 +
   1.137 +  The "Corresponding Source" for a work in object code form means all
   1.138 +the source code needed to generate, install, and (for an executable
   1.139 +work) run the object code and to modify the work, including scripts to
   1.140 +control those activities.  However, it does not include the work's
   1.141 +System Libraries, or general-purpose tools or generally available free
   1.142 +programs which are used unmodified in performing those activities but
   1.143 +which are not part of the work.  For example, Corresponding Source
   1.144 +includes interface definition files associated with source files for
   1.145 +the work, and the source code for shared libraries and dynamically
   1.146 +linked subprograms that the work is specifically designed to require,
   1.147 +such as by intimate data communication or control flow between those
   1.148 +subprograms and other parts of the work.
   1.149 +
   1.150 +  The Corresponding Source need not include anything that users
   1.151 +can regenerate automatically from other parts of the Corresponding
   1.152 +Source.
   1.153 +
   1.154 +  The Corresponding Source for a work in source code form is that
   1.155 +same work.
   1.156 +
   1.157 +  2. Basic Permissions.
   1.158 +
   1.159 +  All rights granted under this License are granted for the term of
   1.160 +copyright on the Program, and are irrevocable provided the stated
   1.161 +conditions are met.  This License explicitly affirms your unlimited
   1.162 +permission to run the unmodified Program.  The output from running a
   1.163 +covered work is covered by this License only if the output, given its
   1.164 +content, constitutes a covered work.  This License acknowledges your
   1.165 +rights of fair use or other equivalent, as provided by copyright law.
   1.166 +
   1.167 +  You may make, run and propagate covered works that you do not
   1.168 +convey, without conditions so long as your license otherwise remains
   1.169 +in force.  You may convey covered works to others for the sole purpose
   1.170 +of having them make modifications exclusively for you, or provide you
   1.171 +with facilities for running those works, provided that you comply with
   1.172 +the terms of this License in conveying all material for which you do
   1.173 +not control copyright.  Those thus making or running the covered works
   1.174 +for you must do so exclusively on your behalf, under your direction
   1.175 +and control, on terms that prohibit them from making any copies of
   1.176 +your copyrighted material outside their relationship with you.
   1.177 +
   1.178 +  Conveying under any other circumstances is permitted solely under
   1.179 +the conditions stated below.  Sublicensing is not allowed; section 10
   1.180 +makes it unnecessary.
   1.181 +
   1.182 +  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
   1.183 +
   1.184 +  No covered work shall be deemed part of an effective technological
   1.185 +measure under any applicable law fulfilling obligations under article
   1.186 +11 of the WIPO copyright treaty adopted on 20 December 1996, or
   1.187 +similar laws prohibiting or restricting circumvention of such
   1.188 +measures.
   1.189 +
   1.190 +  When you convey a covered work, you waive any legal power to forbid
   1.191 +circumvention of technological measures to the extent such circumvention
   1.192 +is effected by exercising rights under this License with respect to
   1.193 +the covered work, and you disclaim any intention to limit operation or
   1.194 +modification of the work as a means of enforcing, against the work's
   1.195 +users, your or third parties' legal rights to forbid circumvention of
   1.196 +technological measures.
   1.197 +
   1.198 +  4. Conveying Verbatim Copies.
   1.199 +
   1.200 +  You may convey verbatim copies of the Program's source code as you
   1.201 +receive it, in any medium, provided that you conspicuously and
   1.202 +appropriately publish on each copy an appropriate copyright notice;
   1.203 +keep intact all notices stating that this License and any
   1.204 +non-permissive terms added in accord with section 7 apply to the code;
   1.205 +keep intact all notices of the absence of any warranty; and give all
   1.206 +recipients a copy of this License along with the Program.
   1.207 +
   1.208 +  You may charge any price or no price for each copy that you convey,
   1.209 +and you may offer support or warranty protection for a fee.
   1.210 +
   1.211 +  5. Conveying Modified Source Versions.
   1.212 +
   1.213 +  You may convey a work based on the Program, or the modifications to
   1.214 +produce it from the Program, in the form of source code under the
   1.215 +terms of section 4, provided that you also meet all of these conditions:
   1.216 +
   1.217 +    a) The work must carry prominent notices stating that you modified
   1.218 +    it, and giving a relevant date.
   1.219 +
   1.220 +    b) The work must carry prominent notices stating that it is
   1.221 +    released under this License and any conditions added under section
   1.222 +    7.  This requirement modifies the requirement in section 4 to
   1.223 +    "keep intact all notices".
   1.224 +
   1.225 +    c) You must license the entire work, as a whole, under this
   1.226 +    License to anyone who comes into possession of a copy.  This
   1.227 +    License will therefore apply, along with any applicable section 7
   1.228 +    additional terms, to the whole of the work, and all its parts,
   1.229 +    regardless of how they are packaged.  This License gives no
   1.230 +    permission to license the work in any other way, but it does not
   1.231 +    invalidate such permission if you have separately received it.
   1.232 +
   1.233 +    d) If the work has interactive user interfaces, each must display
   1.234 +    Appropriate Legal Notices; however, if the Program has interactive
   1.235 +    interfaces that do not display Appropriate Legal Notices, your
   1.236 +    work need not make them do so.
   1.237 +
   1.238 +  A compilation of a covered work with other separate and independent
   1.239 +works, which are not by their nature extensions of the covered work,
   1.240 +and which are not combined with it such as to form a larger program,
   1.241 +in or on a volume of a storage or distribution medium, is called an
   1.242 +"aggregate" if the compilation and its resulting copyright are not
   1.243 +used to limit the access or legal rights of the compilation's users
   1.244 +beyond what the individual works permit.  Inclusion of a covered work
   1.245 +in an aggregate does not cause this License to apply to the other
   1.246 +parts of the aggregate.
   1.247 +
   1.248 +  6. Conveying Non-Source Forms.
   1.249 +
   1.250 +  You may convey a covered work in object code form under the terms
   1.251 +of sections 4 and 5, provided that you also convey the
   1.252 +machine-readable Corresponding Source under the terms of this License,
   1.253 +in one of these ways:
   1.254 +
   1.255 +    a) Convey the object code in, or embodied in, a physical product
   1.256 +    (including a physical distribution medium), accompanied by the
   1.257 +    Corresponding Source fixed on a durable physical medium
   1.258 +    customarily used for software interchange.
   1.259 +
   1.260 +    b) Convey the object code in, or embodied in, a physical product
   1.261 +    (including a physical distribution medium), accompanied by a
   1.262 +    written offer, valid for at least three years and valid for as
   1.263 +    long as you offer spare parts or customer support for that product
   1.264 +    model, to give anyone who possesses the object code either (1) a
   1.265 +    copy of the Corresponding Source for all the software in the
   1.266 +    product that is covered by this License, on a durable physical
   1.267 +    medium customarily used for software interchange, for a price no
   1.268 +    more than your reasonable cost of physically performing this
   1.269 +    conveying of source, or (2) access to copy the
   1.270 +    Corresponding Source from a network server at no charge.
   1.271 +
   1.272 +    c) Convey individual copies of the object code with a copy of the
   1.273 +    written offer to provide the Corresponding Source.  This
   1.274 +    alternative is allowed only occasionally and noncommercially, and
   1.275 +    only if you received the object code with such an offer, in accord
   1.276 +    with subsection 6b.
   1.277 +
   1.278 +    d) Convey the object code by offering access from a designated
   1.279 +    place (gratis or for a charge), and offer equivalent access to the
   1.280 +    Corresponding Source in the same way through the same place at no
   1.281 +    further charge.  You need not require recipients to copy the
   1.282 +    Corresponding Source along with the object code.  If the place to
   1.283 +    copy the object code is a network server, the Corresponding Source
   1.284 +    may be on a different server (operated by you or a third party)
   1.285 +    that supports equivalent copying facilities, provided you maintain
   1.286 +    clear directions next to the object code saying where to find the
   1.287 +    Corresponding Source.  Regardless of what server hosts the
   1.288 +    Corresponding Source, you remain obligated to ensure that it is
   1.289 +    available for as long as needed to satisfy these requirements.
   1.290 +
   1.291 +    e) Convey the object code using peer-to-peer transmission, provided
   1.292 +    you inform other peers where the object code and Corresponding
   1.293 +    Source of the work are being offered to the general public at no
   1.294 +    charge under subsection 6d.
   1.295 +
   1.296 +  A separable portion of the object code, whose source code is excluded
   1.297 +from the Corresponding Source as a System Library, need not be
   1.298 +included in conveying the object code work.
   1.299 +
   1.300 +  A "User Product" is either (1) a "consumer product", which means any
   1.301 +tangible personal property which is normally used for personal, family,
   1.302 +or household purposes, or (2) anything designed or sold for incorporation
   1.303 +into a dwelling.  In determining whether a product is a consumer product,
   1.304 +doubtful cases shall be resolved in favor of coverage.  For a particular
   1.305 +product received by a particular user, "normally used" refers to a
   1.306 +typical or common use of that class of product, regardless of the status
   1.307 +of the particular user or of the way in which the particular user
   1.308 +actually uses, or expects or is expected to use, the product.  A product
   1.309 +is a consumer product regardless of whether the product has substantial
   1.310 +commercial, industrial or non-consumer uses, unless such uses represent
   1.311 +the only significant mode of use of the product.
   1.312 +
   1.313 +  "Installation Information" for a User Product means any methods,
   1.314 +procedures, authorization keys, or other information required to install
   1.315 +and execute modified versions of a covered work in that User Product from
   1.316 +a modified version of its Corresponding Source.  The information must
   1.317 +suffice to ensure that the continued functioning of the modified object
   1.318 +code is in no case prevented or interfered with solely because
   1.319 +modification has been made.
   1.320 +
   1.321 +  If you convey an object code work under this section in, or with, or
   1.322 +specifically for use in, a User Product, and the conveying occurs as
   1.323 +part of a transaction in which the right of possession and use of the
   1.324 +User Product is transferred to the recipient in perpetuity or for a
   1.325 +fixed term (regardless of how the transaction is characterized), the
   1.326 +Corresponding Source conveyed under this section must be accompanied
   1.327 +by the Installation Information.  But this requirement does not apply
   1.328 +if neither you nor any third party retains the ability to install
   1.329 +modified object code on the User Product (for example, the work has
   1.330 +been installed in ROM).
   1.331 +
   1.332 +  The requirement to provide Installation Information does not include a
   1.333 +requirement to continue to provide support service, warranty, or updates
   1.334 +for a work that has been modified or installed by the recipient, or for
   1.335 +the User Product in which it has been modified or installed.  Access to a
   1.336 +network may be denied when the modification itself materially and
   1.337 +adversely affects the operation of the network or violates the rules and
   1.338 +protocols for communication across the network.
   1.339 +
   1.340 +  Corresponding Source conveyed, and Installation Information provided,
   1.341 +in accord with this section must be in a format that is publicly
   1.342 +documented (and with an implementation available to the public in
   1.343 +source code form), and must require no special password or key for
   1.344 +unpacking, reading or copying.
   1.345 +
   1.346 +  7. Additional Terms.
   1.347 +
   1.348 +  "Additional permissions" are terms that supplement the terms of this
   1.349 +License by making exceptions from one or more of its conditions.
   1.350 +Additional permissions that are applicable to the entire Program shall
   1.351 +be treated as though they were included in this License, to the extent
   1.352 +that they are valid under applicable law.  If additional permissions
   1.353 +apply only to part of the Program, that part may be used separately
   1.354 +under those permissions, but the entire Program remains governed by
   1.355 +this License without regard to the additional permissions.
   1.356 +
   1.357 +  When you convey a copy of a covered work, you may at your option
   1.358 +remove any additional permissions from that copy, or from any part of
   1.359 +it.  (Additional permissions may be written to require their own
   1.360 +removal in certain cases when you modify the work.)  You may place
   1.361 +additional permissions on material, added by you to a covered work,
   1.362 +for which you have or can give appropriate copyright permission.
   1.363 +
   1.364 +  Notwithstanding any other provision of this License, for material you
   1.365 +add to a covered work, you may (if authorized by the copyright holders of
   1.366 +that material) supplement the terms of this License with terms:
   1.367 +
   1.368 +    a) Disclaiming warranty or limiting liability differently from the
   1.369 +    terms of sections 15 and 16 of this License; or
   1.370 +
   1.371 +    b) Requiring preservation of specified reasonable legal notices or
   1.372 +    author attributions in that material or in the Appropriate Legal
   1.373 +    Notices displayed by works containing it; or
   1.374 +
   1.375 +    c) Prohibiting misrepresentation of the origin of that material, or
   1.376 +    requiring that modified versions of such material be marked in
   1.377 +    reasonable ways as different from the original version; or
   1.378 +
   1.379 +    d) Limiting the use for publicity purposes of names of licensors or
   1.380 +    authors of the material; or
   1.381 +
   1.382 +    e) Declining to grant rights under trademark law for use of some
   1.383 +    trade names, trademarks, or service marks; or
   1.384 +
   1.385 +    f) Requiring indemnification of licensors and authors of that
   1.386 +    material by anyone who conveys the material (or modified versions of
   1.387 +    it) with contractual assumptions of liability to the recipient, for
   1.388 +    any liability that these contractual assumptions directly impose on
   1.389 +    those licensors and authors.
   1.390 +
   1.391 +  All other non-permissive additional terms are considered "further
   1.392 +restrictions" within the meaning of section 10.  If the Program as you
   1.393 +received it, or any part of it, contains a notice stating that it is
   1.394 +governed by this License along with a term that is a further
   1.395 +restriction, you may remove that term.  If a license document contains
   1.396 +a further restriction but permits relicensing or conveying under this
   1.397 +License, you may add to a covered work material governed by the terms
   1.398 +of that license document, provided that the further restriction does
   1.399 +not survive such relicensing or conveying.
   1.400 +
   1.401 +  If you add terms to a covered work in accord with this section, you
   1.402 +must place, in the relevant source files, a statement of the
   1.403 +additional terms that apply to those files, or a notice indicating
   1.404 +where to find the applicable terms.
   1.405 +
   1.406 +  Additional terms, permissive or non-permissive, may be stated in the
   1.407 +form of a separately written license, or stated as exceptions;
   1.408 +the above requirements apply either way.
   1.409 +
   1.410 +  8. Termination.
   1.411 +
   1.412 +  You may not propagate or modify a covered work except as expressly
   1.413 +provided under this License.  Any attempt otherwise to propagate or
   1.414 +modify it is void, and will automatically terminate your rights under
   1.415 +this License (including any patent licenses granted under the third
   1.416 +paragraph of section 11).
   1.417 +
   1.418 +  However, if you cease all violation of this License, then your
   1.419 +license from a particular copyright holder is reinstated (a)
   1.420 +provisionally, unless and until the copyright holder explicitly and
   1.421 +finally terminates your license, and (b) permanently, if the copyright
   1.422 +holder fails to notify you of the violation by some reasonable means
   1.423 +prior to 60 days after the cessation.
   1.424 +
   1.425 +  Moreover, your license from a particular copyright holder is
   1.426 +reinstated permanently if the copyright holder notifies you of the
   1.427 +violation by some reasonable means, this is the first time you have
   1.428 +received notice of violation of this License (for any work) from that
   1.429 +copyright holder, and you cure the violation prior to 30 days after
   1.430 +your receipt of the notice.
   1.431 +
   1.432 +  Termination of your rights under this section does not terminate the
   1.433 +licenses of parties who have received copies or rights from you under
   1.434 +this License.  If your rights have been terminated and not permanently
   1.435 +reinstated, you do not qualify to receive new licenses for the same
   1.436 +material under section 10.
   1.437 +
   1.438 +  9. Acceptance Not Required for Having Copies.
   1.439 +
   1.440 +  You are not required to accept this License in order to receive or
   1.441 +run a copy of the Program.  Ancillary propagation of a covered work
   1.442 +occurring solely as a consequence of using peer-to-peer transmission
   1.443 +to receive a copy likewise does not require acceptance.  However,
   1.444 +nothing other than this License grants you permission to propagate or
   1.445 +modify any covered work.  These actions infringe copyright if you do
   1.446 +not accept this License.  Therefore, by modifying or propagating a
   1.447 +covered work, you indicate your acceptance of this License to do so.
   1.448 +
   1.449 +  10. Automatic Licensing of Downstream Recipients.
   1.450 +
   1.451 +  Each time you convey a covered work, the recipient automatically
   1.452 +receives a license from the original licensors, to run, modify and
   1.453 +propagate that work, subject to this License.  You are not responsible
   1.454 +for enforcing compliance by third parties with this License.
   1.455 +
   1.456 +  An "entity transaction" is a transaction transferring control of an
   1.457 +organization, or substantially all assets of one, or subdividing an
   1.458 +organization, or merging organizations.  If propagation of a covered
   1.459 +work results from an entity transaction, each party to that
   1.460 +transaction who receives a copy of the work also receives whatever
   1.461 +licenses to the work the party's predecessor in interest had or could
   1.462 +give under the previous paragraph, plus a right to possession of the
   1.463 +Corresponding Source of the work from the predecessor in interest, if
   1.464 +the predecessor has it or can get it with reasonable efforts.
   1.465 +
   1.466 +  You may not impose any further restrictions on the exercise of the
   1.467 +rights granted or affirmed under this License.  For example, you may
   1.468 +not impose a license fee, royalty, or other charge for exercise of
   1.469 +rights granted under this License, and you may not initiate litigation
   1.470 +(including a cross-claim or counterclaim in a lawsuit) alleging that
   1.471 +any patent claim is infringed by making, using, selling, offering for
   1.472 +sale, or importing the Program or any portion of it.
   1.473 +
   1.474 +  11. Patents.
   1.475 +
   1.476 +  A "contributor" is a copyright holder who authorizes use under this
   1.477 +License of the Program or a work on which the Program is based.  The
   1.478 +work thus licensed is called the contributor's "contributor version".
   1.479 +
   1.480 +  A contributor's "essential patent claims" are all patent claims
   1.481 +owned or controlled by the contributor, whether already acquired or
   1.482 +hereafter acquired, that would be infringed by some manner, permitted
   1.483 +by this License, of making, using, or selling its contributor version,
   1.484 +but do not include claims that would be infringed only as a
   1.485 +consequence of further modification of the contributor version.  For
   1.486 +purposes of this definition, "control" includes the right to grant
   1.487 +patent sublicenses in a manner consistent with the requirements of
   1.488 +this License.
   1.489 +
   1.490 +  Each contributor grants you a non-exclusive, worldwide, royalty-free
   1.491 +patent license under the contributor's essential patent claims, to
   1.492 +make, use, sell, offer for sale, import and otherwise run, modify and
   1.493 +propagate the contents of its contributor version.
   1.494 +
   1.495 +  In the following three paragraphs, a "patent license" is any express
   1.496 +agreement or commitment, however denominated, not to enforce a patent
   1.497 +(such as an express permission to practice a patent or covenant not to
   1.498 +sue for patent infringement).  To "grant" such a patent license to a
   1.499 +party means to make such an agreement or commitment not to enforce a
   1.500 +patent against the party.
   1.501 +
   1.502 +  If you convey a covered work, knowingly relying on a patent license,
   1.503 +and the Corresponding Source of the work is not available for anyone
   1.504 +to copy, free of charge and under the terms of this License, through a
   1.505 +publicly available network server or other readily accessible means,
   1.506 +then you must either (1) cause the Corresponding Source to be so
   1.507 +available, or (2) arrange to deprive yourself of the benefit of the
   1.508 +patent license for this particular work, or (3) arrange, in a manner
   1.509 +consistent with the requirements of this License, to extend the patent
   1.510 +license to downstream recipients.  "Knowingly relying" means you have
   1.511 +actual knowledge that, but for the patent license, your conveying the
   1.512 +covered work in a country, or your recipient's use of the covered work
   1.513 +in a country, would infringe one or more identifiable patents in that
   1.514 +country that you have reason to believe are valid.
   1.515 +
   1.516 +  If, pursuant to or in connection with a single transaction or
   1.517 +arrangement, you convey, or propagate by procuring conveyance of, a
   1.518 +covered work, and grant a patent license to some of the parties
   1.519 +receiving the covered work authorizing them to use, propagate, modify
   1.520 +or convey a specific copy of the covered work, then the patent license
   1.521 +you grant is automatically extended to all recipients of the covered
   1.522 +work and works based on it.
   1.523 +
   1.524 +  A patent license is "discriminatory" if it does not include within
   1.525 +the scope of its coverage, prohibits the exercise of, or is
   1.526 +conditioned on the non-exercise of one or more of the rights that are
   1.527 +specifically granted under this License.  You may not convey a covered
   1.528 +work if you are a party to an arrangement with a third party that is
   1.529 +in the business of distributing software, under which you make payment
   1.530 +to the third party based on the extent of your activity of conveying
   1.531 +the work, and under which the third party grants, to any of the
   1.532 +parties who would receive the covered work from you, a discriminatory
   1.533 +patent license (a) in connection with copies of the covered work
   1.534 +conveyed by you (or copies made from those copies), or (b) primarily
   1.535 +for and in connection with specific products or compilations that
   1.536 +contain the covered work, unless you entered into that arrangement,
   1.537 +or that patent license was granted, prior to 28 March 2007.
   1.538 +
   1.539 +  Nothing in this License shall be construed as excluding or limiting
   1.540 +any implied license or other defenses to infringement that may
   1.541 +otherwise be available to you under applicable patent law.
   1.542 +
   1.543 +  12. No Surrender of Others' Freedom.
   1.544 +
   1.545 +  If conditions are imposed on you (whether by court order, agreement or
   1.546 +otherwise) that contradict the conditions of this License, they do not
   1.547 +excuse you from the conditions of this License.  If you cannot convey a
   1.548 +covered work so as to satisfy simultaneously your obligations under this
   1.549 +License and any other pertinent obligations, then as a consequence you may
   1.550 +not convey it at all.  For example, if you agree to terms that obligate you
   1.551 +to collect a royalty for further conveying from those to whom you convey
   1.552 +the Program, the only way you could satisfy both those terms and this
   1.553 +License would be to refrain entirely from conveying the Program.
   1.554 +
   1.555 +  13. Use with the GNU Affero General Public License.
   1.556 +
   1.557 +  Notwithstanding any other provision of this License, you have
   1.558 +permission to link or combine any covered work with a work licensed
   1.559 +under version 3 of the GNU Affero General Public License into a single
   1.560 +combined work, and to convey the resulting work.  The terms of this
   1.561 +License will continue to apply to the part which is the covered work,
   1.562 +but the special requirements of the GNU Affero General Public License,
   1.563 +section 13, concerning interaction through a network will apply to the
   1.564 +combination as such.
   1.565 +
   1.566 +  14. Revised Versions of this License.
   1.567 +
   1.568 +  The Free Software Foundation may publish revised and/or new versions of
   1.569 +the GNU General Public License from time to time.  Such new versions will
   1.570 +be similar in spirit to the present version, but may differ in detail to
   1.571 +address new problems or concerns.
   1.572 +
   1.573 +  Each version is given a distinguishing version number.  If the
   1.574 +Program specifies that a certain numbered version of the GNU General
   1.575 +Public License "or any later version" applies to it, you have the
   1.576 +option of following the terms and conditions either of that numbered
   1.577 +version or of any later version published by the Free Software
   1.578 +Foundation.  If the Program does not specify a version number of the
   1.579 +GNU General Public License, you may choose any version ever published
   1.580 +by the Free Software Foundation.
   1.581 +
   1.582 +  If the Program specifies that a proxy can decide which future
   1.583 +versions of the GNU General Public License can be used, that proxy's
   1.584 +public statement of acceptance of a version permanently authorizes you
   1.585 +to choose that version for the Program.
   1.586 +
   1.587 +  Later license versions may give you additional or different
   1.588 +permissions.  However, no additional obligations are imposed on any
   1.589 +author or copyright holder as a result of your choosing to follow a
   1.590 +later version.
   1.591 +
   1.592 +  15. Disclaimer of Warranty.
   1.593 +
   1.594 +  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
   1.595 +APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
   1.596 +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
   1.597 +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
   1.598 +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   1.599 +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
   1.600 +IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
   1.601 +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
   1.602 +
   1.603 +  16. Limitation of Liability.
   1.604 +
   1.605 +  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
   1.606 +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
   1.607 +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
   1.608 +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
   1.609 +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
   1.610 +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
   1.611 +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
   1.612 +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
   1.613 +SUCH DAMAGES.
   1.614 +
   1.615 +  17. Interpretation of Sections 15 and 16.
   1.616 +
   1.617 +  If the disclaimer of warranty and limitation of liability provided
   1.618 +above cannot be given local legal effect according to their terms,
   1.619 +reviewing courts shall apply local law that most closely approximates
   1.620 +an absolute waiver of all civil liability in connection with the
   1.621 +Program, unless a warranty or assumption of liability accompanies a
   1.622 +copy of the Program in return for a fee.
   1.623 +
   1.624 +                     END OF TERMS AND CONDITIONS
   1.625 +
   1.626 +            How to Apply These Terms to Your New Programs
   1.627 +
   1.628 +  If you develop a new program, and you want it to be of the greatest
   1.629 +possible use to the public, the best way to achieve this is to make it
   1.630 +free software which everyone can redistribute and change under these terms.
   1.631 +
   1.632 +  To do so, attach the following notices to the program.  It is safest
   1.633 +to attach them to the start of each source file to most effectively
   1.634 +state the exclusion of warranty; and each file should have at least
   1.635 +the "copyright" line and a pointer to where the full notice is found.
   1.636 +
   1.637 +    <one line to give the program's name and a brief idea of what it does.>
   1.638 +    Copyright (C) <year>  <name of author>
   1.639 +
   1.640 +    This program is free software: you can redistribute it and/or modify
   1.641 +    it under the terms of the GNU General Public License as published by
   1.642 +    the Free Software Foundation, either version 3 of the License, or
   1.643 +    (at your option) any later version.
   1.644 +
   1.645 +    This program is distributed in the hope that it will be useful,
   1.646 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   1.647 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   1.648 +    GNU General Public License for more details.
   1.649 +
   1.650 +    You should have received a copy of the GNU General Public License
   1.651 +    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   1.652 +
   1.653 +Also add information on how to contact you by electronic and paper mail.
   1.654 +
   1.655 +  If the program does terminal interaction, make it output a short
   1.656 +notice like this when it starts in an interactive mode:
   1.657 +
   1.658 +    <program>  Copyright (C) <year>  <name of author>
   1.659 +    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
   1.660 +    This is free software, and you are welcome to redistribute it
   1.661 +    under certain conditions; type `show c' for details.
   1.662 +
   1.663 +The hypothetical commands `show w' and `show c' should show the appropriate
   1.664 +parts of the General Public License.  Of course, your program's commands
   1.665 +might be different; for a GUI interface, you would use an "about box".
   1.666 +
   1.667 +  You should also get your employer (if you work as a programmer) or school,
   1.668 +if any, to sign a "copyright disclaimer" for the program, if necessary.
   1.669 +For more information on this, and how to apply and follow the GNU GPL, see
   1.670 +<http://www.gnu.org/licenses/>.
   1.671 +
   1.672 +  The GNU General Public License does not permit incorporating your program
   1.673 +into proprietary programs.  If your program is a subroutine library, you
   1.674 +may consider it more useful to permit linking proprietary applications with
   1.675 +the library.  If this is what you want to do, use the GNU Lesser General
   1.676 +Public License instead of this License.  But first, please read
   1.677 +<http://www.gnu.org/philosophy/why-not-lgpl.html>.

     2.1 --- a/about.txt	Sun May 02 12:23:06 2010 +0100
     2.2 +++ b/about.txt	Sun May 02 12:25:17 2010 +0100
     2.3 @@ -1,10 +1,25 @@
     2.4  *******************************************************************************
     2.5  *                                                                             *
     2.6 -*                               BeebAsm V1.01                                 *
     2.7 +*                               BeebAsm V1.02                                 *
     2.8  *                                                                             *
     2.9  *             A portable 6502 assembler with BBC Micro style syntax           *
    2.10  *                                                                             *
    2.11 -*                   Rich Talbot-Watkins <rich_tw@hotmail.com>                 *
    2.12 +*                  Copyright (C) Rich Talbot-Watkins 2007, 2008               *
    2.13 +*                            <rich_tw@hotmail.com>                            *
    2.14 +*                                                                             *
    2.15 +*    This program is free software: you can redistribute it and/or modify     *
    2.16 +*    it under the terms of the GNU General Public License as published by     *
    2.17 +*    the Free Software Foundation, either version 3 of the License, or        *
    2.18 +*    (at your option) any later version.                                      *
    2.19 +*                                                                             *
    2.20 +*    This program is distributed in the hope that it will be useful, but      *
    2.21 +*    WITHOUT ANY WARRANTY; without even the implied warranty of               *
    2.22 +*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
    2.23 +*    General Public License for more details.                                 *
    2.24 +*                                                                             *
    2.25 +*    You should have received a copy of the GNU General Public License        *
    2.26 +*    along with this program, as COPYING.txt.  If not, see                    *
    2.27 +*    <http://www.gnu.org/licenses/>.                                          *
    2.28  *                                                                             *
    2.29  *******************************************************************************
    2.30  
    2.31 @@ -38,7 +53,12 @@
    2.32  directly within a source file.
    2.33  
    2.34  BeebAsm is distributed with source code, and should be easily portable to any
    2.35 -platform you wish.
    2.36 +platform you wish.  To build under Windows, you will need to install MinGW
    2.37 +(http://www.mingw.org), and the most basic subset of Cygwin
    2.38 +(http://www.cygwin.org) which provides Windows versions of the common Unix
    2.39 +commands.  Ensure the executables from these two packages are in your
    2.40 +Windows path, and BeebAsm should compile without problems.  Just navigate to
    2.41 +the directory containing 'Makefile', and enter 'make code'.
    2.42  
    2.43  
    2.44  
    2.45 @@ -342,13 +362,20 @@
    2.46    it first.
    2.47  
    2.48  
    2.49 -SAVE "filename", start, end [, exec]
    2.50 +SAVE "filename", start, end [, exec [, reload] ]
    2.51  
    2.52    Saves out object code to either a DFS disc image (if one has been
    2.53 -  specified), or to the current directory as a standalone file.  'exec'
    2.54 -  specifies the execution address of the file when saved to a disc image.  A
    2.55 +  specified), or to the current directory as a standalone file.  A
    2.56    source file must have at least one SAVE statement in it, otherwise nothing
    2.57    will be output.  BeebAsm will warn if this is the case.
    2.58 +  
    2.59 +  'exec' can be optionally specified as the execution address of the file when
    2.60 +  saved to a disc image.
    2.61 +  
    2.62 +  'reload' can additionally be specified to save the file on the disc image to
    2.63 +  a different address to that which it was saved from.  Use this to assemble
    2.64 +  code at its 'native' address,  but which loads at a DFS-friendly address,
    2.65 +  ready to be relocated to its correct address upon execution.
    2.66  
    2.67  
    2.68  PRINT
    2.69 @@ -547,11 +574,19 @@
    2.70  (This is not to say that it's particularly impressive, but nonetheless, it
    2.71  really is pushing the hardware!!)
    2.72  
    2.73 +There is also a demo called "relocdemo.asm", which shows how the 'reload
    2.74 +address' feature of SAVE can be used to write self-relocating code.  This is
    2.75 +based on the above demo, but it runs at a low address (&300).
    2.76 +
    2.77  
    2.78  
    2.79  
    2.80  9. VERSION HISTORY
    2.81  
    2.82 +06/11/2008  1.02  Bugfix: now it's possible to save location &FFFF.
    2.83 +                  Added 'reload address' parameter to SAVE.
    2.84 +                  Properly integrated the GPL License text into the
    2.85 +                  distribution.
    2.86  14/04/2008  1.01  Bugfixes: allow lower case index in abs,x or abs,y.
    2.87                    Fails if file already exists in output disc image.
    2.88                    Symbol names may now begin with assembler opcode names.
    2.89 @@ -581,6 +616,6 @@
    2.90  
    2.91  There are bound to be loads.  I wrote it quickly!  Please help me zap all the
    2.92  problems by reporting any bugs to me, Rich Talbot-Watkins, at
    2.93 -rich_tw@hotmail.com
    2.94 +<rich_tw@hotmail.com>, or join the forum at <http://www.retrosoftware.co.uk>.
    2.95  
    2.96  Thank you!

     3.1 Binary file beebasm.exe has changed

     4.1 --- a/demo.asm	Sun May 02 12:23:06 2010 +0100
     4.2 +++ b/demo.asm	Sun May 02 12:25:17 2010 +0100
     4.3 @@ -475,4 +475,3 @@
     4.4  \ ******************************************************************
     4.5  
     4.6  SAVE "Code", start, end
     4.7 -

     5.1 Binary file demo.ssd has changed

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/relocdemo.asm	Sun May 02 12:25:17 2010 +0100
     6.3 @@ -0,0 +1,522 @@
     6.4 +\ ******************************************************************
     6.5 +\ *
     6.6 +\ *		Relocation demo
     6.7 +\ *
     6.8 +\ *		Simple demonstration of how to write self-relocating code
     6.9 +\ *		in BeebAsm, using the new 'reload address' feature of SAVE.
    6.10 +\ *
    6.11 +\ *		This uses the 'star globe' demo as a base.
    6.12 +\ *
    6.13 +\ ******************************************************************
    6.14 +
    6.15 +
    6.16 +\\ Define addresses
    6.17 +
    6.18 +NATIVE_ADDR		= &300		; address at which code will run
    6.19 +RELOAD_ADDR		= &1100		; address at which code will load
    6.20 +
    6.21 +OFFSET			= RELOAD_ADDR - NATIVE_ADDR
    6.22 +
    6.23 +
    6.24 +\\ Define globals
    6.25 +
    6.26 +numdots			= 160
    6.27 +radius			= 100
    6.28 +timerlength		= 64*8*26
    6.29 +debugrasters	= FALSE
    6.30 +
    6.31 +
    6.32 +\\ Define some zp locations
    6.33 +
    6.34 +ORG 0
    6.35 +
    6.36 +.xpos			SKIP 1
    6.37 +.ypos			SKIP 1
    6.38 +.colour			SKIP 1
    6.39 +.write			SKIP 2
    6.40 +.vsync			SKIP 1
    6.41 +.angle			SKIP 2
    6.42 +.speed			SKIP 2
    6.43 +.counter		SKIP 1
    6.44 +.temp			SKIP 1
    6.45 +.behindflag		SKIP 1
    6.46 +
    6.47 +
    6.48 +\\ Set start address
    6.49 +
    6.50 +ORG NATIVE_ADDR
    6.51 +
    6.52 +
    6.53 +\ ******************************************************************
    6.54 +\ *	The start of the demo 'proper', after it has been relocated
    6.55 +\ ******************************************************************
    6.56 +
    6.57 +.START
    6.58 +
    6.59 +	\\ Clear the screen
    6.60 +
    6.61 +	LDX #&40
    6.62 +	LDA #0
    6.63 +	TAY
    6.64 +.clearloop
    6.65 +	STA &4000,Y
    6.66 +	INY
    6.67 +	BNE clearloop
    6.68 +	INC clearloop+2
    6.69 +	DEX
    6.70 +	BNE clearloop
    6.71 +
    6.72 +	\\ Enable interrupts, ready to start the main loop
    6.73 +
    6.74 +	CLI
    6.75 +
    6.76 +	\\ First we wait for 'vsync' so we are synchronised
    6.77 +
    6.78 +.initialwait
    6.79 +	LDA vsync:BEQ initialwait:LDA #0:STA vsync
    6.80 +
    6.81 +	\\ Enable the screen
    6.82 +	
    6.83 +	LDA #6:STA &FE00:LDA #32:STA &FE01
    6.84 +
    6.85 +	\\ This is the main loop!
    6.86 +
    6.87 +.mainloop
    6.88 +
    6.89 +	\\ Plot every dot on the screen
    6.90 +
    6.91 +	LDX #0
    6.92 +.plotdotloop
    6.93 +	STX counter
    6.94 +
    6.95 +	; setup y pos ready for plot routine
    6.96 +
    6.97 +	LDA doty,X:STA ypos
    6.98 +
    6.99 +	; get sin index
   6.100 +
   6.101 +	CLC:LDA dotx,X:ADC angle+1:TAY
   6.102 +	CLC:ADC #64:STA behindflag
   6.103 +
   6.104 +	; get colour from sin index
   6.105 +
   6.106 +	LDA coltable,Y:STA colour
   6.107 +
   6.108 +	; perform sin(x) * radius
   6.109 +	; discussion of the multiplication method below in the table setup
   6.110 +
   6.111 +	SEC:LDA sintable,Y:STA temp:SBC dotr,X
   6.112 +	BCS noneg:EOR #&FF:ADC #1:.noneg
   6.113 +	CPY #128:TAY:BCS negativesine
   6.114 +
   6.115 +	CLC:LDA dotr,X:ADC temp:TAX
   6.116 +	BCS morethan256:SEC
   6.117 +	LDA multtab1,X:SBC multtab1,Y:JMP donemult
   6.118 +	.morethan256
   6.119 +	LDA multtab2,X:SBC multtab1,Y:JMP donemult
   6.120 +
   6.121 +	.negativesine
   6.122 +	CLC:LDA dotr,X:ADC temp:TAX
   6.123 +	BCS morethan256b:SEC
   6.124 +	LDA multtab1,Y:SBC multtab1,X:JMP donemult
   6.125 +	.morethan256b
   6.126 +	LDA multtab1,Y:SBC multtab2,X
   6.127 +	.donemult
   6.128 +
   6.129 +	CLC:ADC #64:STA xpos
   6.130 +
   6.131 +	; routine to plot a dot
   6.132 +	; also we remember the calculated screen address in the dot tables
   6.133 +
   6.134 +	LDA ypos:LSR A:LSR A:AND #&FE
   6.135 +	TAX
   6.136 +	LDA xpos:AND #&FE:ASL A:ASL A
   6.137 +	STA write
   6.138 +	LDY counter:STA olddotaddrlo,Y
   6.139 +	TXA:ADC #&40:STA write+1:STA olddotaddrhi,Y
   6.140 +	LDA ypos:AND #7:STA olddotaddry,Y:TAY
   6.141 +	LDA xpos:LSR A:LDA colour:ROL A:TAX
   6.142 +	LDA colours,X
   6.143 +	ORA (write),Y
   6.144 +	STA (write),Y
   6.145 +	BIT behindflag:BMI behind
   6.146 +
   6.147 +	; if the dot is in front, we double its size
   6.148 +
   6.149 +	DEY:BPL samescreenrow
   6.150 +	DEC write+1:DEC write+1:LDY #7:.samescreenrow
   6.151 +	LDA colours,X
   6.152 +	ORA (write),Y
   6.153 +	STA (write),Y
   6.154 +	.behind
   6.155 +
   6.156 +	; loop to the next dot
   6.157 +
   6.158 +	LDX counter
   6.159 +	INX:CPX #numdots
   6.160 +	BEQ waitforvsync
   6.161 +	JMP plotdotloop
   6.162 +
   6.163 +	\\ Wait for VSync here
   6.164 +
   6.165 +.waitforvsync
   6.166 +	IF debugrasters
   6.167 +		LDA #&00 + PAL_magenta:STA &FE21
   6.168 +	ENDIF
   6.169 +.waitingforvsync
   6.170 +	LDA vsync:BEQ waitingforvsync
   6.171 +	CMP #2:BCS exit		; insist that it runs in a frame!
   6.172 +	LDA #0:STA vsync
   6.173 +
   6.174 +	\\ Now delete all the old dots.
   6.175 +	\\ We actually do this when the screen is still rasterising down..!
   6.176 +
   6.177 +	TAX
   6.178 +.eraseloop
   6.179 +	LDY olddotaddrlo,X:STY write
   6.180 +	LDY olddotaddrhi,X:STY write+1
   6.181 +	LDY olddotaddry,X
   6.182 +	STA (write),Y
   6.183 +	DEY:BPL erasesamerow
   6.184 +	DEC write+1:DEC write+1:LDY #7:.erasesamerow
   6.185 +	STA (write),Y
   6.186 +	INX:CPX #numdots
   6.187 +	BNE eraseloop
   6.188 +
   6.189 +	IF debugrasters
   6.190 +		LDA #&00 + PAL_red:STA &FE21
   6.191 +	ENDIF
   6.192 +
   6.193 +	\\ Add to rotation
   6.194 +
   6.195 +	CLC:LDA angle:ADC speed:STA angle
   6.196 +	LDA angle+1:ADC speed+1:STA angle+1
   6.197 +
   6.198 +	\\ Check keypresses
   6.199 +
   6.200 +	LDA #66:STA &FE4F:LDA &FE4F:BPL notx
   6.201 +	CLC:LDA speed:ADC #16:STA speed:BCC notx:INC speed+1:.notx
   6.202 +	LDA #97:STA &FE4F:LDA &FE4F:BPL notz
   6.203 +	SEC:LDA speed:SBC #16:STA speed:BCS notz:DEC speed+1:.notz
   6.204 +	LDA #112:STA &FE4F:LDA &FE4F:BMI exit
   6.205 +
   6.206 +	JMP mainloop
   6.207 +
   6.208 +	\\ Exit - in the least graceful way possible :)
   6.209 +
   6.210 +.exit
   6.211 +	JMP (&FFFC)
   6.212 +
   6.213 +
   6.214 +
   6.215 +\ ******************************************************************
   6.216 +\ *	IRQ handler
   6.217 +\ ******************************************************************
   6.218 +
   6.219 +.irq
   6.220 +	LDA &FE4D:AND #2:BNE irqvsync
   6.221 +.irqtimer
   6.222 +	LDA #&40:STA &FE4D:INC vsync
   6.223 +	IF debugrasters
   6.224 +		LDA #&00 + PAL_blue:STA &FE21
   6.225 +	ENDIF
   6.226 +	LDA &FC
   6.227 +	RTI
   6.228 +.irqvsync
   6.229 +	STA &FE4D
   6.230 +	LDA #LO(timerlength):STA &FE44
   6.231 +	LDA #HI(timerlength):STA &FE45
   6.232 +	IF debugrasters
   6.233 +		LDA #&00 + PAL_black:STA &FE21
   6.234 +	ENDIF
   6.235 +	LDA &FC
   6.236 +	RTI
   6.237 +
   6.238 +
   6.239 +
   6.240 +\ ******************************************************************
   6.241 +\ *	Colour table used by the plot code
   6.242 +\ ******************************************************************
   6.243 +
   6.244 +.colours
   6.245 +	EQUB &00, &00		; black pixels
   6.246 +	EQUB &02, &01		; blue pixels
   6.247 +	EQUB &08, &04		; red pixels
   6.248 +	EQUB &0A, &05		; magenta pixels
   6.249 +	EQUB &20, &10		; green pixels
   6.250 +	EQUB &22, &11		; cyan pixels
   6.251 +	EQUB &28, &14		; yellow pixels
   6.252 +	EQUB &2A, &15		; white pixels
   6.253 +
   6.254 +
   6.255 +\ ******************************************************************
   6.256 +\ *	sin table
   6.257 +\ ******************************************************************
   6.258 +
   6.259 +; contains ABS sine values
   6.260 +; we don't store the sign as it confuses the multiplication.
   6.261 +; we can tell the sign very easily from whether the index is >128
   6.262 +
   6.263 +ALIGN &100	; so we don't incur page-crossed penalties
   6.264 +.sintable
   6.265 +FOR n, 0, 255
   6.266 +	EQUB ABS(SIN(n/128*PI)) * 255
   6.267 +NEXT
   6.268 +
   6.269 +
   6.270 +\ ******************************************************************
   6.271 +\ *	colour table
   6.272 +\ ******************************************************************
   6.273 +
   6.274 +ALIGN &100
   6.275 +.coltable
   6.276 +FOR n, 0, 255
   6.277 +	EQUB (SIN(n/128*PI) + 1) / 2.0001 * 7 + 1
   6.278 +NEXT
   6.279 +
   6.280 +
   6.281 +\ ******************************************************************
   6.282 +\ *	multiplication tables
   6.283 +\ ******************************************************************
   6.284 +
   6.285 +; This is a very quick way to do multiplies, based on the fact that:
   6.286 +;
   6.287 +;							(a+b)^2  =  a^2 + b^2 + 2ab    (I)
   6.288 +;							(a-b)^2  =  a^2 + b^2 - 2ab    (II)
   6.289 +;
   6.290 +; (I) minus (II) yields:	(a+b)^2 - (a-b)^2 = 4ab
   6.291 +;
   6.292 +; 		  or, rewritten:	ab = f(a+b) - f(a-b),
   6.293 +;											where f(x) = x^2 / 4
   6.294 +;
   6.295 +; We build a table of f(x) here with x=0..511, and then can perform
   6.296 +; 8-bit * 8-bit by 4 table lookups and a 16-bit subtract.
   6.297 +;
   6.298 +; In this case, we will discard the low byte of the result, so we
   6.299 +; only need the high bytes, and can do just 2 table lookups and a
   6.300 +; simple 8-bit subtract.
   6.301 +
   6.302 +ALIGN &100
   6.303 +.multtab1
   6.304 +FOR n, 0, 255
   6.305 +	EQUB HI(n*n DIV 4)
   6.306 +NEXT
   6.307 +.multtab2
   6.308 +FOR n, 256, 511
   6.309 +	EQUB HI(n*n DIV 4)
   6.310 +NEXT
   6.311 +
   6.312 +
   6.313 +\ ******************************************************************
   6.314 +\ *	dot tables
   6.315 +\ ******************************************************************
   6.316 +
   6.317 +; contains the phase of this dot
   6.318 +
   6.319 +ALIGN &100
   6.320 +.dotx
   6.321 +FOR n, 0, numdots-1
   6.322 +	EQUB RND(256)
   6.323 +NEXT
   6.324 +
   6.325 +
   6.326 +; contains the y position of the dot
   6.327 +; the dots are sorted by y positions, highest on screen first - this means we can do
   6.328 +; 'raster chasing'!
   6.329 +; the y positions are also biased so there are fewer at the poles, and more at the equator!
   6.330 +
   6.331 +ALIGN &100
   6.332 +.doty
   6.333 +FOR n, 0, numdots-1
   6.334 +	x = (n - numdots/2 + 0.5) / (numdots/2)
   6.335 +	y = (x - SIN(x*PI) * 0.1) * radius
   6.336 +	EQUB 128 + y
   6.337 +NEXT
   6.338 +
   6.339 +
   6.340 +; contains the radius of the ball at this y position
   6.341 +
   6.342 +ALIGN &100
   6.343 +.dotr
   6.344 +FOR n, 0, numdots-1
   6.345 +	x = (n - numdots/2 + 0.5) / (numdots/2)
   6.346 +	y = (x - SIN(x*PI) * 0.1) * radius
   6.347 +	r = SQR(radius*radius - y*y) / 2
   6.348 +	EQUB r
   6.349 +NEXT
   6.350 +
   6.351 +
   6.352 +\ ******************************************************************
   6.353 +\ *	This is the end of the main native block of code
   6.354 +\ ******************************************************************
   6.355 +.END
   6.356 +
   6.357 +
   6.358 +\ ******************************************************************
   6.359 +\ *	The entry point of the demo
   6.360 +\ * This relocates the code to its 'real' address, and can also
   6.361 +\ * do one-time initialisation, i.e. code we can chuck away afterwards.
   6.362 +\ *
   6.363 +\ * Since this is the relocation code, it has to go at the very end of
   6.364 +\ * the executable.
   6.365 +\
   6.366 +\ * This code will be running at its assemble address + OFFSET,
   6.367 +\ * so we have to patch up any absolute address references accordingly.
   6.368 +\ ******************************************************************
   6.369 +
   6.370 +ALIGN &100
   6.371 +.RELOC_START
   6.372 +
   6.373 +	\\ Set up hardware state and interrupts
   6.374 +
   6.375 +	SEI
   6.376 +	LDX #&FF:TXS				; reset stack
   6.377 +	STX &FE44:STX &FE45
   6.378 +	LDA #&7F:STA &FE4E			; disable all interrupts
   6.379 +	STA &FE43					; set keyboard data direction
   6.380 +	LDA #&C2:STA &FE4E			; enable VSync and timer interrupt
   6.381 +	LDA #&0F:STA &FE42			; set addressable latch for writing
   6.382 +	LDA #3:STA &FE40			; keyboard write enable
   6.383 +	LDA #0:STA &FE4B			; timer 1 one shot mode
   6.384 +	LDA #LO(irq):STA &204
   6.385 +	LDA #HI(irq):STA &205		; set interrupt handler
   6.386 +
   6.387 +	\\ Set up CRTC for MODE 2
   6.388 +
   6.389 +	LDX #13
   6.390 +.crtcloop
   6.391 +	STX &FE00
   6.392 +	LDA crtcregs + OFFSET,X		; PATCHED ADDRESS
   6.393 +	STA &FE01
   6.394 +	DEX
   6.395 +	BPL crtcloop
   6.396 +
   6.397 +	\\ Set up video ULA for MODE 2
   6.398 +
   6.399 +	LDA #&F4
   6.400 +	STA &FE20
   6.401 +
   6.402 +	\\ Set up palette for MODE 2
   6.403 +
   6.404 +	LDX #15
   6.405 +.palloop
   6.406 +	LDA paldata + OFFSET,X		; PATCHED ADDRESS
   6.407 +	STA &FE21
   6.408 +	ORA #&80
   6.409 +	STA &FE21
   6.410 +	DEX
   6.411 +	BPL palloop
   6.412 +
   6.413 +	\\ Initialise vars
   6.414 +
   6.415 +	LDA #0:STA angle:STA angle+1
   6.416 +	STA vsync
   6.417 +	STA speed
   6.418 +	LDA #1:STA speed+1
   6.419 +	
   6.420 +	\\ Relocate
   6.421 +	
   6.422 +	LDX #HI(RELOC_START-START)
   6.423 +	LDY #0
   6.424 +	.relocloop
   6.425 +	LDA RELOAD_ADDR,Y
   6.426 +	STA NATIVE_ADDR,Y
   6.427 +	INY
   6.428 +	BNE relocloop
   6.429 +	INC relocloop+OFFSET+2		; PATCHED ADDRESS
   6.430 +	INC relocloop+OFFSET+5		; PATCHED ADDRESS
   6.431 +	DEX
   6.432 +	BNE relocloop
   6.433 +	
   6.434 +	JMP START
   6.435 +
   6.436 +
   6.437 +\ ******************************************************************
   6.438 +\ *	Values of CRTC regs for MODE 2
   6.439 +\ ******************************************************************
   6.440 +
   6.441 +.crtcregs
   6.442 +	EQUB 127			; R0  horizontal total
   6.443 +	EQUB 64				; R1  horizontal displayed - shrunk a little
   6.444 +	EQUB 91				; R2  horizontal position
   6.445 +	EQUB 40				; R3  sync width
   6.446 +	EQUB 38				; R4  vertical total
   6.447 +	EQUB 0				; R5  vertical total adjust
   6.448 +	EQUB 0				; R6  vertical displayed
   6.449 +	EQUB 34				; R7  vertical position
   6.450 +	EQUB 0				; R8  interlace
   6.451 +	EQUB 7				; R9  scanlines per row
   6.452 +	EQUB 32				; R10 cursor start
   6.453 +	EQUB 8				; R11 cursor end
   6.454 +	EQUB HI(&4000/8)	; R12 screen start address, high
   6.455 +	EQUB LO(&4000/8)	; R13 screen start address, low
   6.456 +
   6.457 +
   6.458 +\ ******************************************************************
   6.459 +\ *	Values of palette regs for MODE 2
   6.460 +\ ******************************************************************
   6.461 +
   6.462 +PAL_black	= (0 EOR 7)
   6.463 +PAL_blue	= (4 EOR 7)
   6.464 +PAL_red		= (1 EOR 7)
   6.465 +PAL_magenta = (5 EOR 7)
   6.466 +PAL_green	= (2 EOR 7)
   6.467 +PAL_cyan	= (6 EOR 7)
   6.468 +PAL_yellow	= (3 EOR 7)
   6.469 +PAL_white	= (7 EOR 7)
   6.470 +
   6.471 +.paldata
   6.472 +	EQUB &00 + PAL_black
   6.473 +	EQUB &10 + PAL_blue
   6.474 +	EQUB &20 + PAL_red
   6.475 +	EQUB &30 + PAL_magenta
   6.476 +	EQUB &40 + PAL_green
   6.477 +	EQUB &50 + PAL_cyan
   6.478 +	EQUB &60 + PAL_yellow
   6.479 +	EQUB &70 + PAL_white
   6.480 +
   6.481 +
   6.482 +
   6.483 +
   6.484 +\ ******************************************************************
   6.485 +\ *	End address to be saved
   6.486 +\ ******************************************************************
   6.487 +.RELOC_END
   6.488 +
   6.489 +
   6.490 +\ ******************************************************************
   6.491 +\ *	Save the code, before the following data overlay clears it again
   6.492 +\ ******************************************************************
   6.493 +
   6.494 +SAVE "Code", START, RELOC_END, RELOC_START+OFFSET, RELOAD_ADDR
   6.495 +
   6.496 +
   6.497 +
   6.498 +
   6.499 +\ ******************************************************************
   6.500 +\ * Start a new overlay:
   6.501 +\ *
   6.502 +\ * This is overlapped with the relocation code above, because it
   6.503 +\ * will already have been thrown away by the time these tables are
   6.504 +\ * used.
   6.505 +\ *
   6.506 +\ * These tables are filled at run-time, hence we just define their
   6.507 +\ * addresses, we don't need to save anything.
   6.508 +\ ******************************************************************
   6.509 +
   6.510 +CLEAR END, RELOC_END
   6.511 +ORG END
   6.512 +
   6.513 +; these store the screen address of the last dot
   6.514 +; at the end of the frame, we go through these tables, storing zeroes to
   6.515 +; all these addresses in order to delete the last frame
   6.516 +
   6.517 +ALIGN &100
   6.518 +.olddotaddrlo	SKIP numdots
   6.519 +
   6.520 +ALIGN &100
   6.521 +.olddotaddrhi	SKIP numdots
   6.522 +
   6.523 +ALIGN &100
   6.524 +.olddotaddry	SKIP numdots
   6.525 +

     7.1 Binary file relocdemo.ssd has changed

     8.1 --- a/src/Makefile	Sun May 02 12:23:06 2010 +0100
     8.2 +++ b/src/Makefile	Sun May 02 12:25:17 2010 +0100
     8.3 @@ -2,6 +2,22 @@
     8.4  #
     8.5  #	Makefile for beebasm
     8.6  #
     8.7 +#
     8.8 +#	Copyright (C) Rich Talbot-Watkins 2007, 2008
     8.9 +#
    8.10 +#	This file is part of BeebAsm.
    8.11 +#
    8.12 +#	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
    8.13 +#	General Public License as published by the Free Software Foundation, either version 3 of the
    8.14 +#	License, or (at your option) any later version.
    8.15 +#
    8.16 +#	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
    8.17 +#	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    8.18 +#	GNU General Public License for more details.
    8.19 +#
    8.20 +#	You should have received a copy of the GNU General Public License along with BeebAsm, as
    8.21 +#	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
    8.22 +#
    8.23  #**************************************************************************************************
    8.24  
    8.25  # List source subdirectories

     9.1 --- a/src/Makefile.inc	Sun May 02 12:23:06 2010 +0100
     9.2 +++ b/src/Makefile.inc	Sun May 02 12:25:17 2010 +0100
     9.3 @@ -21,7 +21,21 @@
     9.4  #		CPUS			The number of CPUs on this machine
     9.5  #		VERBOSE			Echoes all commands launched by make
     9.6  #
     9.7 -#	@author RTW
     9.8 +#
     9.9 +#	Copyright (C) Rich Talbot-Watkins 2007, 2008
    9.10 +#
    9.11 +#	This file is part of BeebAsm.
    9.12 +#
    9.13 +#	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
    9.14 +#	General Public License as published by the Free Software Foundation, either version 3 of the
    9.15 +#	License, or (at your option) any later version.
    9.16 +#
    9.17 +#	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
    9.18 +#	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    9.19 +#	GNU General Public License for more details.
    9.20 +#
    9.21 +#	You should have received a copy of the GNU General Public License along with BeebAsm, as
    9.22 +#	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
    9.23  #
    9.24  #**************************************************************************************************
    9.25  

    10.1 --- a/src/asmexception.cpp	Sun May 02 12:23:06 2010 +0100
    10.2 +++ b/src/asmexception.cpp	Sun May 02 12:25:17 2010 +0100
    10.3 @@ -3,6 +3,22 @@
    10.4  	asmexception.cpp
    10.5  
    10.6  	Exception handling for the app
    10.7 +
    10.8 +
    10.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   10.10 +
   10.11 +	This file is part of BeebAsm.
   10.12 +
   10.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   10.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   10.15 +	License, or (at your option) any later version.
   10.16 +
   10.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   10.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   10.19 +	GNU General Public License for more details.
   10.20 +
   10.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   10.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   10.23  */
   10.24  /*************************************************************************************************/
   10.25  

    11.1 --- a/src/asmexception.h	Sun May 02 12:23:06 2010 +0100
    11.2 +++ b/src/asmexception.h	Sun May 02 12:25:17 2010 +0100
    11.3 @@ -1,6 +1,22 @@
    11.4  /*************************************************************************************************/
    11.5  /**
    11.6  	asmexception.h
    11.7 +
    11.8 +
    11.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   11.10 +
   11.11 +	This file is part of BeebAsm.
   11.12 +
   11.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   11.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   11.15 +	License, or (at your option) any later version.
   11.16 +
   11.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   11.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   11.19 +	GNU General Public License for more details.
   11.20 +
   11.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   11.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   11.23  */
   11.24  /*************************************************************************************************/
   11.25  

    12.1 --- a/src/assemble.cpp	Sun May 02 12:23:06 2010 +0100
    12.2 +++ b/src/assemble.cpp	Sun May 02 12:25:17 2010 +0100
    12.3 @@ -3,6 +3,22 @@
    12.4  	assemble.cpp
    12.5  
    12.6  	Contains all the LineParser methods for assembling code
    12.7 +
    12.8 +
    12.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   12.10 +
   12.11 +	This file is part of BeebAsm.
   12.12 +
   12.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   12.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   12.15 +	License, or (at your option) any later version.
   12.16 +
   12.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   12.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   12.19 +	GNU General Public License for more details.
   12.20 +
   12.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   12.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   12.23  */
   12.24  /*************************************************************************************************/
   12.25  

    13.1 --- a/src/commands.cpp	Sun May 02 12:23:06 2010 +0100
    13.2 +++ b/src/commands.cpp	Sun May 02 12:25:17 2010 +0100
    13.3 @@ -3,6 +3,22 @@
    13.4  	commands.cpp
    13.5  
    13.6  	Contains all the LineParser methods for parsing and handling assembler commands
    13.7 +
    13.8 +
    13.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   13.10 +
   13.11 +	This file is part of BeebAsm.
   13.12 +
   13.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   13.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   13.15 +	License, or (at your option) any later version.
   13.16 +
   13.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   13.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   13.19 +	GNU General Public License for more details.
   13.20 +
   13.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   13.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   13.23  */
   13.24  /*************************************************************************************************/
   13.25  
   13.26 @@ -238,7 +254,7 @@
   13.27  void LineParser::HandleClear()
   13.28  {
   13.29  	int start = EvaluateExpressionAsInt();
   13.30 -	if ( start < 0 || start > 0xFFFF )
   13.31 +	if ( start < 0 || start > 0x10000 )
   13.32  	{
   13.33  		throw AsmException_SyntaxError_OutOfRange( m_line, m_column );
   13.34  	}
   13.35 @@ -788,8 +804,9 @@
   13.36  	int start = 0;
   13.37  	int end = 0;
   13.38  	int exec = 0;
   13.39 +	int reload = 0;
   13.40  
   13.41 -	// syntax is SAVE "filename", start, end [, exec]
   13.42 +	// syntax is SAVE "filename", start, end [, exec [, reload] ]
   13.43  
   13.44  	if ( !AdvanceAndCheckEndOfStatement() )
   13.45  	{
   13.46 @@ -839,6 +856,8 @@
   13.47  	m_column++;
   13.48  
   13.49  	start = EvaluateExpressionAsInt();
   13.50 +	exec = start;
   13.51 +	reload = start;
   13.52  
   13.53  	if ( start < 0 || start > 0xFFFF )
   13.54  	{
   13.55 @@ -857,7 +876,7 @@
   13.56  
   13.57  	end = EvaluateExpressionAsInt();
   13.58  
   13.59 -	if ( end < 0 || end > 0xFFFF )
   13.60 +	if ( end < 0 || end > 0x10000 )
   13.61  	{
   13.62  		throw AsmException_SyntaxError_OutOfRange( m_line, m_column );
   13.63  	}
   13.64 @@ -880,15 +899,25 @@
   13.65  				throw;
   13.66  			}
   13.67  		}
   13.68 -	}
   13.69 -	else
   13.70 -	{
   13.71 -		exec = start;
   13.72 -	}
   13.73  
   13.74 -	if ( exec < 0 || exec > 0xFFFF )
   13.75 -	{
   13.76 -		throw AsmException_SyntaxError_OutOfRange( m_line, m_column );
   13.77 +		if ( exec < 0 || exec > 0xFFFF )
   13.78 +		{
   13.79 +			throw AsmException_SyntaxError_OutOfRange( m_line, m_column );
   13.80 +		}
   13.81 +
   13.82 +		// get optional reload address
   13.83 +
   13.84 +		if ( m_line[ m_column ] == ',' )
   13.85 +		{
   13.86 +			m_column++;
   13.87 +
   13.88 +			reload = EvaluateExpressionAsInt();
   13.89 +
   13.90 +			if ( reload < 0 || reload > 0xFFFF )
   13.91 +			{
   13.92 +				throw AsmException_SyntaxError_OutOfRange( m_line, m_column );
   13.93 +			}
   13.94 +		}
   13.95  	}
   13.96  
   13.97  	// expect no more
   13.98 @@ -908,7 +937,7 @@
   13.99  			// disc image version of the save
  13.100  			GlobalData::Instance().GetDiscImage()->AddFile( saveFile.c_str(),
  13.101  															ObjectCode::Instance().GetAddr( start ),
  13.102 -															start,
  13.103 +															reload,
  13.104  															exec,
  13.105  															end - start );
  13.106  		}

    14.1 --- a/src/discimage.cpp	Sun May 02 12:23:06 2010 +0100
    14.2 +++ b/src/discimage.cpp	Sun May 02 12:25:17 2010 +0100
    14.3 @@ -1,6 +1,22 @@
    14.4  /*************************************************************************************************/
    14.5  /**
    14.6  	discimage.cpp
    14.7 +
    14.8 +
    14.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   14.10 +
   14.11 +	This file is part of BeebAsm.
   14.12 +
   14.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   14.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   14.15 +	License, or (at your option) any later version.
   14.16 +
   14.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   14.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   14.19 +	GNU General Public License for more details.
   14.20 +
   14.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   14.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   14.23  */
   14.24  /*************************************************************************************************/
   14.25  

    15.1 --- a/src/discimage.h	Sun May 02 12:23:06 2010 +0100
    15.2 +++ b/src/discimage.h	Sun May 02 12:25:17 2010 +0100
    15.3 @@ -1,6 +1,22 @@
    15.4  /*************************************************************************************************/
    15.5  /**
    15.6  	discimage.h
    15.7 +
    15.8 +
    15.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   15.10 +
   15.11 +	This file is part of BeebAsm.
   15.12 +
   15.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   15.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   15.15 +	License, or (at your option) any later version.
   15.16 +
   15.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   15.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   15.19 +	GNU General Public License for more details.
   15.20 +
   15.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   15.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   15.23  */
   15.24  /*************************************************************************************************/
   15.25  

    16.1 --- a/src/expression.cpp	Sun May 02 12:23:06 2010 +0100
    16.2 +++ b/src/expression.cpp	Sun May 02 12:25:17 2010 +0100
    16.3 @@ -3,6 +3,22 @@
    16.4  	expression.cpp
    16.5  
    16.6  	Contains all the LineParser methods for parsing and evaluating expressions
    16.7 +
    16.8 +
    16.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   16.10 +
   16.11 +	This file is part of BeebAsm.
   16.12 +
   16.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   16.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   16.15 +	License, or (at your option) any later version.
   16.16 +
   16.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   16.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   16.19 +	GNU General Public License for more details.
   16.20 +
   16.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   16.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   16.23  */
   16.24  /*************************************************************************************************/
   16.25  

    17.1 --- a/src/globaldata.cpp	Sun May 02 12:23:06 2010 +0100
    17.2 +++ b/src/globaldata.cpp	Sun May 02 12:25:17 2010 +0100
    17.3 @@ -1,6 +1,22 @@
    17.4  /*************************************************************************************************/
    17.5  /**
    17.6  	globaldata.cpp
    17.7 +
    17.8 +
    17.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   17.10 +
   17.11 +	This file is part of BeebAsm.
   17.12 +
   17.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   17.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   17.15 +	License, or (at your option) any later version.
   17.16 +
   17.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   17.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   17.19 +	GNU General Public License for more details.
   17.20 +
   17.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   17.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   17.23  */
   17.24  /*************************************************************************************************/
   17.25  

    18.1 --- a/src/globaldata.h	Sun May 02 12:23:06 2010 +0100
    18.2 +++ b/src/globaldata.h	Sun May 02 12:25:17 2010 +0100
    18.3 @@ -1,6 +1,22 @@
    18.4  /*************************************************************************************************/
    18.5  /**
    18.6  	globaldata.h
    18.7 +
    18.8 +
    18.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   18.10 +
   18.11 +	This file is part of BeebAsm.
   18.12 +
   18.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   18.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   18.15 +	License, or (at your option) any later version.
   18.16 +
   18.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   18.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   18.19 +	GNU General Public License for more details.
   18.20 +
   18.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   18.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   18.23  */
   18.24  /*************************************************************************************************/
   18.25  

    19.1 --- a/src/lineparser.cpp	Sun May 02 12:23:06 2010 +0100
    19.2 +++ b/src/lineparser.cpp	Sun May 02 12:25:17 2010 +0100
    19.3 @@ -3,6 +3,22 @@
    19.4  	lineparser.cpp
    19.5  
    19.6  	Represents a line of the source file
    19.7 +
    19.8 +
    19.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   19.10 +
   19.11 +	This file is part of BeebAsm.
   19.12 +
   19.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   19.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   19.15 +	License, or (at your option) any later version.
   19.16 +
   19.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   19.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   19.19 +	GNU General Public License for more details.
   19.20 +
   19.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   19.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   19.23  */
   19.24  /*************************************************************************************************/
   19.25  

    20.1 --- a/src/lineparser.h	Sun May 02 12:23:06 2010 +0100
    20.2 +++ b/src/lineparser.h	Sun May 02 12:25:17 2010 +0100
    20.3 @@ -1,6 +1,22 @@
    20.4  /*************************************************************************************************/
    20.5  /**
    20.6  	lineparser.h
    20.7 +
    20.8 +
    20.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   20.10 +
   20.11 +	This file is part of BeebAsm.
   20.12 +
   20.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   20.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   20.15 +	License, or (at your option) any later version.
   20.16 +
   20.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   20.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   20.19 +	GNU General Public License for more details.
   20.20 +
   20.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   20.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   20.23  */
   20.24  /*************************************************************************************************/
   20.25  

    21.1 --- a/src/main.cpp	Sun May 02 12:23:06 2010 +0100
    21.2 +++ b/src/main.cpp	Sun May 02 12:25:17 2010 +0100
    21.3 @@ -3,6 +3,22 @@
    21.4  	main.cpp
    21.5  
    21.6  	Main entry point for the application
    21.7 +
    21.8 +
    21.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   21.10 +
   21.11 +	This file is part of BeebAsm.
   21.12 +
   21.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   21.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   21.15 +	License, or (at your option) any later version.
   21.16 +
   21.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   21.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   21.19 +	GNU General Public License for more details.
   21.20 +
   21.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   21.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   21.23  */
   21.24  /*************************************************************************************************/
   21.25  
   21.26 @@ -23,7 +39,7 @@
   21.27  using namespace std;
   21.28  
   21.29  
   21.30 -#define VERSION "1.01"
   21.31 +#define VERSION "1.02"
   21.32  
   21.33  
   21.34  /*************************************************************************************************/

    22.1 --- a/src/main.h	Sun May 02 12:23:06 2010 +0100
    22.2 +++ b/src/main.h	Sun May 02 12:25:17 2010 +0100
    22.3 @@ -1,6 +1,22 @@
    22.4  /*************************************************************************************************/
    22.5  /**
    22.6  	main.h
    22.7 +
    22.8 +
    22.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   22.10 +
   22.11 +	This file is part of BeebAsm.
   22.12 +
   22.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   22.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   22.15 +	License, or (at your option) any later version.
   22.16 +
   22.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   22.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   22.19 +	GNU General Public License for more details.
   22.20 +
   22.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   22.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   22.23  */
   22.24  /*************************************************************************************************/
   22.25  

    23.1 --- a/src/objectcode.cpp	Sun May 02 12:23:06 2010 +0100
    23.2 +++ b/src/objectcode.cpp	Sun May 02 12:25:17 2010 +0100
    23.3 @@ -1,6 +1,22 @@
    23.4  /*************************************************************************************************/
    23.5  /**
    23.6  	objectcode.cpp
    23.7 +
    23.8 +
    23.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   23.10 +
   23.11 +	This file is part of BeebAsm.
   23.12 +
   23.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   23.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   23.15 +	License, or (at your option) any later version.
   23.16 +
   23.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   23.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   23.19 +	GNU General Public License for more details.
   23.20 +
   23.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   23.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   23.23  */
   23.24  /*************************************************************************************************/
   23.25  

    24.1 --- a/src/objectcode.h	Sun May 02 12:23:06 2010 +0100
    24.2 +++ b/src/objectcode.h	Sun May 02 12:25:17 2010 +0100
    24.3 @@ -1,6 +1,22 @@
    24.4  /*************************************************************************************************/
    24.5  /**
    24.6  	objectcode.h
    24.7 +
    24.8 +
    24.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   24.10 +
   24.11 +	This file is part of BeebAsm.
   24.12 +
   24.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   24.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   24.15 +	License, or (at your option) any later version.
   24.16 +
   24.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   24.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   24.19 +	GNU General Public License for more details.
   24.20 +
   24.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   24.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   24.23  */
   24.24  /*************************************************************************************************/
   24.25  

    25.1 --- a/src/sourcefile.cpp	Sun May 02 12:23:06 2010 +0100
    25.2 +++ b/src/sourcefile.cpp	Sun May 02 12:25:17 2010 +0100
    25.3 @@ -3,6 +3,22 @@
    25.4  	sourcefile.cpp
    25.5  
    25.6  	Assembles a file
    25.7 +
    25.8 +
    25.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   25.10 +
   25.11 +	This file is part of BeebAsm.
   25.12 +
   25.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   25.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   25.15 +	License, or (at your option) any later version.
   25.16 +
   25.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   25.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   25.19 +	GNU General Public License for more details.
   25.20 +
   25.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   25.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   25.23  */
   25.24  /*************************************************************************************************/
   25.25  

    26.1 --- a/src/sourcefile.h	Sun May 02 12:23:06 2010 +0100
    26.2 +++ b/src/sourcefile.h	Sun May 02 12:25:17 2010 +0100
    26.3 @@ -1,6 +1,22 @@
    26.4  /*************************************************************************************************/
    26.5  /**
    26.6  	sourcefile.h
    26.7 +
    26.8 +
    26.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   26.10 +
   26.11 +	This file is part of BeebAsm.
   26.12 +
   26.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   26.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   26.15 +	License, or (at your option) any later version.
   26.16 +
   26.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   26.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   26.19 +	GNU General Public License for more details.
   26.20 +
   26.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   26.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   26.23  */
   26.24  /*************************************************************************************************/
   26.25  

    27.1 --- a/src/stringutils.cpp	Sun May 02 12:23:06 2010 +0100
    27.2 +++ b/src/stringutils.cpp	Sun May 02 12:25:17 2010 +0100
    27.3 @@ -1,6 +1,22 @@
    27.4  /*************************************************************************************************/
    27.5  /**
    27.6  	stringutils.cpp
    27.7 +
    27.8 +
    27.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   27.10 +
   27.11 +	This file is part of BeebAsm.
   27.12 +
   27.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   27.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   27.15 +	License, or (at your option) any later version.
   27.16 +
   27.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   27.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   27.19 +	GNU General Public License for more details.
   27.20 +
   27.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   27.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   27.23  */
   27.24  /*************************************************************************************************/
   27.25  

    28.1 --- a/src/stringutils.h	Sun May 02 12:23:06 2010 +0100
    28.2 +++ b/src/stringutils.h	Sun May 02 12:25:17 2010 +0100
    28.3 @@ -1,6 +1,22 @@
    28.4  /*************************************************************************************************/
    28.5  /**
    28.6  	stringutils.h
    28.7 +
    28.8 +
    28.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   28.10 +
   28.11 +	This file is part of BeebAsm.
   28.12 +
   28.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   28.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   28.15 +	License, or (at your option) any later version.
   28.16 +
   28.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   28.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   28.19 +	GNU General Public License for more details.
   28.20 +
   28.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   28.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   28.23  */
   28.24  /*************************************************************************************************/
   28.25  

    29.1 --- a/src/symboltable.cpp	Sun May 02 12:23:06 2010 +0100
    29.2 +++ b/src/symboltable.cpp	Sun May 02 12:25:17 2010 +0100
    29.3 @@ -1,6 +1,22 @@
    29.4  /*************************************************************************************************/
    29.5  /**
    29.6  	symboltable.cpp
    29.7 +
    29.8 +
    29.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   29.10 +
   29.11 +	This file is part of BeebAsm.
   29.12 +
   29.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   29.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   29.15 +	License, or (at your option) any later version.
   29.16 +
   29.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   29.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   29.19 +	GNU General Public License for more details.
   29.20 +
   29.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   29.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   29.23  */
   29.24  /*************************************************************************************************/
   29.25  

    30.1 --- a/src/symboltable.h	Sun May 02 12:23:06 2010 +0100
    30.2 +++ b/src/symboltable.h	Sun May 02 12:25:17 2010 +0100
    30.3 @@ -1,6 +1,22 @@
    30.4  /*************************************************************************************************/
    30.5  /**
    30.6  	symboltable.h
    30.7 +
    30.8 +
    30.9 +	Copyright (C) Rich Talbot-Watkins 2007, 2008
   30.10 +
   30.11 +	This file is part of BeebAsm.
   30.12 +
   30.13 +	BeebAsm is free software: you can redistribute it and/or modify it under the terms of the GNU
   30.14 +	General Public License as published by the Free Software Foundation, either version 3 of the
   30.15 +	License, or (at your option) any later version.
   30.16 +
   30.17 +	BeebAsm is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
   30.18 +	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   30.19 +	GNU General Public License for more details.
   30.20 +
   30.21 +	You should have received a copy of the GNU General Public License along with BeebAsm, as
   30.22 +	COPYING.txt.  If not, see <http://www.gnu.org/licenses/>.
   30.23  */
   30.24  /*************************************************************************************************/
   30.25