Merge github.com:michaelcmartin/Ophis into temp

This commit is contained in:
gardners 2014-03-23 16:53:39 +10:30
commit d407791aa9
17 changed files with 21 additions and 20 deletions

View File

@ -19,7 +19,7 @@
<bookinfo>
<title>Programming with Ophis</title>
<author><firstname>Michael</firstname><surname>Martin</surname></author>
<copyright><year>2006-2012</year><holder>Michael Martin</holder></copyright>
<copyright><year>2006-2014</year><holder>Michael Martin</holder></copyright>
</bookinfo>
&pre1;
<part label="I">

View File

@ -2,13 +2,14 @@
import optparse
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.
enable_branch_extend = True
enable_undoc_ops = False
enable_65c02_exts = False
enable_4502_exts = False
warn_on_branch_extend = True
@ -34,7 +35,7 @@ def parse_args(raw_args):
parser = optparse.OptionParser(
usage="Usage: %prog [options] srcfile [srcfile ...]",
version="Ophis 6502 cross-assembler, version 2.0")
version="Ophis 6502 cross-assembler, version 2.1")
parser.add_option("-o", default=None, dest="outfile",
help="Output filename (default 'ophis.bin')")
@ -75,9 +76,9 @@ def parse_args(raw_args):
if options.c02 and options.undoc:
parser.error("--undoc and --65c02 are mutually exclusive")
if options.c02 and options.csg4502:
parser.error("--undoc and --65c02 are mutually exclusive")
parser.error("--65c02 and --4502 are mutually exclusive")
if options.csg4502 and options.undoc:
parser.error("--undoc and --65c02 are mutually exclusive")
parser.error("--undoc and --4502 are mutually exclusive")
infiles = args
outfile = options.outfile

View File

@ -2,7 +2,7 @@
Provides the core assembler directives."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -3,7 +3,7 @@
Implements the symbol lookup, through nested environments -
any non-temporary variable is stored at the top level."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -3,7 +3,7 @@
Keeps track of the number of errors inflicted so far, and
where in the assembly the errors are occurring."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -10,7 +10,7 @@ import sys
import os
import os.path
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -3,7 +3,7 @@
Classes for representing the Intermediate nodes upon which the
assembler passes operate."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -4,7 +4,7 @@
traditional to mix binary with reconstructed instructions that
have all arguments precomputed. This class manages that."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -4,7 +4,7 @@
set via .alias commands and prevented from escaping
with .scope and .scend commands."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -3,7 +3,7 @@
When invoked as main, interprets its command line and goes from there.
Otherwise, use run_ophis(cmdline-list) to use it inside a script."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -3,7 +3,7 @@
Tables for the assembly of 6502-family instructions, mapping
opcodes and addressing modes to binary instructions."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -7,7 +7,7 @@
very extensible; additional analyses or optimizations may be
added as new subclasses of Pass."""
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -1,5 +1,5 @@
"Ophis - a cross-assembler for the 6502 series of chips"
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Ophis"
!define PRODUCT_VERSION "2.0"
!define PRODUCT_VERSION "2.1"
!define PRODUCT_PUBLISHER "Michael Martin"
!define PRODUCT_WEB_SITE "https://michaelcmartin.github.com/Ophis"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\ophis.exe"

View File

@ -1,6 +1,6 @@
from distutils.core import setup
setup(name='Ophis',
version='2.0',
version='2.1',
description='A cross-assembler for the 6502 series of processors',
url='https://github.com/michaelcmartin/Ophis',
author="Michael Martin",

View File

@ -8,7 +8,7 @@ prologue = '"""' + """Opcodes file.
Tables for the assembly of 6502-family instructions, mapping
opcodes and addressing modes to binary instructions.""" + '"""' + """
# Copyright 2002-2012 Michael C. Martin and additional contributors.
# Copyright 2002-2014 Michael C. Martin and additional contributors.
# You may use, modify, and distribute this file under the MIT
# license: See README for details.

View File

@ -1 +1 @@
 """###''+///224477::;<<<???BCGGKOOORRWWZ[\___bbddggklllooorrttwwz{|||€€噰墘媼嫃弿拻棗洓洔湝灋灍煙Ё<EFBC83><D081><EFBFBD>膊贩换患技靠柯旅们撬怂舷弦易宗圻哌忖沣翡溏珀腚腼镲蝌鼢<E89D8C><E9BCA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 """###''+///224477::;<<<???BCGGKOOORRWWZ[\___bbddggklllooorrttwwz{|||€€噰墘媼嫃弿拻棗洓洔湝灋灍煙Ё<EFBC83><D081><EFBFBD>膊贩换患技靠柯旅们撬怂舷弦易宗圻哌忖沣翡溏珀腚腼镲蝌鼢<E89D8C><E9BCA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>