diff --git a/doc/ophismanual.sgm b/doc/ophismanual.sgm
index c262b34..46478f5 100644
--- a/doc/ophismanual.sgm
+++ b/doc/ophismanual.sgm
@@ -19,7 +19,7 @@
Programming with Ophis
MichaelMartin
- 2006-2012Michael Martin
+ 2006-2014Michael Martin
&pre1;
diff --git a/src/Ophis/CmdLine.py b/src/Ophis/CmdLine.py
index 299ad44..3b85a5a 100644
--- a/src/Ophis/CmdLine.py
+++ b/src/Ophis/CmdLine.py
@@ -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
diff --git a/src/Ophis/CorePragmas.py b/src/Ophis/CorePragmas.py
index a1ac27e..090dd6a 100644
--- a/src/Ophis/CorePragmas.py
+++ b/src/Ophis/CorePragmas.py
@@ -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.
diff --git a/src/Ophis/Environment.py b/src/Ophis/Environment.py
index ec4e201..7d7546d 100644
--- a/src/Ophis/Environment.py
+++ b/src/Ophis/Environment.py
@@ -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.
diff --git a/src/Ophis/Errors.py b/src/Ophis/Errors.py
index 88f37e0..d7e5882 100644
--- a/src/Ophis/Errors.py
+++ b/src/Ophis/Errors.py
@@ -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.
diff --git a/src/Ophis/Frontend.py b/src/Ophis/Frontend.py
index 51bcde9..cbe6b2d 100644
--- a/src/Ophis/Frontend.py
+++ b/src/Ophis/Frontend.py
@@ -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.
diff --git a/src/Ophis/IR.py b/src/Ophis/IR.py
index 2250541..71a7642 100644
--- a/src/Ophis/IR.py
+++ b/src/Ophis/IR.py
@@ -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.
diff --git a/src/Ophis/Listing.py b/src/Ophis/Listing.py
index f150007..cf4101c 100644
--- a/src/Ophis/Listing.py
+++ b/src/Ophis/Listing.py
@@ -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.
diff --git a/src/Ophis/Macro.py b/src/Ophis/Macro.py
index ffd2337..cdf1573 100644
--- a/src/Ophis/Macro.py
+++ b/src/Ophis/Macro.py
@@ -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.
diff --git a/src/Ophis/Main.py b/src/Ophis/Main.py
index c691a87..32b3135 100644
--- a/src/Ophis/Main.py
+++ b/src/Ophis/Main.py
@@ -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.
diff --git a/src/Ophis/Opcodes.py b/src/Ophis/Opcodes.py
index 0b820c5..87b4388 100644
--- a/src/Ophis/Opcodes.py
+++ b/src/Ophis/Opcodes.py
@@ -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.
diff --git a/src/Ophis/Passes.py b/src/Ophis/Passes.py
index f39e1cd..bb1623d 100644
--- a/src/Ophis/Passes.py
+++ b/src/Ophis/Passes.py
@@ -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.
diff --git a/src/Ophis/__init__.py b/src/Ophis/__init__.py
index fb67870..d29c4c7 100644
--- a/src/Ophis/__init__.py
+++ b/src/Ophis/__init__.py
@@ -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.
diff --git a/src/scripts/ophis.nsi b/src/scripts/ophis.nsi
index 17fc526..ff491d5 100644
--- a/src/scripts/ophis.nsi
+++ b/src/scripts/ophis.nsi
@@ -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"
diff --git a/src/setup.py b/src/setup.py
index 1669b72..75f43fd 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -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",
diff --git a/src/tools/opcodes/gensets.py b/src/tools/opcodes/gensets.py
index 7d35e6e..1c0d875 100755
--- a/src/tools/opcodes/gensets.py
+++ b/src/tools/opcodes/gensets.py
@@ -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.
diff --git a/tests/test4502.bin b/tests/test4502.bin
index ad317e7..617b1f7 100644
Binary files a/tests/test4502.bin and b/tests/test4502.bin differ