Commit d8e5774323d5408e119b5fa3cce1c73c7345e8f7
authorMichel Pollet <buserror@gmail.com>
Tue, 24 Nov 2009 13:11:54 +0000 (13:11 +0000)
committerMichel Pollet <buserror@gmail.com>
Tue, 24 Nov 2009 13:14:03 +0000 (13:14 +0000)
Signed-off-by: Michel Pollet <buserror@gmail.com>
37 files changed:
.cproject [new file with mode: 0644]
.gitignore [new file with mode: 0644]
.project [new file with mode: 0644]
.simavr.jcc [new file with mode: 0644]
COPYING [new file with mode: 0644]
Makefile [new file with mode: 0644]
README [new file with mode: 0644]
include/avr_mcu_section.h [new file with mode: 0644]
simavr/Makefile [new file with mode: 0644]
simavr/cores/sim_core_declare.h [new file with mode: 0644]
simavr/cores/sim_mega168.c [new file with mode: 0644]
simavr/cores/sim_mega48.c [new file with mode: 0644]
simavr/cores/sim_mega644.c [new file with mode: 0644]
simavr/cores/sim_mega88.c [new file with mode: 0644]
simavr/cores/sim_megax8.c [new file with mode: 0644]
simavr/cores/sim_megax8.h [new file with mode: 0644]
simavr/cores/sim_tiny85.c [new file with mode: 0644]
simavr/sim/avr_eeprom.c [new file with mode: 0644]
simavr/sim/avr_eeprom.h [new file with mode: 0644]
simavr/sim/avr_ioport.c [new file with mode: 0644]
simavr/sim/avr_ioport.h [new file with mode: 0644]
simavr/sim/avr_spi.c [new file with mode: 0644]
simavr/sim/avr_spi.h [new file with mode: 0644]
simavr/sim/avr_timer8.c [new file with mode: 0644]
simavr/sim/avr_timer8.h [new file with mode: 0644]
simavr/sim/avr_uart.c [new file with mode: 0644]
simavr/sim/avr_uart.h [new file with mode: 0644]
simavr/sim/sim_core.c [new file with mode: 0644]
simavr/sim/sim_core.h [new file with mode: 0644]
simavr/sim/sim_elf.c [new file with mode: 0644]
simavr/sim/sim_elf.h [new file with mode: 0644]
simavr/sim/sim_gdb.c [new file with mode: 0644]
simavr/sim/sim_gdb.h [new file with mode: 0644]
simavr/sim/simavr.c [new file with mode: 0644]
simavr/sim/simavr.h [new file with mode: 0644]
tests/Makefile [new file with mode: 0644]
tests/atmega88_example.c [new file with mode: 0644]

diff --git a/.cproject b/.cproject
new file mode 100644 (file)
index 0000000..0bfb771
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="0.2107346173">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2107346173" moduleId="org.eclipse.cdt.core.settings" name="Default">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="simavr" buildProperties="" description="" id="0.2107346173" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+<folderInfo id="0.2107346173." name="/" resourcePath="">
+<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.563132950" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.563132950.732794089" name=""/>
+<builder arguments="jap make -C Sources/Utils/simavr" command="ssh" id="org.eclipse.cdt.build.core.settings.default.builder.618922905" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1175233835" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.936002247" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1978040989" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1940002337" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1031230860" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1605608141" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.269360962" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="0.2107346173">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="simavr.null.2105255402" name="simavr"/>
+</storageModule>
+</cproject>
diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b3de6c0
--- /dev/null
@@ -0,0 +1,5 @@
+obj
+*.axf
+*.hex
+*.s
+simavr/simavr
diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..59cd1bd
--- /dev/null
+++ b/.project
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>simavr</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+                       <triggers>clean,full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>?name?</key>
+                                       <value></value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.append_environment</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+                                       <value>all</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.buildArguments</key>
+                                       <value>jap make -C Sources/Utils/simavr</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.buildCommand</key>
+                                       <value>ssh</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+                                       <value>clean</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.contents</key>
+                                       <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+                                       <value>false</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+                                       <value>all</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.stopOnError</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+                                       <value>false</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.cdt.core.cnature</nature>
+               <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+               <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+       </natures>
+</projectDescription>
diff --git a/.simavr.jcc b/.simavr.jcc
new file mode 100644 (file)
index 0000000..640d586
--- /dev/null
@@ -0,0 +1,140 @@
+jx_browser_data 79
+# project tree
+0 "root"
+T
+1 "main"
+T
+2 "Makefile"
+F
+"./simavr/Makefile"
+T
+2 "avr_spi.c"
+F
+"./simavr/sim/avr_spi.c"
+T
+2 "avr_spi.h"
+F
+"./simavr/sim/avr_spi.h"
+T
+2 "avr_timer8.c"
+F
+"./simavr/sim/avr_timer8.c"
+T
+2 "avr_timer8.h"
+F
+"./simavr/sim/avr_timer8.h"
+T
+2 "avr_ioport.c"
+F
+"./simavr/sim/avr_ioport.c"
+T
+2 "avr_ioport.h"
+F
+"./simavr/sim/avr_ioport.h"
+T
+2 "avr_eeprom.c"
+F
+"./simavr/sim/avr_eeprom.c"
+T
+2 "avr_eeprom.h"
+F
+"./simavr/sim/avr_eeprom.h"
+T
+2 "avr_uart.c"
+F
+"./simavr/sim/avr_uart.c"
+T
+2 "avr_uart.h"
+F
+"./simavr/sim/avr_uart.h"
+T
+2 "sim_core.c"
+F
+"./simavr/sim/sim_core.c"
+T
+2 "sim_core.h"
+F
+"./simavr/sim/sim_core.h"
+T
+2 "sim_gdb.c"
+F
+"./simavr/sim/sim_gdb.c"
+T
+2 "sim_gdb.h"
+F
+"./simavr/sim/sim_gdb.h"
+T
+2 "sim_elf.c"
+F
+"./simavr/sim/sim_elf.c"
+T
+2 "sim_elf.h"
+F
+"./simavr/sim/sim_elf.h"
+T
+2 "simavr.c"
+F
+"./simavr/sim/simavr.c"
+T
+2 "simavr.h"
+F
+"./simavr/sim/simavr.h"
+F
+T
+1 "tests"
+T
+2 "atmega88_example.c"
+F
+"./tests/atmega88_example.c"
+F
+T
+1 "cores"
+T
+2 "sim_core_declare.h"
+F
+"./simavr/cores/sim_core_declare.h"
+T
+2 "sim_mega88.c"
+F
+"./simavr/cores/sim_mega88.c"
+T
+2 "sim_mega168.c"
+F
+"./simavr/cores/sim_mega168.c"
+T
+2 "sim_mega48.c"
+F
+"./simavr/cores/sim_mega48.c"
+T
+2 "sim_megax8.c"
+F
+"./simavr/cores/sim_megax8.c"
+T
+2 "sim_megax8.h"
+F
+"./simavr/cores/sim_megax8.h"
+T
+2 "sim_tiny85.c"
+F
+"./simavr/cores/sim_tiny85.c"
+T
+2 "sim_mega644.c"
+F
+"./simavr/cores/sim_mega644.c"
+F
+F
+# tasks
+4
+"echo Makefile must be updated manually"
+F
+# build settings
+0
+T
+"simavr"
+""
+"make -k all"
+# search paths
+T "./" T
+F
+# C preprocessor
+F
diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..cd3b15b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+
+
+all:   make-tests
+       make -C simavr
+
+make-tests:
+       make -C tests
+
+clean:
+       make -C simavr clean
+       make -C tests clean
+       
\ No newline at end of file
diff --git a/README b/README
new file mode 100644 (file)
index 0000000..7aaa72f
--- /dev/null
+++ b/README
@@ -0,0 +1,35 @@
+
+simavr -- a simple, lean and mean AVR simulator
+
+http://gitorious.org/simavr
+
+simavr is a new AVR simulator for linux, or any platform that uses avr-gcc. It uses 
+avr-gcc own register definition to simplify creating new targets for supoortted AVR
+devices.
+
+The core was made to be small and compact, and hackable so allow quick protoyping 
+of an AVR project. The simulator loads .elf directly, and there is even a way to
+specify simulation parameters directly in the emulated code using an .elf section.
+
+The status of the project is the core works at about 98% (ie, it works, but there 
+is a known bug). The supported IOs are eeprom, IO ports (including pin interupts), 
+8 bits timers (well, one of mode of the myriad) and a simple UART that makes 
+Ã’printfÓ work.
+
+gdb support is planned next.
+
+PREQUISTES:
++ avr-gcc ; tested with 4.3.4 (from debian)
+       The code rudely assumes the avr-gcc is in /usr/lib/avr/include/...
++ libelf-dev
+
+BUILD:
++ make
+
+TEST:
++ ./simavr/simavr tests/atmega88_example.axf
+
+There are no command line options for now.. The simulator recognizes attiny85, 
+atmega48,88,168 and atmega644. It's fairly easy to add new cores.
+
+Michel Pollet <buserror@gmail.com>
diff --git a/include/avr_mcu_section.h b/include/avr_mcu_section.h
new file mode 100644 (file)
index 0000000..b20d501
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+       avr_mcu_section.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AVR_MCU_SECTION_H__
+#define __AVR_MCU_SECTION_H__
+
+/*
+ * This structure is used to pass "parameters" to the programmer or the simulator,
+ * it tags the ELF file with a section that contains parameters about the physical
+ * AVR this was compiled for, including the speed, model, and signature bytes.
+ *
+ * A programmer software can read this and verify fuses values for example, and a
+ * simulator can instanciate the proper "model" of AVR, the speed and so on without
+ * command line parameters.
+ *
+ * Exemple of use:
+ *
+ * #include "avr_mcu_section.h"
+ * AVR_MCU(F_CPU, "atmega88");
+ *
+ */
+
+typedef struct avr_mcu_t {
+       long f_cpu;                             // avr is little endian
+       unsigned char id[4];    // signature bytes
+       unsigned char fuse[4];  // optional
+       char name[16];
+} avr_mcu_t;
+
+#define AVR_MCU(_speed, _name) \
+const avr_mcu_t _mmcu __attribute__((section(".mmcu"))) = {\
+       .f_cpu = _speed, \
+       .id = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2}, \
+       .name = _name,\
+}
+
+#endif
diff --git a/simavr/Makefile b/simavr/Makefile
new file mode 100644 (file)
index 0000000..b076154
--- /dev/null
@@ -0,0 +1,70 @@
+#
+#      Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+#
+#      This file is part of simavr.
+#
+#      simavr is free software: you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      the Free Software Foundation, either version 3 of the License, or
+#      (at your option) any later version.
+#
+#      simavr is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+
+target = simavr
+
+CFLAGS =  -g -std=gnu99 -Wall
+CFLAGS += -O3  -mfpmath=sse -msse2
+
+cores  = ${wildcard cores/*.c}
+cores_o = ${patsubst cores/%.c, obj/%.o, ${cores}}
+sim            = ${wildcard sim/*.c}
+sim_o  = ${patsubst sim/%.c, obj/%.o, ${sim}}
+
+VPATH  = .
+VPATH  += cores
+VPATH  += sim
+
+IPATH  = .
+IPATH  += sim
+IPATH  += ../../shared
+IPATH  += ../include
+IPATH  += /opt/local/include
+
+CFLAGS += ${patsubst %,-I%,${subst :, ,${IPATH}}}
+LFLAGS = -L/opt/local/lib/
+LDFLAGS        += -lelf
+
+all:   obj ${target}
+
+obj:
+       @mkdir -p obj
+
+obj/sim_%.o : cores/sim_%.h cores/sim_core_declare.h sim/*.h
+obj/sim_%.o : cores/sim_%.c
+       @gcc $(CFLAGS) \
+               -I/usr/lib/avr/include/ \
+               $<  -c -o $@
+       @echo CORE $<
+
+obj/%.o: %.h sim/*.h
+obj/%.o: %.c
+       @gcc $(CFLAGS) \
+               $<  -c -o $@
+       @echo CC $<
+       
+${target}      :       ${cores_o}
+${target}      :       ${sim_o}
+       @gcc $(CFLAGS) $(LFLAGS) \
+               ${^} -o $@ \
+                $(LDFLAGS)
+       @echo LD $@
+
+clean:
+       rm -rf ${target} obj
+
diff --git a/simavr/cores/sim_core_declare.h b/simavr/cores/sim_core_declare.h
new file mode 100644 (file)
index 0000000..4394c89
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+       sim_core_declare.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __SIM_CORE_DECLARE_H__
+#define __SIM_CORE_DECLARE_H__
+
+/*
+ * The macros "fake" the ones in the real avrlib
+ */
+#define _SFR_IO8(v) ((v)+32)
+#define _SFR_MEM8(v) (v)
+#define _BV(v) (v)
+#define _VECTOR(v) (v)
+
+/*
+ * This declares a typical AVR core, using constants what appears
+ * to be in every io*.h file...
+ */
+#define DEFAULT_CORE(_vector_size) \
+       .ramend = RAMEND, \
+       .flashend = FLASHEND, \
+       .e2end = E2END, \
+       .vector_size = _vector_size, \
+       .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }, \
+       .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT, EFUSE_DEFAULT }
+
+
+#endif /* __SIM_CORE_DECLARE_H__ */
diff --git a/simavr/cores/sim_mega168.c b/simavr/cores/sim_mega168.c
new file mode 100644 (file)
index 0000000..54d8bcf
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+       sim_mega168.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "simavr.h"
+
+#define SIM_VECTOR_SIZE        4
+#define SIM_MMCU               "atmega168"
+#define SIM_CORENAME   mcu_mega168
+
+#define _AVR_IO_H_
+#define __ASSEMBLER__
+#include "avr/iom168.h"
+// instanciate the new core
+#include "sim_megax8.h"
+
+static avr_t * make()
+{
+       return &SIM_CORENAME.core;
+}
+
+avr_kind_t mega168 = {
+       .names = { "atmega168", "atmega168p","atmega168pa" },
+       .make = make
+};
+
diff --git a/simavr/cores/sim_mega48.c b/simavr/cores/sim_mega48.c
new file mode 100644 (file)
index 0000000..b0b0c95
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+       sim_mega48.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "simavr.h"
+
+#define SIM_VECTOR_SIZE        2
+#define SIM_MMCU               "atmega48"
+#define SIM_CORENAME   mcu_mega48
+
+#define _AVR_IO_H_
+#define __ASSEMBLER__
+#include "avr/iom48.h"
+// instanciate the new core
+#include "sim_megax8.h"
+
+static avr_t * make()
+{
+       return &SIM_CORENAME.core;
+}
+
+avr_kind_t mega48 = {
+       .names = { "atmega48", "atmega48p","atmega48pa" },
+       .make = make
+};
+
diff --git a/simavr/cores/sim_mega644.c b/simavr/cores/sim_mega644.c
new file mode 100644 (file)
index 0000000..813e551
--- /dev/null
@@ -0,0 +1,240 @@
+/*
+       sim_mega644.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include </usr/include/stdio.h>
+#include "simavr.h"
+#include "sim_core_declare.h"
+#include "avr_eeprom.h"
+#include "avr_ioport.h"
+#include "avr_uart.h"
+#include "avr_timer8.h"
+
+#define _AVR_IO_H_
+#define __ASSEMBLER__
+#include "avr/iom644.h"
+
+static void init(struct avr_t * avr);
+static void reset(struct avr_t * avr);
+
+
+static struct mcu_t {
+       avr_t core;
+       avr_eeprom_t    eeprom;
+       avr_ioport_t    porta, portb, portc, portd;
+       avr_uart_t              uart0,uart1;
+       avr_timer8_t    timer0,timer2;
+} mcu = {
+       .core = {
+               .mmcu = "atmega644",
+               DEFAULT_CORE(4),
+
+               .init = init,
+               .reset = reset,
+       },
+       .eeprom = {
+               .size = E2END+1,
+               .r_eearh = EEARH,
+               .r_eearl = EEARL,
+               .r_eedr = EEDR,
+               .r_eecr = EECR,
+               .eepm = { AVR_IO_REGBIT(EECR, EEPM0), AVR_IO_REGBIT(EECR, EEPM1) },
+               .eempe = AVR_IO_REGBIT(EECR, EEMPE),
+               .eepe = AVR_IO_REGBIT(EECR, EEPE),
+               .eere = AVR_IO_REGBIT(EECR, EERE),
+               .ready = {
+                       .enable = AVR_IO_REGBIT(EECR, EERIE),
+                       .vector = EE_READY_vect,
+               },
+       },
+       .porta = {
+               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE0),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF0),
+                       .vector = PCINT0_vect,
+               },
+               .r_pcint = PCMSK0,
+       },
+       .portb = {
+               .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE1),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF1),
+                       .vector = PCINT1_vect,
+               },
+               .r_pcint = PCMSK1,
+       },
+       .portc = {
+               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE2),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF2),
+                       .vector = PCINT2_vect,
+               },
+               .r_pcint = PCMSK2,
+       },
+       .portd = {
+               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE3),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF3),
+                       .vector = PCINT3_vect,
+               },
+               .r_pcint = PCMSK3,
+       },
+
+       .uart0 = {
+               .disabled = AVR_IO_REGBIT(PRR,PRUSART0),
+               .name = '0',
+               .r_udr = UDR0,
+               .udre = AVR_IO_REGBIT(UCSR0A, UDRE0),
+
+               .r_ucsra = UCSR0A,
+               .r_ucsrb = UCSR0B,
+               .r_ucsrc = UCSR0C,
+               .r_ubrrl = UBRR0L,
+               .r_ubrrh = UBRR0H,
+               .rxc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, RXCIE0),
+                       .vector = USART0_RX_vect,
+               },
+               .txc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, TXCIE0),
+                       .vector = USART0_TX_vect,
+               },
+               .udrc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, UDRIE0),
+                       .vector = USART0_UDRE_vect,
+               },
+       },
+       .uart1 = {
+               .disabled = AVR_IO_REGBIT(PRR,PRUSART1),
+               .name = '1',
+               .r_udr = UDR1,
+               .udre = AVR_IO_REGBIT(UCSR1A, UDRE1),
+
+               .r_ucsra = UCSR1A,
+               .r_ucsrb = UCSR1B,
+               .r_ucsrc = UCSR1C,
+               .r_ubrrl = UBRR1L,
+               .r_ubrrh = UBRR1H,
+               .rxc = {
+                       .enable = AVR_IO_REGBIT(UCSR1B, RXCIE1),
+                       .vector = USART1_RX_vect,
+               },
+               .txc = {
+                       .enable = AVR_IO_REGBIT(UCSR1B, TXCIE1),
+                       .vector = USART1_TX_vect,
+               },
+               .udrc = {
+                       .enable = AVR_IO_REGBIT(UCSR1B, UDRIE1),
+                       .vector = USART1_UDRE_vect,
+               },
+       },
+
+       .timer0 = {
+               .name = '0',
+               .wgm = { AVR_IO_REGBIT(TCCR0A, WGM00), AVR_IO_REGBIT(TCCR0A, WGM01), AVR_IO_REGBIT(TCCR0B, WGM02) },
+               .cs = { AVR_IO_REGBIT(TCCR0B, CS00), AVR_IO_REGBIT(TCCR0B, CS01), AVR_IO_REGBIT(TCCR0B, CS02) },
+               .cs_div = { 0, 0, 3 /* 8 */, 6 /* 64 */, 8 /* 256 */, 10 /* 1024 */ },
+
+               .r_ocra = OCR0A,
+               .r_ocrb = OCR0B,
+               .r_tcnt = TCNT0,
+
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, TOIE0),
+                       .raised = AVR_IO_REGBIT(TIFR0, TOV0),
+                       .vector = TIMER0_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, OCIE0A),
+                       .raised = AVR_IO_REGBIT(TIFR0, OCF0A),
+                       .vector = TIMER0_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, OCIE0B),
+                       .raised = AVR_IO_REGBIT(TIFR0, OCF0B),
+                       .vector = TIMER0_COMPB_vect,
+               },
+       },
+       .timer2 = {
+               .name = '2',
+               .wgm = { AVR_IO_REGBIT(TCCR2A, WGM20), AVR_IO_REGBIT(TCCR2A, WGM21), AVR_IO_REGBIT(TCCR2B, WGM22) },
+               .cs = { AVR_IO_REGBIT(TCCR2B, CS20), AVR_IO_REGBIT(TCCR2B, CS21), AVR_IO_REGBIT(TCCR2B, CS22) },
+               .cs_div = { 0, 0, 3 /* 8 */, 5 /* 32 */, 6 /* 64 */, 7 /* 128 */, 8 /* 256 */, 10 /* 1024 */ },
+
+               .r_ocra = OCR2A,
+               .r_ocrb = OCR2B,
+               .r_tcnt = TCNT2,
+               
+               // asynchronous timer source bit.. if set, use 32khz frequency
+               .as2 = AVR_IO_REGBIT(ASSR, AS2),
+               
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, TOIE2),
+                       .raised = AVR_IO_REGBIT(TIFR2, TOV2),
+                       .vector = TIMER2_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, OCIE2A),
+                       .raised = AVR_IO_REGBIT(TIFR2, OCF2A),
+                       .vector = TIMER2_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, OCIE2B),
+                       .raised = AVR_IO_REGBIT(TIFR2, OCF2B),
+                       .vector = TIMER2_COMPB_vect,
+               },
+       },
+};
+
+static avr_t * make()
+{
+       return &mcu.core;
+}
+
+avr_kind_t mega644 = {
+       .names = { "atmega644", "atmega644p" },
+       .make = make
+};
+
+static void init(struct avr_t * avr)
+{
+       struct mcu_t * mcu = (struct mcu_t*)avr;
+
+       printf("%s init\n", avr->mmcu);
+       
+       avr_eeprom_init(avr, &mcu->eeprom);
+       avr_ioport_init(avr, &mcu->porta);
+       avr_ioport_init(avr, &mcu->portb);
+       avr_ioport_init(avr, &mcu->portc);
+       avr_ioport_init(avr, &mcu->portd);
+       avr_uart_init(avr, &mcu->uart0);
+       avr_uart_init(avr, &mcu->uart1);
+       avr_timer8_init(avr, &mcu->timer0);
+       avr_timer8_init(avr, &mcu->timer2);
+}
+
+static void reset(struct avr_t * avr)
+{
+//     struct mcu_t * mcu = (struct mcu_t*)avr;
+}
diff --git a/simavr/cores/sim_mega88.c b/simavr/cores/sim_mega88.c
new file mode 100644 (file)
index 0000000..c5e43cb
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+       sim_mega88.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "simavr.h"
+
+#define SIM_VECTOR_SIZE        2
+#define SIM_MMCU               "atmega88"
+#define SIM_CORENAME   mcu_mega88
+
+#define _AVR_IO_H_
+#define __ASSEMBLER__
+#include "avr/iom88.h"
+// instanciate the new core
+#include "sim_megax8.h"
+
+static avr_t * make()
+{
+       return &SIM_CORENAME.core;
+}
+
+avr_kind_t mega88 = {
+       .names = { "atmega88", "atmega88p","atmega88pa" },
+       .make = make
+};
+
diff --git a/simavr/cores/sim_megax8.c b/simavr/cores/sim_megax8.c
new file mode 100644 (file)
index 0000000..44bf334
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+       sim_megax8.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stdio.h>
+#include "simavr.h"
+
+#include "sim_megax8.h"
+
+void mx8_init(struct avr_t * avr)
+{
+       struct mcu_t * mcu = (struct mcu_t*)avr;
+
+       printf("%s init\n", avr->mmcu);
+
+       avr_eeprom_init(avr, &mcu->eeprom);
+       avr_ioport_init(avr, &mcu->portb);
+       avr_ioport_init(avr, &mcu->portc);
+       avr_ioport_init(avr, &mcu->portd);
+       avr_uart_init(avr, &mcu->uart);
+       avr_timer8_init(avr, &mcu->timer0);
+       avr_timer8_init(avr, &mcu->timer2);
+       avr_spi_init(avr, &mcu->spi);
+}
+
+void mx8_reset(struct avr_t * avr)
+{
+//     struct mcu_t * mcu = (struct mcu_t*)avr;
+}
diff --git a/simavr/cores/sim_megax8.h b/simavr/cores/sim_megax8.h
new file mode 100644 (file)
index 0000000..cbe6de2
--- /dev/null
@@ -0,0 +1,209 @@
+/*
+       sim_megax8.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __SIM_MEGAX8_H__
+#define __SIM_MEGAX8_H__
+
+#include "sim_core_declare.h"
+#include "avr_eeprom.h"
+#include "avr_ioport.h"
+#include "avr_uart.h"
+#include "avr_timer8.h"
+#include "avr_spi.h"
+
+void mx8_init(struct avr_t * avr);
+void mx8_reset(struct avr_t * avr);
+
+/*
+ * This is a template for all of the x8 devices, hopefuly
+ */
+struct mcu_t {
+       avr_t core;
+       avr_eeprom_t    eeprom;
+       avr_ioport_t    portb,portc,portd;
+       avr_uart_t              uart;
+       avr_timer8_t    timer0,timer2;
+       avr_spi_t               spi;
+};
+
+#ifdef SIM_CORENAME
+
+#ifndef SIM_VECTOR_SIZE
+#error SIM_VECTOR_SIZE is not declared
+#endif
+#ifndef SIM_MMCU
+#error SIM_MMCU is not declared
+#endif
+
+struct mcu_t SIM_CORENAME = {
+       .core = {
+               .mmcu = SIM_MMCU,
+               DEFAULT_CORE(SIM_VECTOR_SIZE),
+
+               .init = mx8_init,
+               .reset = mx8_reset,
+       },
+       .eeprom = {
+               .size = E2END+1,
+               .r_eearh = EEARH,
+               .r_eearl = EEARL,
+               .r_eedr = EEDR,
+               .r_eecr = EECR,
+               .eepm = { AVR_IO_REGBIT(EECR, EEPM0), AVR_IO_REGBIT(EECR, EEPM1) },
+               .eempe = AVR_IO_REGBIT(EECR, EEMPE),
+               .eepe = AVR_IO_REGBIT(EECR, EEPE),
+               .eere = AVR_IO_REGBIT(EECR, EERE),
+               .ready = {
+                       .enable = AVR_IO_REGBIT(EECR, EERIE),
+                       .vector = EE_READY_vect,
+               },
+       },
+       .portb = {
+               .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE0),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF0),
+                       .vector = PCINT0_vect,
+               },
+               .r_pcint = PCMSK0,
+       },
+       .portc = {
+               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE1),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF1),
+                       .vector = PCINT1_vect,
+               },
+               .r_pcint = PCMSK1,
+       },
+       .portd = {
+               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(PCICR, PCIE2),
+                       .raised = AVR_IO_REGBIT(PCIFR, PCIF2),
+                       .vector = PCINT2_vect,
+               },
+               .r_pcint = PCMSK2,
+       },
+
+       .uart = {
+               .disabled = AVR_IO_REGBIT(PRR,PRUSART0),
+               .name = '0',
+               .r_udr = UDR0,
+               .udre = AVR_IO_REGBIT(UCSR0A, UDRE0),
+
+               .r_ucsra = UCSR0A,
+               .r_ucsrb = UCSR0B,
+               .r_ucsrc = UCSR0C,
+               .r_ubrrl = UBRR0L,
+               .r_ubrrh = UBRR0H,
+               .rxc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, RXCIE0),
+                       .vector = USART_RX_vect,
+               },
+               .txc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, TXCIE0),
+                       .vector = USART_TX_vect,
+               },
+               .udrc = {
+                       .enable = AVR_IO_REGBIT(UCSR0B, UDRIE0),
+                       .vector = USART_UDRE_vect,
+               },
+       },
+
+       .timer0 = {
+               .name = '0',
+               .disabled = AVR_IO_REGBIT(PRR,PRTIM0),
+               .wgm = { AVR_IO_REGBIT(TCCR0A, WGM00), AVR_IO_REGBIT(TCCR0A, WGM01), AVR_IO_REGBIT(TCCR0B, WGM02) },
+               .cs = { AVR_IO_REGBIT(TCCR0B, CS00), AVR_IO_REGBIT(TCCR0B, CS01), AVR_IO_REGBIT(TCCR0B, CS02) },
+               .cs_div = { 0, 0, 3 /* 8 */, 6 /* 64 */, 8 /* 256 */, 10 /* 1024 */ },
+
+               .r_ocra = OCR0A,
+               .r_ocrb = OCR0B,
+               .r_tcnt = TCNT0,
+
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, TOIE0),
+                       .raised = AVR_IO_REGBIT(TIFR0, TOV0),
+                       .vector = TIMER0_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, OCIE0A),
+                       .raised = AVR_IO_REGBIT(TIFR0, OCF0A),
+                       .vector = TIMER0_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK0, OCIE0B),
+                       .raised = AVR_IO_REGBIT(TIFR0, OCF0B),
+                       .vector = TIMER0_COMPB_vect,
+               },
+       },
+       .timer2 = {
+               .name = '2',
+               .disabled = AVR_IO_REGBIT(PRR,PRTIM2),
+               .wgm = { AVR_IO_REGBIT(TCCR2A, WGM20), AVR_IO_REGBIT(TCCR2A, WGM21), AVR_IO_REGBIT(TCCR2B, WGM22) },
+               .cs = { AVR_IO_REGBIT(TCCR2B, CS20), AVR_IO_REGBIT(TCCR2B, CS21), AVR_IO_REGBIT(TCCR2B, CS22) },
+               .cs_div = { 0, 0, 3 /* 8 */, 5 /* 32 */, 6 /* 64 */, 7 /* 128 */, 8 /* 256 */, 10 /* 1024 */ },
+
+               .r_ocra = OCR2A,
+               .r_ocrb = OCR2B,
+               .r_tcnt = TCNT2,
+               
+               // asynchronous timer source bit.. if set, use 32khz frequency
+               .as2 = AVR_IO_REGBIT(ASSR, AS2),
+               
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, TOIE2),
+                       .raised = AVR_IO_REGBIT(TIFR2, TOV2),
+                       .vector = TIMER2_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, OCIE2A),
+                       .raised = AVR_IO_REGBIT(TIFR2, OCF2A),
+                       .vector = TIMER2_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK2, OCIE2B),
+                       .raised = AVR_IO_REGBIT(TIFR2, OCF2B),
+                       .vector = TIMER2_COMPB_vect,
+               },
+       },
+       
+       .spi = {
+               .disabled = AVR_IO_REGBIT(PRR,PRSPI),
+               .spe = AVR_IO_REGBIT(SPCR, SPE),
+               .dord = AVR_IO_REGBIT(SPCR, DORD),
+               .mstr = AVR_IO_REGBIT(SPCR, MSTR),
+               .cpol = AVR_IO_REGBIT(SPCR, CPOL),
+               .cpha = AVR_IO_REGBIT(SPCR, CPHA),
+
+               .spr = { AVR_IO_REGBIT(SPCR, SPR0), AVR_IO_REGBIT(SPCR, SPR1), AVR_IO_REGBIT(SPSR, SPI2X) },
+               .spi = {
+                       .enable = AVR_IO_REGBIT(SPCR, SPIE),
+                       .raised = AVR_IO_REGBIT(SPSR, SPIF),
+                       .vector = SPI_STC_vect,
+               },
+       },
+};
+#endif /* SIM_CORENAME */
+
+#endif /* __SIM_MEGAX8_H__ */
\ No newline at end of file
diff --git a/simavr/cores/sim_tiny85.c b/simavr/cores/sim_tiny85.c
new file mode 100644 (file)
index 0000000..850005c
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+       sim_tiny85.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include </usr/include/stdio.h>
+#include "simavr.h"
+#include "sim_core_declare.h"
+#include "avr_eeprom.h"
+#include "avr_ioport.h"
+#include "avr_timer8.h"
+
+#define _AVR_IO_H_
+#define __ASSEMBLER__
+#include "avr/iotn85.h"
+
+static void init(struct avr_t * avr);
+static void reset(struct avr_t * avr);
+
+
+static struct mcu_t {
+       avr_t core;
+       avr_eeprom_t    eeprom;
+       avr_ioport_t    portb;
+       avr_timer8_t    timer0, timer1;
+} mcu = {
+       .core = {
+               .mmcu = "attiny85",
+               DEFAULT_CORE(2),
+
+               .init = init,
+               .reset = reset,
+       },
+       .eeprom = {
+               .size = E2END+1,
+               .r_eearh = EEARH,
+               .r_eearl = EEARL,
+               .r_eedr = EEDR,
+               .r_eecr = EECR,
+               .eepm = { AVR_IO_REGBIT(EECR, EEPM0), AVR_IO_REGBIT(EECR, EEPM1) },
+               .eempe = AVR_IO_REGBIT(EECR, EEMPE),
+               .eepe = AVR_IO_REGBIT(EECR, EEPE),
+               .eere = AVR_IO_REGBIT(EECR, EERE),
+               .ready = {
+                       .enable = AVR_IO_REGBIT(EECR, EERIE),
+                       .vector = EE_RDY_vect,// EE_READY_vect,
+               },
+       },
+       .portb = {
+               .name = 'B',  .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
+               .pcint = {
+                       .enable = AVR_IO_REGBIT(GIMSK, PCIE),
+                       .raised = AVR_IO_REGBIT(GIFR, PCIF),
+                       .vector = PCINT0_vect,
+               },
+               .r_pcint = PCMSK,
+       },
+       .timer0 = {
+               .name = '0',
+               .wgm = { AVR_IO_REGBIT(TCCR0A, WGM00), AVR_IO_REGBIT(TCCR0A, WGM01), AVR_IO_REGBIT(TCCR0B, WGM02) },
+               .cs = { AVR_IO_REGBIT(TCCR0B, CS00), AVR_IO_REGBIT(TCCR0B, CS01), AVR_IO_REGBIT(TCCR0B, CS02) },
+               .cs_div = { 0, 0, 3 /* 8 */, 6 /* 64 */, 8 /* 256 */, 10 /* 1024 */ },
+
+               .r_ocra = OCR0A,
+               .r_ocrb = OCR0B,
+               .r_tcnt = TCNT0,
+
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK, TOIE0),
+                       .raised = AVR_IO_REGBIT(TIFR, TOV0),
+                       .vector = TIMER0_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK, OCIE0A),
+                       .raised = AVR_IO_REGBIT(TIFR, OCF0A),
+                       .vector = TIMER0_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK, OCIE0B),
+                       .raised = AVR_IO_REGBIT(TIFR, OCF0B),
+                       .vector = TIMER0_COMPB_vect,
+               },
+       },
+       .timer1 = {
+               .name = '1',
+               // no wgm bits
+               .cs = { AVR_IO_REGBIT(TCCR1, CS10), AVR_IO_REGBIT(TCCR1, CS11), AVR_IO_REGBIT(TCCR1, CS12), AVR_IO_REGBIT(TCCR1, CS13) },
+               .cs_div = { 0, 0, 1 /* 2 */, 2 /* 4 */, 3 /* 8 */, 4 /* 16 */ },
+
+               .r_ocra = OCR1A,
+               .r_ocrb = OCR1B,
+               .r_ocrc = OCR1C,
+               .r_tcnt = TCNT1,
+
+               .overflow = {
+                       .enable = AVR_IO_REGBIT(TIMSK, TOIE1),
+                       .raised = AVR_IO_REGBIT(TIFR, TOV1),
+                       .vector = TIMER1_OVF_vect,
+               },
+               .compa = {
+                       .enable = AVR_IO_REGBIT(TIMSK, OCIE1A),
+                       .raised = AVR_IO_REGBIT(TIFR, OCF1A),
+                       .vector = TIMER1_COMPA_vect,
+               },
+               .compb = {
+                       .enable = AVR_IO_REGBIT(TIMSK, OCIE1B),
+                       .raised = AVR_IO_REGBIT(TIFR, OCF1B),
+                       .vector = TIMER1_COMPB_vect,
+               },
+       },
+
+
+};
+
+static avr_t * make()
+{
+       return &mcu.core;
+}
+
+avr_kind_t tiny85 = {
+       .make = make
+};
+
+static void init(struct avr_t * avr)
+{
+       struct mcu_t * mcu = (struct mcu_t*)avr;
+       
+       printf("%s init\n", avr->mmcu);
+       
+       avr_eeprom_init(avr, &mcu->eeprom);
+       avr_ioport_init(avr, &mcu->portb);
+       avr_timer8_init(avr, &mcu->timer0);
+       avr_timer8_init(avr, &mcu->timer1);
+}
+
+static void reset(struct avr_t * avr)
+{
+//     struct mcu_t * mcu = (struct mcu_t*)avr;
+}
diff --git a/simavr/sim/avr_eeprom.c b/simavr/sim/avr_eeprom.c
new file mode 100644 (file)
index 0000000..f7a2d60
--- /dev/null
@@ -0,0 +1,121 @@
+/*
+       avr_eeprom.c
+
+       IO module that simulates the AVR EEProm
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "avr_eeprom.h"
+
+static void avr_eeprom_run(avr_t * avr, avr_io_t * port)
+{
+       avr_eeprom_t * p = (avr_eeprom_t *)port;
+       //printf("%s\n", __FUNCTION__);
+       if (p->eempe_clear_timer) {
+               p->eempe_clear_timer--;
+               if (p->eempe_clear_timer == 0) {
+                       avr_regbit_clear(avr, p->eempe);
+               }
+       }
+       if (p->ready_raise_timer) {
+               p->ready_raise_timer--;
+               if (p->ready_raise_timer == 0) {
+                       avr_raise_interupt(avr, &p->ready);
+               }
+       }
+}
+
+static void avr_eeprom_write(struct avr_t * avr, uint8_t addr, uint8_t v, void * param)
+{
+       avr_eeprom_t * p = (avr_eeprom_t *)param;
+       uint8_t eempe = avr_regbit_get(avr, p->eempe);
+
+       avr_core_watch_write(avr, addr, v);
+
+       if (!eempe && avr_regbit_get(avr, p->eempe)) {
+               p->eempe_clear_timer = 4;       // auto clear, later
+       }
+       
+       if (eempe && avr_regbit_get(avr, p->eepe)) {    // write operation
+               uint16_t addr = avr->data[p->r_eearl] | (avr->data[p->r_eearh] << 8);
+               printf("eeprom write %04x <- %02x\n", addr, avr->data[p->r_eedr]);
+               p->eeprom[addr] = avr->data[p->r_eedr]; 
+               // automaticaly clears that bit (?)
+               p->eempe_clear_timer = 0;
+               avr_regbit_clear(avr, p->eempe);
+
+               p->ready_raise_timer = 1024; // make a avr_milliseconds_to_cycle(...) 3.4ms here
+       }
+       if (avr_regbit_get(avr, p->eere)) {     // read operation
+               uint16_t addr = avr->data[p->r_eearl] | (avr->data[p->r_eearh] << 8);
+               avr->data[p->r_eedr] = p->eeprom[addr];
+               printf("eeprom read %04x : %02x\n", addr, p->eeprom[addr]);
+       }
+
+       // autocleared
+       avr_regbit_clear(avr, p->eepe);
+       avr_regbit_clear(avr, p->eere);
+}
+
+static int avr_eeprom_ioctl(avr_t * avr, avr_io_t * port, uint32_t ctl, void * io_param)
+{
+       avr_eeprom_t * p = (avr_eeprom_t *)port;
+       int res = -1;
+
+       switch(ctl) {
+               case AVR_IOCTL_EEPROM_SET: {
+                       avr_eeprom_desc_t * desc = (avr_eeprom_desc_t*)io_param;
+                       if (!desc || !desc->size || !desc->ee || (desc->offset + desc->size) >= p->size) {
+                               printf("%s: AVR_IOCTL_EEPROM_SET Invalid argument\n",
+                                               __FUNCTION__);
+                               return -2;
+                       }
+                       memcpy(p->eeprom + desc->offset, desc->ee, desc->size);
+                       printf("%s: AVR_IOCTL_EEPROM_SET Loaded %d at offset %d\n",
+                                       __FUNCTION__, desc->size, desc->offset);
+               }       break;
+       }
+       
+       return res;
+}
+
+static avr_io_t        _io = {
+       .kind = "eeprom",
+       .run = avr_eeprom_run,
+       .ioctl = avr_eeprom_ioctl,
+};
+
+void avr_eeprom_init(avr_t * avr, avr_eeprom_t * p)
+{
+       p->io = _io;
+       printf("%s init (%d bytes) EEL/H:%02x/%02x EED=%02x EEC=%02x\n",
+                       __FUNCTION__, p->size, p->r_eearl, p->r_eearh, p->r_eedr, p->r_eecr);
+
+       p->eeprom = malloc(p->size);
+       memset(p->eeprom, 0xff, p->size);
+       
+       avr_register_io(avr, &p->io);
+       avr_register_vector(avr, &p->ready);
+
+       avr_register_io_write(avr, p->r_eecr, avr_eeprom_write, p);
+}
+
diff --git a/simavr/sim/avr_eeprom.h b/simavr/sim/avr_eeprom.h
new file mode 100644 (file)
index 0000000..37585bf
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+       avr_eeprom.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AVR_EEPROM_H__
+#define __AVR_EEPROM_H__
+
+#include "simavr.h"
+
+typedef struct avr_eeprom_t {
+       avr_io_t        io;
+
+       uint8_t *       eeprom; // actual bytes
+       uint16_t        size;   // size for this MCU
+       
+       uint8_t r_eearh;
+       uint8_t r_eearl;
+       uint8_t r_eedr;
+
+       // eepm -- eeprom write mode
+       uint8_t r_eecr; // shortcut, assumes these bits fit in that register
+       avr_regbit_t    eepm[4];
+       avr_regbit_t    eempe;  // eeprom master program enable
+       avr_regbit_t    eepe;   // eeprom program enable
+       avr_regbit_t    eere;   // eeprom read enable
+       
+       avr_int_vector_t ready; // EERIE vector
+
+       uint32_t                eempe_clear_timer;
+       uint32_t                ready_raise_timer;
+} avr_eeprom_t;
+
+void avr_eeprom_init(avr_t * avr, avr_eeprom_t * port);
+
+typedef struct avr_eeprom_desc_t {
+       uint8_t *       ee;
+       uint16_t        offset;
+       uint32_t        size;
+} avr_eeprom_desc_t;
+
+#define AVR_IOCTL_EEPROM_GET   AVR_IOCTL_DEF('e','e','g','p')
+#define AVR_IOCTL_EEPROM_SET   AVR_IOCTL_DEF('e','e','s','p')
+
+#endif /* __AVR_EEPROM_H__ */
diff --git a/simavr/sim/avr_ioport.c b/simavr/sim/avr_ioport.c
new file mode 100644 (file)
index 0000000..157a624
--- /dev/null
@@ -0,0 +1,102 @@
+/*
+       avr_ioport.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include "avr_ioport.h"
+
+static void avr_ioport_run(avr_t * avr, avr_io_t * port)
+{
+       //printf("%s\n", __FUNCTION__);
+}
+
+static uint8_t avr_ioport_read(struct avr_t * avr, uint8_t addr, void * param)
+{
+       avr_ioport_t * p = (avr_ioport_t *)param;
+       uint8_t v = avr->data[addr];
+
+       if (addr == p->r_pin) {
+               uint8_t v = avr->data[p->r_port];
+               avr->data[addr] = v;
+               // made to trigger potential watchpoints
+               v = avr_core_watch_read(avr, addr);
+//             printf("** PIN%c(%02x) = %02x\n", p->name, addr, v);
+       }
+       return v;
+}
+
+static void avr_ioport_write(struct avr_t * avr, uint8_t addr, uint8_t v, void * param)
+{
+       avr_ioport_t * p = (avr_ioport_t *)param;
+       uint8_t oldv = avr->data[addr];
+
+       if (addr == p->r_port) {
+       //      printf("PORT%c(%02x) = %02x (was %02x)\n", p->name, addr, v, oldv);
+
+               avr_core_watch_write(avr, addr, v);
+               if (v != oldv) {
+                       int raise = 1;
+                       int mask = v ^ oldv;
+                       if (p->r_pcint)
+                               raise = avr->data[p->r_pcint] & mask;
+                       if (raise)
+                               avr_raise_interupt(avr, &p->pcint);
+               }
+
+
+               if (p->name == 'D') {
+                       static int cs = -1;
+                       if ((oldv & 0xf0) != (v & 0xf0)) {
+                               for (int i = 0; i < 4; i++) {
+                                       
+                               }
+                       } 
+                       {
+                       }
+               }
+       }
+}
+
+static void avr_ioport_reset(avr_t * avr, avr_io_t * port)
+{
+}
+
+static avr_io_t        _io = {
+       .kind = "io",
+       .run = avr_ioport_run,
+       .reset = avr_ioport_reset,
+};
+
+void avr_ioport_init(avr_t * avr, avr_ioport_t * port)
+{
+       port->io = _io;
+       printf("%s PIN%c 0x%02x DDR%c 0x%02x PORT%c 0x%02x\n",
+               __FUNCTION__,
+               port->name, port->r_pin,
+               port->name, port->r_ddr,
+               port->name, port->r_port);
+
+       avr_register_io(avr, &port->io);
+       avr_register_vector(avr, &port->pcint);
+
+       avr_register_io_write(avr, port->r_port, avr_ioport_write, port);
+       avr_register_io_read(avr, port->r_pin, avr_ioport_read, port);
+}
+
diff --git a/simavr/sim/avr_ioport.h b/simavr/sim/avr_ioport.h
new file mode 100644 (file)
index 0000000..9f38995
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+       avr_ioport.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AVR_IOPORT_H__
+#define __AVR_IOPORT_H__
+
+#include "simavr.h"
+
+typedef struct avr_ioport_t {
+       avr_io_t        io;
+       char name;
+       uint8_t r_port;
+       uint8_t r_ddr;
+       uint8_t r_pin;
+
+       avr_int_vector_t pcint; // PCINT vector
+       uint8_t r_pcint;                // pcint 8 pins mask
+       
+} avr_ioport_t;
+
+void avr_ioport_init(avr_t * avr, avr_ioport_t * port);
+
+#endif /* __AVR_IOPORT_H__ */
diff --git a/simavr/sim/avr_spi.c b/simavr/sim/avr_spi.c
new file mode 100644 (file)
index 0000000..b373e8e
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+       avr_spi.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include "avr_spi.h"
+
+static void avr_spi_run(avr_t * avr, avr_io_t * port)
+{
+//     printf("%s\n", __FUNCTION__);
+}
+
+#if 0
+static uint8_t avr_spi_read(struct avr_t * avr, uint8_t addr, void * param)
+{
+       avr_spi_t * p = (avr_spi_t *)param;
+       uint8_t v = avr->data[addr];
+//     printf("** PIN%c = %02x\n", p->name, v);
+       return v;
+}
+
+static void avr_spi_write(struct avr_t * avr, uint8_t addr, uint8_t v, void * param)
+{
+       avr_spi_t * p = (avr_spi_t *)param;
+
+       if (addr == p->r_udr) {
+       //      printf("UDR%c(%02x) = %02x\n", p->name, addr, v);
+               avr_core_watch_write(avr, addr, v);
+               avr_regbit_set(avr, p->udre);
+
+               static char buf[128];
+               static int l = 0;
+               buf[l++] = v <= ' ' ? '.' : v;
+               buf[l] = 0;
+               if (v == '\n' || l == 127) {
+                       l = 0;
+                       printf("\e[32m%s\e[0m\n", buf);
+               }
+       }
+}
+#endif
+
+void avr_spi_reset(avr_t * avr, struct avr_io_t *io)
+{
+//     avr_spi_t * p = (avr_spi_t *)io;
+//     avr_regbit_set(avr, p->udre);
+}
+
+static avr_io_t        _io = {
+       .kind = "spi",
+       .run = avr_spi_run,
+       .reset = avr_spi_reset,
+};
+
+void avr_spi_init(avr_t * avr, avr_spi_t * p)
+{
+       p->io = _io;
+       avr_register_io(avr, &p->io);
+
+       printf("%s SPI%c init\n", __FUNCTION__, p->name);
+
+//     avr_register_io_write(avr, p->r_udr, avr_spi_write, p);
+//     avr_register_io_read(avr, p->r_udr, avr_spi_read, p);
+}
+
diff --git a/simavr/sim/avr_spi.h b/simavr/sim/avr_spi.h
new file mode 100644 (file)
index 0000000..0cae169
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+       avr_spi.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AVR_SPI_H_
+#define AVR_SPI_H_
+
+#include "simavr.h"
+
+typedef struct avr_spi_t {
+       avr_io_t        io;
+       char name;
+       avr_regbit_t    disabled;       // bit in the PRR
+
+       uint8_t r_spdr;                 // data register
+       uint8_t r_spcr;                 // control register
+       
+       avr_regbit_t spe;               // spi enable
+       avr_regbit_t dord;              // data order
+       avr_regbit_t mstr;              // master/slave
+       avr_regbit_t cpol;              // clock polarity
+       avr_regbit_t cpha;              // phase
+       avr_regbit_t spr[4];    // clock divider
+       
+       avr_int_vector_t spi;   // spi interupt
+} avr_spi_t;
+
+void avr_spi_init(avr_t * avr, avr_spi_t * port);
+
+#endif /* AVR_SPI_H_ */
diff --git a/simavr/sim/avr_timer8.c b/simavr/sim/avr_timer8.c
new file mode 100644 (file)
index 0000000..93bcb9c
--- /dev/null
@@ -0,0 +1,118 @@
+/*
+       avr_timer8.c
+
+       Handles the just one mode of the 8 bit AVR timer.
+       Still need to handle all the others!
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include "avr_timer8.h"
+
+static void avr_timer8_run(avr_t * avr, avr_io_t * port)
+{
+       avr_timer8_t * p = (avr_timer8_t *)port;
+       //printf("%s\n", __FUNCTION__);
+
+       if (p->compa_cycles) {
+               if (p->compa_next == 0) {
+                       p->compa_next = avr->cycle + p->compa_cycles;
+               }
+               if (avr->cycle >= p->compa_next) {
+               //      printf("timer a firea %d\n", p->compa_next);
+                       fflush(stdout);
+                       p->compa_next += p->compa_cycles;                                               
+                       avr_raise_interupt(avr, &p->compa);
+               } 
+       }
+}
+
+#if 0
+static uint8_t avr_timer8_read(struct avr_t * avr, uint8_t addr, void * param)
+{
+       avr_timer8_t * p = (avr_timer8_t *)param;
+       uint8_t v = avr->data[addr];
+
+       if (addr == p->r_pin) {
+               uint8_t v = avr->data[p->r_port];
+               avr->data[addr] = v;
+               // made to trigger potential watchpoints
+               v = avr_core_watch_read(avr, addr);
+               printf("** PIN%c(%02x) = %02x\n", p->name, addr, v);
+       }
+       return v;
+}
+#endif
+
+static void avr_timer8_write(struct avr_t * avr, uint8_t addr, uint8_t v, void * param)
+{
+       avr_timer8_t * p = (avr_timer8_t *)param;
+//     uint8_t oldv = avr->data[addr];
+
+       p->compa_cycles = 0;
+       p->compa_next = 0;
+
+       avr_core_watch_write(avr, addr, v);
+       long clock = avr->frequency;
+       if (avr_regbit_get(avr, p->as2))
+               clock = 32768;
+       uint8_t cs = avr_regbit_get_array(avr, p->cs, ARRAY_SIZE(p->cs));
+       if (cs == 0) {
+               printf("%s-%c clock turned off\n", __FUNCTION__, p->name);              
+       }
+       uint8_t mode = avr_regbit_get_array(avr, p->wgm, ARRAY_SIZE(p->wgm));
+       uint8_t cs_div = p->cs_div[cs];
+       uint16_t ocra = avr->data[p->r_ocra];
+       uint16_t ocrb = avr->data[p->r_ocrb];
+       long f = clock >> cs_div;
+       long fa = f / 2 / (ocra+1), fb = f / 2 / (ocrb+1);
+
+       printf("%s-%c clock f=%ld cs=%02x (div %d) = %ldhz\n", __FUNCTION__, p->name, clock, cs, 1 << cs_div, f);
+       printf("%s-%c wgm %d OCRA=%3d = %ldhz\n", __FUNCTION__, p->name, mode, ocra, fa);
+       printf("%s-%c wgm %d OCRB=%3d = %ldhz\n", __FUNCTION__, p->name, mode, ocrb, fb);       
+
+       long cocra = ocra ? avr->frequency / fa : 0;
+       p->compa_cycles = cocra;
+       printf("%s-%c A %ld/%ld = cycles = %ld\n", __FUNCTION__, p->name, (long)avr->frequency, fa, cocra);
+       
+}
+
+static void avr_timer8_reset(avr_t * avr, avr_io_t * port)
+{
+}
+
+static avr_io_t        _io = {
+       .kind = "timer8",
+       .run = avr_timer8_run,
+       .reset = avr_timer8_reset,
+};
+
+void avr_timer8_init(avr_t * avr, avr_timer8_t * p)
+{
+       p->io = _io;
+       printf("%s timer%c created\n", __FUNCTION__, p->name);
+
+       avr_register_io(avr, &p->io);
+//     avr_register_vector(avr, &port->pcint);
+
+       avr_register_io_write(avr, p->cs[0].reg, avr_timer8_write, p);
+       avr_register_io_write(avr, p->r_ocra, avr_timer8_write, p);
+       avr_register_io_write(avr, p->r_ocrb, avr_timer8_write, p);
+       //avr_register_io_read(avr, port->r_pin, avr_ioport_read, port);
+}
diff --git a/simavr/sim/avr_timer8.h b/simavr/sim/avr_timer8.h
new file mode 100644 (file)
index 0000000..b73a831
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+       avr_timer8.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AVR_TIMER8_H_
+#define AVR_TIMER8_H_
+
+#include "simavr.h"
+
+typedef struct avr_timer8_t {
+       avr_io_t        io;
+       char name;
+       avr_regbit_t    disabled;       // bit in the PRR
+
+       uint8_t                 r_ocra, r_ocrb, r_ocrc, r_tcnt;
+       
+       avr_regbit_t    wgm[4];
+       avr_regbit_t    cs[4];
+       uint8_t                 cs_div[16];
+       avr_regbit_t    as2;            // asynchronous clock 32khz
+
+       avr_int_vector_t compa; // comparator A
+       avr_int_vector_t compb; // comparator A
+       avr_int_vector_t overflow;      // overflow
+
+
+       uint64_t                compa_cycles, compa_next;
+} avr_timer8_t;
+
+void avr_timer8_init(avr_t * avr, avr_timer8_t * port);
+
+#endif /* AVR_TIMER8_H_ */
diff --git a/simavr/sim/avr_uart.c b/simavr/sim/avr_uart.c
new file mode 100644 (file)
index 0000000..06aca7a
--- /dev/null
@@ -0,0 +1,85 @@
+/*
+       avr_uart.c
+
+       Handles UART access
+       Right now just handle "write" to the serial port at any speed
+       and printf to the console when '\n' is written.
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include "avr_uart.h"
+
+static void avr_uart_run(avr_t * avr, avr_io_t * port)
+{
+//     printf("%s\n", __FUNCTION__);
+}
+
+static uint8_t avr_uart_read(struct avr_t * avr, uint8_t addr, void * param)
+{
+//     avr_uart_t * p = (avr_uart_t *)param;
+       uint8_t v = avr->data[addr];
+//     printf("** PIN%c = %02x\n", p->name, v);
+       return v;
+}
+
+static void avr_uart_write(struct avr_t * avr, uint8_t addr, uint8_t v, void * param)
+{
+       avr_uart_t * p = (avr_uart_t *)param;
+
+       if (addr == p->r_udr) {
+       //      printf("UDR%c(%02x) = %02x\n", p->name, addr, v);
+               avr_core_watch_write(avr, addr, v);
+               avr_regbit_set(avr, p->udre);
+
+               static char buf[128];
+               static int l = 0;
+               buf[l++] = v < ' ' ? '.' : v;
+               buf[l] = 0;
+               if (v == '\n' || l == 127) {
+                       l = 0;
+                       printf("\e[32m%s\e[0m\n", buf);
+               }
+       }
+}
+
+void avr_uart_reset(avr_t * avr, struct avr_io_t *io)
+{
+       avr_uart_t * p = (avr_uart_t *)io;
+       avr_regbit_set(avr, p->udre);
+}
+
+static avr_io_t        _io = {
+       .kind = "uart",
+       .run = avr_uart_run,
+       .reset = avr_uart_reset,
+};
+
+void avr_uart_init(avr_t * avr, avr_uart_t * p)
+{
+       p->io = _io;
+       avr_register_io(avr, &p->io);
+
+       printf("%s UART%c UDR=%02x\n", __FUNCTION__, p->name, p->r_udr);
+
+       avr_register_io_write(avr, p->r_udr, avr_uart_write, p);
+       avr_register_io_read(avr, p->r_udr, avr_uart_read, p);
+
+}
+
diff --git a/simavr/sim/avr_uart.h b/simavr/sim/avr_uart.h
new file mode 100644 (file)
index 0000000..7ac6092
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+       avr_uart.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AVR_UART_H_
+#define AVR_UART_H_
+
+#include "simavr.h"
+
+typedef struct avr_uart_t {
+       avr_io_t        io;
+       char name;
+       avr_regbit_t    disabled;       // bit in the PRR
+       
+       uint8_t r_udr;
+       uint8_t r_ucsra;
+       uint8_t r_ucsrb;
+       uint8_t r_ucsrc;
+
+       uint8_t r_ubrrl,r_ubrrh;
+
+       avr_int_vector_t rxc;
+       avr_int_vector_t txc;
+       avr_int_vector_t udrc;
+
+       avr_regbit_t    udre; // AVR_IO_REGBIT(UCSR0A, UDRE0),
+       
+} avr_uart_t;
+
+void avr_uart_init(avr_t * avr, avr_uart_t * port);
+
+#endif /* AVR_UART_H_ */
diff --git a/simavr/sim/sim_core.c b/simavr/sim/sim_core.c
new file mode 100644 (file)
index 0000000..53271e1
--- /dev/null
@@ -0,0 +1,1129 @@
+/*
+       sim_core.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "simavr.h"
+#include "sim_core.h"
+
+// SREG bit names
+const char * _sreg_bit_name = "cznvshti";
+
+/*
+ * Handle "touching" registers, marking them changed.
+ * This is used only for debugging purposes to be able to
+ * print the effects of each instructions on registers
+ */
+#define REG_TOUCH(a, r) (a)->touched[(r) >> 5] |= (1 << ((r) & 0x1f))
+#define REG_ISTOUCHED(a, r) ((a)->touched[(r) >> 5] & (1 << ((r) & 0x1f)))
+
+/*
+ * This allows a "special case" to skip indtruction tracing when in these
+ * symbols. since printf() is useful to have, but generates a lot of cycles
+ */
+int dont_trace(const char * name)
+{
+       return (
+               !strcmp(name, "uart_putchar") ||
+               !strcmp(name, "fputc") ||
+               !strcmp(name, "printf") ||
+               !strcmp(name, "vfprintf") ||
+               !strcmp(name, "__ultoa_invert") ||
+               !strcmp(name, "__prologue_saves__") ||
+               !strcmp(name, "__epilogue_restores__"));
+}
+
+int donttrace = 0;
+
+#define STATE(_f, args...) { \
+       if (avr->trace) {\
+               if (avr->codeline[avr->pc>>1]) {\
+                       const char * symn = avr->codeline[avr->pc>>1]->symbol; \
+                       int dont = 0 && dont_trace(symn);\
+                       if (dont!=donttrace) { \
+                               donttrace = dont;\
+                               DUMP_REG();\
+                       }\
+                       if (donttrace==0)\
+                               printf("%04x: %-25s " _f, avr->pc, symn, ## args);\
+               } else \
+                       printf("%s: %04x: " _f, __FUNCTION__, avr->pc, ## args);\
+               }\
+       }
+#define SREG() if (avr->trace && donttrace == 0) {\
+       printf("%04x: \t\t\t\t\t\t\t\t\tSREG = ", avr->pc); \
+       for (int _sbi = 0; _sbi < 8; _sbi++)\
+               printf("%c", avr->sreg[_sbi] ? toupper(_sreg_bit_name[_sbi]) : '.');\
+       printf("\n");\
+}
+
+/*
+ * Set a register (r < 256)
+ * if it's an IO regisrer (> 31) also (try to) call any callback that was
+ * registered to track changes to that register.
+ */
+static inline void _avr_set_r(avr_t * avr, uint8_t r, uint8_t v)
+{
+       REG_TOUCH(avr, r);
+
+       if (r == R_SREG) {
+               avr->data[r] = v;
+               // unsplit the SREG
+               for (int i = 0; i < 8; i++)
+                       avr->sreg[i] = (avr->data[R_SREG] & (1 << i)) != 0;
+               SREG();
+       }
+       if (r > 31) {
+               uint8_t io = AVR_DATA_TO_IO(r);
+               if (avr->iow[io].w)
+                       avr->iow[io].w(avr, r, v, avr->iow[io].param);
+               else
+                       avr->data[r] = v;
+       } else
+               avr->data[r] = v;
+}
+
+/*
+ * Stack pointer access
+ */
+inline uint16_t _avr_sp_get(avr_t * avr)
+{
+       return avr->data[R_SPL] | (avr->data[R_SPH] << 8);
+}
+
+inline void _avr_sp_set(avr_t * avr, uint16_t sp)
+{
+       _avr_set_r(avr, R_SPL, sp);
+       _avr_set_r(avr, R_SPH, sp >> 8);
+}
+
+/*
+ * Set any address to a value; split between registers and SRAM
+ */
+static inline void _avr_set_ram(avr_t * avr, uint16_t addr, uint8_t v)
+{
+       if (addr < 256)
+               _avr_set_r(avr, addr, v);
+       else
+               avr_core_watch_write(avr, addr, v);
+}
+
+/*
+ * Get a value from SRAM.
+ */
+static inline uint8_t _avr_get_ram(avr_t * avr, uint16_t addr)
+{
+       if (addr > 31 && addr < 256) {
+               uint8_t io = AVR_DATA_TO_IO(addr);
+               if (avr->ior[io].r)
+                       avr->data[addr] = avr->ior[io].r(avr, addr, avr->ior[io].param);
+       }
+       return avr_core_watch_read(avr, addr);
+}
+
+/*
+ * Stack oush accessors. Push/pop 8 and 16 bits
+ */
+static inline void _avr_push8(avr_t * avr, uint16_t v)
+{
+       uint16_t sp = _avr_sp_get(avr);
+       _avr_set_ram(avr, sp, v);
+       _avr_sp_set(avr, sp-1);
+}
+
+static inline uint8_t _avr_pop8(avr_t * avr)
+{
+       uint16_t sp = _avr_sp_get(avr) + 1;
+       uint8_t res = _avr_get_ram(avr, sp);
+       _avr_sp_set(avr, sp);
+       return res;
+}
+
+inline void _avr_push16(avr_t * avr, uint16_t v)
+{
+       _avr_push8(avr, v >> 8);
+       _avr_push8(avr, v);
+}
+
+static inline uint16_t _avr_pop16(avr_t * avr)
+{
+       uint16_t res = _avr_pop8(avr);
+       res |= _avr_pop8(avr) << 8;
+       return res;
+}
+
+/*
+ * "Pretty" register names
+ */
+const char * reg_names[255] = {
+               [R_XH] = "XH", [R_XL] = "XL",
+               [R_YH] = "YH", [R_YL] = "YL",
+               [R_ZH] = "ZH", [R_ZL] = "ZL",
+               [R_SPH] = "SPH", [R_SPL] = "SPL",
+               [R_SREG] = "SREG",
+};
+
+
+const char * avr_regname(uint8_t reg)
+{
+       if (!reg_names[reg]) {
+               char tt[16];
+               if (reg < 32)
+                       sprintf(tt, "r%d", reg);
+               else
+                       sprintf(tt, "io:%02x", reg);
+               reg_names[reg] = strdup(tt);
+       }
+       return reg_names[reg];
+}
+
+/*
+ * Called when an invalid opcode is decoded
+ */
+static void _avr_invalid_opcode(avr_t * avr)
+{
+       printf("\e[31m*** %04x: %-25s Invalid Opcode SP=%04x O=%04x \e[0m\n",
+                       avr->pc, avr->codeline[avr->pc>>1]->symbol, _avr_sp_get(avr), avr->flash[avr->pc] | (avr->flash[avr->pc+1]<<8));
+}
+
+/*
+ * Dump changed registers when tracing
+ */
+void avr_dump_state(avr_t * avr)
+{
+       if (!avr->trace || donttrace)
+               return;
+
+       int doit = 0;
+
+       for (int r = 0; r < 3 && !doit; r++)
+               if (avr->touched[r])
+                       doit = 1;
+       if (!doit)
+               return;
+       printf("                                       ->> ");
+       const int r16[] = { R_SPL, R_XL, R_YL, R_ZL };
+       for (int i = 0; i < 4; i++)
+               if (REG_ISTOUCHED(avr, r16[i]) || REG_ISTOUCHED(avr, r16[i]+1)) {
+                       REG_TOUCH(avr, r16[i]);
+                       REG_TOUCH(avr, r16[i]+1);
+               }
+
+       for (int i = 0; i < 3*32; i++)
+               if (REG_ISTOUCHED(avr, i)) {
+                       printf("%s=%02x ", avr_regname(i), avr->data[i]);
+               }
+       printf("\n");
+}
+
+#define get_r_d_10(o) \
+               const uint8_t r = ((o >> 5) & 0x10) | (o & 0xf); \
+               const uint8_t d = (o >> 4) & 0x1f;\
+               const uint8_t vd = avr->data[d], vr =avr->data[r];
+#define get_k_r16(o) \
+               const uint8_t r = 16 + ((o >> 4) & 0xf); \
+               const uint8_t k = ((o & 0x0f00) >> 4) | (o & 0xf);
+
+/*
+ * Add a "jump" address to the jump trace buffer
+ */
+#define TRACE_JUMP()\
+       avr->old[avr->old_pci].pc = avr->pc;\
+       avr->old[avr->old_pci].sp = _avr_sp_get(avr);\
+       avr->old_pci = (avr->old_pci + 1) & (OLD_PC_SIZE-1);\
+
+/****************************************************************************\
+ *
+ * Helper functions for calculating the status register bit values.
+ * See the Atmel data sheet for the instuction set for more info.
+ *
+\****************************************************************************/
+
+static uint8_t
+get_add_carry (uint8_t res, uint8_t rd, uint8_t rr, int b)
+{
+    uint8_t resb = res >> b & 0x1;
+    uint8_t rdb = rd >> b & 0x1;
+    uint8_t rrb = rr >> b & 0x1;
+    return (rdb & rrb) | (rrb & ~resb) | (~resb & rdb);
+}
+
+static  uint8_t
+get_add_overflow (uint8_t res, uint8_t rd, uint8_t rr)
+{
+    uint8_t res7 = res >> 7 & 0x1;
+    uint8_t rd7 = rd >> 7 & 0x1;
+    uint8_t rr7 = rr >> 7 & 0x1;
+    return (rd7 & rr7 & ~res7) | (~rd7 & ~rr7 & res7);
+}
+
+static  uint8_t
+get_sub_carry (uint8_t res, uint8_t rd, uint8_t rr, int b)
+{
+    uint8_t resb = res >> b & 0x1;
+    uint8_t rdb = rd >> b & 0x1;
+    uint8_t rrb = rr >> b & 0x1;
+    return (~rdb & rrb) | (rrb & resb) | (resb & ~rdb);
+}
+
+static  uint8_t
+get_sub_overflow (uint8_t res, uint8_t rd, uint8_t rr)
+{
+    uint8_t res7 = res >> 7 & 0x1;
+    uint8_t rd7 = rd >> 7 & 0x1;
+    uint8_t rr7 = rr >> 7 & 0x1;
+    return (rd7 & ~rr7 & ~res7) | (~rd7 & rr7 & res7);
+}
+
+static  uint8_t
+get_compare_carry (uint8_t res, uint8_t rd, uint8_t rr, int b)
+{
+    uint8_t resb = (res >> b) & 0x1;
+    uint8_t rdb = (rd >> b) & 0x1;
+    uint8_t rrb = (rr >> b) & 0x1;
+    return (~rdb & rrb) | (rrb & resb) | (resb & ~rdb);
+}
+
+static  uint8_t
+get_compare_overflow (uint8_t res, uint8_t rd, uint8_t rr)
+{
+    res >>= 7; rd >>= 7; rr >>= 7;
+    /* The atmel data sheet says the second term is ~rd7 for CP
+     * but that doesn't make any sense. You be the judge. */
+    return (rd & ~rr & ~res) | (~rd & rr & res);
+}
+
+/*
+ * Main opcode decoder
+ * 
+ * The decoder was written by following the datasheet in no particular order.
+ * As I went along, I noticed "bit patterns" that could be used to factor opcodes
+ * However, a lot of these only becane apparent later on, so SOME instructions
+ * (skip of bit set etc) are compact, and some could use some refactoring (the ALU
+ * ones scream to be factored).
+ * I assume that the decoder could easily be 2/3 of it's current size.
+ * 
+ * The core 'almost' work. There is a case where it munches the stack, problem to be
+ * debugged.
+ * 
+ * It lacks a couple of multiply instructions, and the "extended" XMega jumps.
+ * 
+ * for now all instructions take "one" cycle, the cycle+=<extra> needs to be added.
+ */
+uint16_t avr_run_one(avr_t * avr)
+{
+       /*
+        * this traces spurious reset or bad jump/opcodes and dumps the last 32 "jumps" to track it down
+        */
+       if ((avr->pc == 0 && avr->cycle > 0) || avr->pc >= avr->codeend) {
+               avr->trace = 1;
+               STATE("RESET\n");
+               CRASH();
+       }
+
+       uint32_t        opcode = (avr->flash[avr->pc + 1] << 8) | avr->flash[avr->pc];
+       uint32_t        new_pc = avr->pc + 2;   // future "default" pc
+       int             cycle = 1;
+
+       avr->touched[0] = avr->touched[1] = avr->touched[2] = 0;
+
+       switch (opcode & 0xf000) {
+               case 0x0000: {
+                       switch (opcode) {
+                               case 0x0000: {  // NOP
+                                       STATE("nop\n");
+                               }       break;
+                               default: {
+                                       switch (opcode & 0xfc00) {
+                                               case 0x0400: {  // CPC compare with carry 0000 01rd dddd rrrr
+                                                       get_r_d_10(opcode);
+                                                       uint8_t res = vd - vr - avr->sreg[S_C];
+                                                       STATE("cpc %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                                       if (res)
+                                                               avr->sreg[S_Z] = 0;
+                                                       avr->sreg[S_H] = get_compare_carry(res, vd, vr, 3);
+                                                       avr->sreg[S_V] = get_compare_overflow(res, vd, vr);
+                                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                                       avr->sreg[S_C] = get_compare_carry(res, vd, vr, 7);
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x0c00: {  // ADD without carry 0000 11 rd dddd rrrr
+                                                       get_r_d_10(opcode);
+                                                       uint8_t res = vd + vr;
+                                                       if (r == d) {
+                                                               STATE("lsl %s[%02x] = %02x\n", avr_regname(d), vd, res & 0xff);
+                                                       } else {
+                                                               STATE("add %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                                       }
+                                                       _avr_set_r(avr, d, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_H] = get_add_carry(res, vd, vr, 3);
+                                                       avr->sreg[S_V] = get_add_overflow(res, vd, vr);
+                                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                                       avr->sreg[S_C] = get_add_carry(res, vd, vr, 7);
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x0800: {  // SBC substract with carry 0000 10rd dddd rrrr
+                                                       get_r_d_10(opcode);
+                                                       uint8_t res = vd - vr - avr->sreg[S_C];
+                                                       STATE("sbc %s[%02x], %s[%02x] = %02x\n", avr_regname(d), avr->data[d], avr_regname(r), avr->data[r], res);
+                                                       _avr_set_r(avr, d, res);
+                                                       if (res)
+                                                               avr->sreg[S_Z] = 0;
+                                                       avr->sreg[S_H] = get_sub_carry(res, vd, vr, 3);
+                                                       avr->sreg[S_V] = get_sub_overflow(res, vd, vr);
+                                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                                       avr->sreg[S_C] = get_sub_carry(res, vd, vr, 7);
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               default:
+                                                       switch (opcode & 0xff00) {
+                                                               case 0x0100: {  // MOVW â€“ Copy Register Word 0000 0001 dddd rrrr
+                                                                       uint8_t d = ((opcode >> 4) & 0xf) << 1;
+                                                                       uint8_t r = ((opcode) & 0xf) << 1;
+                                                                       STATE("movw %s:%s, %s:%s[%02x%02x]\n", avr_regname(d), avr_regname(d+1), avr_regname(r), avr_regname(r+1), avr->data[r+1], avr->data[r]);
+                                                                       _avr_set_r(avr, d, avr->data[r]);
+                                                                       _avr_set_r(avr, d+1, avr->data[r+1]);
+                                                               }       break;
+                                                               default: _avr_invalid_opcode(avr);
+                                                       }
+                                       }
+                               }
+                       }
+               }       break;
+
+               case 0x1000: {
+                       switch (opcode & 0xfc00) {
+                               case 0x1800: {  // SUB without carry 0000 10 rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd - vr;
+                                       STATE("sub %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       _avr_set_r(avr, d, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_H] = get_sub_carry(res, vd, vr, 3);
+                                       avr->sreg[S_V] = get_sub_overflow(res, vd, vr);
+                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                       avr->sreg[S_C] = get_sub_carry(res, vd, vr, 7);
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               case 0x1000: {  // CPSE Compare, skip if equal 0000 10 rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint16_t res = vd == vr;
+                                       STATE("cpse %s[%02x], %s[%02x]\t; Will%s skip\n", avr_regname(d), avr->data[d], avr_regname(r), avr->data[r], res ? "":"not ");
+                                       if (res)
+                                               new_pc += 2;
+                               }       break;
+                               case 0x1400: {  // CP Compare 0000 10 rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd - vr;
+                                       STATE("cp %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_H] = get_compare_carry(res, vd, vr, 3);
+                                       avr->sreg[S_V] = get_compare_overflow(res, vd, vr);
+                                       avr->sreg[S_N] = res >> 7;
+                                       avr->sreg[S_C] = get_compare_carry(res, vd, vr, 7);
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               case 0x1c00: {  // ADD with carry 0001 11 rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd + vr + avr->sreg[S_C];
+                                       if (r == d) {
+                                               STATE("rol %s[%02x] = %02x\n", avr_regname(d), avr->data[d], res);
+                                       } else {
+                                               STATE("addc %s[%02x], %s[%02x] = %02x\n", avr_regname(d), avr->data[d], avr_regname(r), avr->data[r], res);
+                                       }
+                                       _avr_set_r(avr, d, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_H] = get_add_carry(res, vd, vr, 3);
+                                       avr->sreg[S_V] = get_add_overflow(res, vd, vr);
+                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                       avr->sreg[S_C] = get_add_carry(res, vd, vr, 7);
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               default:
+                                       switch (opcode & 0xff00) {
+                                               case 0x0200: {  // MULS â€“ Multiply Signed 0000 0010 dddd rrrr
+                                                       int8_t r = opcode & 0xf;
+                                                       int8_t d = (opcode >> 4) & 0xf;
+                                                       int16_t res = ((int8_t)avr->data[r]) * ((int8_t)avr->data[d]);
+                                                       STATE("muls %s[%d], %s[%02x] = %d\n", avr_regname(d), ((int8_t)avr->data[d]), avr_regname(r), ((int8_t)avr->data[r]), res);
+                                                       _avr_set_r(avr, 0, res);
+                                                       _avr_set_r(avr, 1, res >> 8);
+                                                       avr->sreg[S_C] = (res >> 15) & 1;
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       SREG();
+                                               }       break;
+                                               default: _avr_invalid_opcode(avr);
+                                       }
+                       }
+               }       break;
+
+               case 0x2000: {
+                       switch (opcode & 0xfc00) {
+                               case 0x2000: {  // AND  0010 00rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd & vr;
+                                       if (r == d) {
+                                               STATE("tst %s[%02x]\n", avr_regname(d), avr->data[d]);
+                                       } else {
+                                               STATE("and %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       }
+                                       _avr_set_r(avr, d, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                       avr->sreg[S_V] = 0;
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               case 0x2400: {  // EOR  0010 01rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd ^ vr;
+                                       if (r==d) {
+                                               STATE("clr %s[%02x]\n", avr_regname(d), avr->data[d]);
+                                       } else {
+                                               STATE("eor %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       }
+                                       _avr_set_r(avr, d, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                       avr->sreg[S_V] = 0;
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               case 0x2800: {  // OR Logical OR        0010 10rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vd | vr;
+                                       STATE("or %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       _avr_set_r(avr, d, res);
+                                       avr->sreg[S_Z] = res == 0;
+                                       avr->sreg[S_N] = (res >> 7) & 1;
+                                       avr->sreg[S_V] = 0;
+                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                       SREG();
+                               }       break;
+                               case 0x2c00: {  // MOV  0010 11rd dddd rrrr
+                                       get_r_d_10(opcode);
+                                       uint8_t res = vr;
+                                       STATE("mov %s[%02x], %s[%02x] = %02x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                       _avr_set_r(avr, d, res);
+                               }       break;
+                               default: _avr_invalid_opcode(avr);
+                       }
+               }       break;
+
+               case 0x3000: {  // CPI 0011 KKKK rrrr KKKK
+                       get_k_r16(opcode);
+                       uint8_t vr = avr->data[r];
+                       uint8_t res = vr - k;
+                       STATE("cpi %s[%02x], 0x%02x\n", avr_regname(r), vr, k);
+
+                       avr->sreg[S_Z] = res == 0;
+                       avr->sreg[S_H] = get_compare_carry(res, vr, k, 3);
+                       avr->sreg[S_V] = get_compare_overflow(res, vr, k);
+                       avr->sreg[S_N] = (res >> 7) & 1;
+                       avr->sreg[S_C] = get_compare_carry(res, vr, k, 7);
+                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                       SREG();
+               }       break;
+
+               case 0x4000: {  // SBCI Subtract Immediate With Carry 0101 10 kkkk dddd kkkk
+                       get_k_r16(opcode);
+                       uint8_t vr = avr->data[r];
+                       uint8_t res = vr - k - avr->sreg[S_C];
+                       STATE("sbci %s[%02x], 0x%02x = %02x\n", avr_regname(r), avr->data[r], k, res);
+                       _avr_set_r(avr, r, res);
+                       avr->sreg[S_Z] = res  == 0;
+                       avr->sreg[S_N] = (res >> 7) & 1;
+                       avr->sreg[S_C] = (k + avr->sreg[S_C]) > vr;
+                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                       SREG();
+               }       break;
+
+               case 0x5000: {  // SUB Subtract Immediate 0101 10 kkkk dddd kkkk
+                       get_k_r16(opcode);
+                       uint8_t vr = avr->data[r];
+                       uint8_t res = vr - k;
+                       STATE("subi %s[%02x], 0x%02x = %02x\n", avr_regname(r), avr->data[r], k, res);
+                       _avr_set_r(avr, r, res);
+                       avr->sreg[S_Z] = res  == 0;
+                       avr->sreg[S_N] = (res >> 7) & 1;
+                       avr->sreg[S_C] = k > vr;
+                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                       SREG();
+               }       break;
+
+               case 0x6000: {  // ORI aka SBR  Logical AND with Immediate      0110 kkkk dddd kkkk
+                       get_k_r16(opcode);
+                       uint8_t res = avr->data[r] | k;
+                       STATE("ori %s[%02x], 0x%02x\n", avr_regname(r), avr->data[r], k);
+                       _avr_set_r(avr, r, res);
+                       avr->sreg[S_Z] = res == 0;
+                       avr->sreg[S_N] = (res >> 7) & 1;
+                       avr->sreg[S_V] = 0;
+                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                       SREG();
+               }       break;
+
+               case 0x7000: {  // ANDI Logical AND with Immediate      0111 kkkk dddd kkkk
+                       get_k_r16(opcode);
+                       uint8_t res = avr->data[r] & k;
+                       STATE("andi %s[%02x], 0x%02x\n", avr_regname(r), avr->data[r], k);
+                       _avr_set_r(avr, r, res);
+                       avr->sreg[S_Z] = res == 0;
+                       avr->sreg[S_N] = (res >> 7) & 1;
+                       avr->sreg[S_V] = 0;
+                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                       SREG();
+               }       break;
+
+               case 0xa000:
+               case 0x8000: {
+                       switch (opcode & 0xd008) {
+                               case 0xa000:
+                               case 0x8000: {  // LD (LDD) â€“ Load Indirect using Z 10q0 qq0r rrrr 0qqq
+                                       uint16_t v = avr->data[R_ZL] | (avr->data[R_ZH] << 8);
+                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                       uint8_t q = ((opcode & 0x2000) >> 7) | ((opcode & 0x0c00) >> 7) | (opcode & 0x7);
+
+                                       if (opcode & 0x0200) {
+                                               STATE("st (Z+%d[%04x]), %s[%02x]\n", q, v+q, avr_regname(r), avr->data[r]);
+                                               _avr_set_ram(avr, v+q, avr->data[r]);
+                                       } else {
+                                               STATE("ld %s, (Z+%d[%04x])=[%02x]\n", avr_regname(r), q, v+q, avr->data[v+q]);
+                                               _avr_set_r(avr, r, _avr_get_ram(avr, v+q));
+                                       }
+                               }       break;
+                               case 0xa008:
+                               case 0x8008: {  // LD (LDD) â€“ Load Indirect using Y 10q0 qq0r rrrr 1qqq
+                                       uint16_t v = avr->data[R_YL] | (avr->data[R_YH] << 8);
+                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                       uint8_t q = ((opcode & 0x2000) >> 7) | ((opcode & 0x0c00) >> 7) | (opcode & 0x7);
+
+                                       if (opcode & 0x0200) {
+                                               STATE("st (Y+%d[%04x]), %s[%02x]\n", q, v+q, avr_regname(r), avr->data[r]);
+                                               _avr_set_ram(avr, v+q, avr->data[r]);
+                                       } else {
+                                               STATE("ld %s, (Y+%d[%04x])=[%02x]\n", avr_regname(r), q, v+q, avr->data[v+q]);
+                                               _avr_set_r(avr, r, _avr_get_ram(avr, v+q));
+                                       }
+                               }       break;
+                               default: _avr_invalid_opcode(avr);
+                       }
+               }       break;
+
+               case 0x9000: {
+                       /* this is an annoying special case, but at least these lines handle all the SREG set/clear opcodes */
+                       if ((opcode & 0xff0f) == 0x9408) {
+                               uint8_t b = (opcode >> 4) & 7;
+                               STATE("%s%c\n", opcode & 0x0080 ? "cl" : "se", _sreg_bit_name[b]);
+                               avr->sreg[b] = (opcode & 0x0080) == 0;
+                               SREG();
+                       } else switch (opcode) {
+                               case 0x9588: { // SLEEP
+                                       STATE("sleep\n");
+                                       avr->state = cpu_Sleeping;
+                               }       break;
+                               case 0x9598: { // BREAK
+                                       STATE("break\n");
+                               }       break;
+                               case 0x95a8: { // WDR
+                                       STATE("wdr\n");
+                               }       break;
+                               case 0x9409: { // IJMP Indirect jump
+                                       uint16_t z = avr->data[R_ZL] | (avr->data[R_ZH] << 8);
+                                       STATE("ijmp Z[%04x]\n", z << 1);
+                                       new_pc = z << 1;
+                                       TRACE_JUMP();
+                               }       break;
+                               case 0x9509: { // ICALL Indirect Call to Subroutine
+                                       uint16_t z = avr->data[R_ZL] | (avr->data[R_ZH] << 8);
+                                       STATE("icall Z[%04x]\n", z << 1);
+
+                                       _avr_push16(avr, new_pc >> 1);
+                                       new_pc = z << 1;
+                                       TRACE_JUMP();
+                               }       break;
+                               case 0x9518:    // RETI
+                               case 0x9508: {  // RET
+                                       new_pc = _avr_pop16(avr) << 1;
+                                       if (opcode & 0x10)      // reti
+                                               avr->sreg[S_I] = 1;
+                                       STATE("ret%s\n", opcode & 0x10 ? "i" : "");
+                                       TRACE_JUMP();
+                               }       break;
+                               case 0x95c8: {  // LPM Load Program Memory R0 <- (Z)
+                                       uint16_t z = avr->data[R_ZL] | (avr->data[R_ZH] << 8);
+                                       STATE("lpm %s, (Z[%04x])\n", avr_regname(0), z);
+                                       _avr_set_r(avr, 0, avr->flash[z]);
+                               }       break;
+                               case 0x9408:case 0x9418:case 0x9428:case 0x9438:case 0x9448:case 0x9458:case 0x9468:
+                               case 0x9478:
+                               {       // BSET 1001 0100 0ddd 1000
+                                       uint8_t b = (opcode >> 4) & 7;
+                                       avr->sreg[b] = 1;
+                                       STATE("bset %c\n", _sreg_bit_name[b]);
+                                       SREG();
+                               }       break;
+                               case 0x9488:case 0x9498:case 0x94a8:case 0x94b8:case 0x94c8:case 0x94d8:case 0x94e8:
+                               case 0x94f8:
+                               {       // BSET 1001 0100 0ddd 1000
+                                       uint8_t b = (opcode >> 4) & 7;
+                                       avr->sreg[b] = 0;
+                                       STATE("bclr %c\n", _sreg_bit_name[b]);
+                                       SREG();
+                               }       break;
+                               default:  {
+                                       switch (opcode & 0xfe0f) {
+                                               case 0x9005:
+                                               case 0x9004: {  // LPM Load Program Memory 1001 000d dddd 01oo
+                                                       uint16_t z = avr->data[R_ZL] | (avr->data[R_ZH] << 8);
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       int op = opcode & 3;
+                                                       STATE("lpm %s, (Z[%04x]%s)\n", avr_regname(r), z, opcode?"+":"");
+                                                       _avr_set_r(avr, r, avr->flash[z]);
+                                                       if (op == 1) {
+                                                               z++;
+                                                               _avr_set_r(avr, R_ZH, z >> 8);
+                                                               _avr_set_r(avr, R_ZL, z);
+                                                       }
+                                               }       break;
+                                               case 0x900c:
+                                               case 0x900d:
+                                               case 0x900e: {  // LD Load Indirect from Data using X 1001 000r rrrr 11oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t x = (avr->data[R_XH] << 8) | avr->data[R_XL];
+                                                       STATE("ld %s, %sX[%04x]%s\n", avr_regname(r), op == 2 ? "--" : "", x, op == 1 ? "++" : "");
+
+                                                       if (op == 2) x--;
+                                                       _avr_set_r(avr, r, _avr_get_ram(avr, x));
+                                                       if (op == 1) x++;
+                                                       _avr_set_r(avr, R_XH, x >> 8);
+                                                       _avr_set_r(avr, R_XL, x);
+                                               }       break;
+                                               case 0x920c:
+                                               case 0x920d:
+                                               case 0x920e: {  // ST Store Indirect Data Space X 1001 001r rrrr 11oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t x = (avr->data[R_XH] << 8) | avr->data[R_XL];
+                                                       STATE("st %sX[%04x]%s, %s[%02x] \n", op == 2 ? "--" : "", x, op == 1 ? "++" : "", avr_regname(r), avr->data[r]);
+
+                                                       if (op == 2) x--;
+                                                       _avr_set_ram(avr, x, avr->data[r]);
+                                                       if (op == 1) x++;
+                                                       _avr_set_r(avr, R_XH, x >> 8);
+                                                       _avr_set_r(avr, R_XL, x);
+                                               }       break;
+                                               case 0x9009:
+                                               case 0x900a: {  // LD Load Indirect from Data using Y 1001 000r rrrr 10oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t y = (avr->data[R_YH] << 8) | avr->data[R_YL];
+                                                       STATE("ld %s, %sY[%04x]%s\n", avr_regname(r), op == 2 ? "--" : "", y, op == 1 ? "++" : "");
+
+                                                       if (op == 2) y--;
+                                                       _avr_set_r(avr, r, _avr_get_ram(avr, y));
+                                                       if (op == 1) y++;
+                                                       _avr_set_r(avr, R_YH, y >> 8);
+                                                       _avr_set_r(avr, R_YL, y);
+                                               }       break;
+                                               case 0x9209:
+                                               case 0x920a: {  // ST Store Indirect Data Space Y 1001 001r rrrr 10oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t y = (avr->data[R_YH] << 8) | avr->data[R_YL];
+                                                       STATE("st %sY[%04x]%s, %s[%02x] \n", op == 2 ? "--" : "", y, op == 1 ? "++" : "", avr_regname(r), avr->data[r]);
+
+                                                       if (op == 2) y--;
+                                                       _avr_set_ram(avr, y, avr->data[r]);
+                                                       if (op == 1) y++;
+                                                       _avr_set_r(avr, R_YH, y >> 8);
+                                                       _avr_set_r(avr, R_YL, y);
+                                               }       break;
+                                               case 0x9200: {  // STS ! Store Direct to Data Space, 32 bits
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t x = (avr->flash[new_pc+1] << 8) | avr->flash[new_pc];
+                                                       new_pc += 2;
+                                                       STATE("sts 0x%04x, %s[%02x]\n", x, avr_regname(r), avr->data[r]);
+                                                       _avr_set_ram(avr, x, avr->data[r]);
+                                               }       break;
+                                               case 0x9001:
+                                               case 0x9002: {  // LD Load Indirect from Data using Z 1001 001r rrrr 00oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t z = (avr->data[R_ZH] << 8) | avr->data[R_ZL];
+                                                       STATE("ld %s, %sZ[%04x]%s\n", avr_regname(r), op == 2 ? "--" : "", z, op == 1 ? "++" : "");
+
+                                                       if (op == 2) z--;
+                                                       _avr_set_r(avr, r, _avr_get_ram(avr, z));
+                                                       if (op == 1) z++;
+                                                       _avr_set_r(avr, R_ZH, z >> 8);
+                                                       _avr_set_r(avr, R_ZL, z);
+                                               }       break;
+                                               case 0x9201:
+                                               case 0x9202: {  // ST Store Indirect Data Space Z 1001 001r rrrr 00oo
+                                                       int op = opcode & 3;
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t z = (avr->data[R_ZH] << 8) | avr->data[R_ZL];
+                                                       STATE("st %sZ[%04x]%s, %s[%02x] \n", op == 2 ? "--" : "", z, op == 1 ? "++" : "", avr_regname(r), avr->data[r]);
+
+                                                       if (op == 2) z--;
+                                                       _avr_set_ram(avr, z, avr->data[r]);
+                                                       if (op == 1) z++;
+                                                       _avr_set_r(avr, R_ZH, z >> 8);
+                                                       _avr_set_r(avr, R_ZL, z);
+                                               }       break;
+                                               case 0x900f: {  // POP 1001 000d dddd 1111
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       _avr_set_r(avr, r, _avr_pop8(avr));
+                                                       uint16_t sp = _avr_sp_get(avr);
+                                                       STATE("pop %s (@%04x)[%02x]\n", avr_regname(r), sp, avr->data[sp]);
+                                               }       break;
+                                               case 0x920f: {  // PUSH 1001 001d dddd 1111
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       _avr_push8(avr, avr->data[r]);
+                                                       uint16_t sp = _avr_sp_get(avr);
+                                                       STATE("push %s[%02x] (@%04x)\n", avr_regname(r), avr->data[r], sp);
+                                               }       break;
+                                               case 0x9000: {  // LDS Load Direct from Data Space, 32 bits
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint16_t x = (avr->flash[new_pc+1] << 8) | avr->flash[new_pc];
+                                                       new_pc += 2;
+                                                       STATE("lds %s[%02x], 0x%04x\n", avr_regname(r), avr->data[r], x);
+                                                       _avr_set_r(avr, r, _avr_get_ram(avr, x));
+                                               }       break;
+                                               case 0x9400: {  // COM â€“ One’s Complement
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t res = 0xff - avr->data[r];
+                                                       STATE("com %s[%02x] = %02x\n", avr_regname(r), avr->data[r], res);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_N] = res >> 7;
+                                                       avr->sreg[S_V] = 0;
+                                                       avr->sreg[S_C] = 1;
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x9401: {  // NEG â€“ One’s Complement
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t rd = avr->data[r];
+                                                       uint8_t res = 0x00 - rd;
+                                                       STATE("neg %s[%02x] = %02x\n", avr_regname(r), rd, res);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_H] = ((res >> 3) | (rd >> 3)) & 1;
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_N] = res >> 7;
+                                                       avr->sreg[S_V] = res == 0x80;
+                                                       avr->sreg[S_C] = res != 0;
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x9402: {  // SWAP â€“ Swap Nibbles
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t res = (avr->data[r] >> 4) | (avr->data[r] << 4) ;
+                                                       STATE("swap %s[%02x] = %02x\n", avr_regname(r), avr->data[r], res);
+                                                       _avr_set_r(avr, r, res);
+                                               }       break;
+                                               case 0x9403: {  // INC â€“ Increment
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t res = avr->data[r] + 1;
+                                                       STATE("inc %s[%02x] = %02x\n", avr_regname(r), avr->data[r], res);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_N] = res >> 7;
+                                                       avr->sreg[S_V] = res == 0x7f;
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x9405: {  // ASR â€“ Arithmetic Shift Right 1001 010d dddd 0101
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t vr = avr->data[r];
+                                                       uint8_t res = (vr >> 1) | (vr & 0x80);
+                                                       STATE("asr %s[%02x]\n", avr_regname(r), vr);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_C] = vr & 1;
+                                                       avr->sreg[S_N] = res >> 7;
+                                                       avr->sreg[S_V] = avr->sreg[S_N] ^ avr->sreg[S_C];
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x9406: {  // LSR 1001 010d dddd 0110
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t vr = avr->data[r];
+                                                       uint8_t res = vr >> 1;
+                                                       STATE("lsr %s[%02x]\n", avr_regname(r), vr);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_C] = vr & 1;
+                                                       avr->sreg[S_N] = 0;
+                                                       avr->sreg[S_V] = avr->sreg[S_N] ^ avr->sreg[S_C];
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x9407: {  // ROR 1001 010d dddd 0111
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t vr = avr->data[r];
+                                                       uint8_t res = (avr->sreg[S_C] ? 0x80 : 0) | vr >> 1;
+                                                       STATE("ror %s[%02x]\n", avr_regname(r), vr);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_C] = vr & 1;
+                                                       avr->sreg[S_N] = 0;
+                                                       avr->sreg[S_V] = avr->sreg[S_N] ^ avr->sreg[S_C];
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x940a: {  // DEC â€“ Decrement
+                                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                                       uint8_t res = avr->data[r] - 1;
+                                                       STATE("dec %s[%02x] = %02x\n", avr_regname(r), avr->data[r], res);
+                                                       _avr_set_r(avr, r, res);
+                                                       avr->sreg[S_Z] = res == 0;
+                                                       avr->sreg[S_N] = res >> 7;
+                                                       avr->sreg[S_V] = res == 0x80;
+                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                       SREG();
+                                               }       break;
+                                               case 0x940c:
+                                               case 0x940d: {  // JMP Long Call to sub, 32 bits
+                                                       uint32_t a = ((opcode & 0x01f0) >> 3) | (opcode & 1);
+                                                       uint16_t x = (avr->flash[new_pc+1] << 8) | avr->flash[new_pc];
+                                                       a = (a << 16) | x;
+                                               //      printf("jmp %06x\n", a << 1);
+                                                       STATE("jmp 0x%06x\n", a);
+                                                       new_pc = a << 1;
+                                                       TRACE_JUMP();
+                                               }       break;
+                                               case 0x940e:
+                                               case 0x940f: {  // CALL Long Call to sub, 32 bits
+                                                       uint32_t a = ((opcode & 0x01f0) >> 3) | (opcode & 1);
+                                                       uint16_t x = (avr->flash[new_pc+1] << 8) | avr->flash[new_pc];
+                                                       a = (a << 16) | x;
+                                               //      printf("call %06x\n", a << 1);
+                                                       STATE("call 0x%06x\n", a);
+                                                       new_pc += 2;
+                                                       _avr_push16(avr, new_pc >> 1);
+                                                       new_pc = a << 1;
+                                                       TRACE_JUMP();
+                                               }       break;
+
+                                               default: {
+                                                       switch (opcode & 0xff00) {
+                                                               case 0x9600: {  // ADIW - Add Immediate to Word 1001 0110 KKdd KKKK
+                                                                       uint8_t r = 24 + ((opcode >> 3) & 0x6);
+                                                                       uint8_t k = ((opcode & 0x00c0) >> 2) | (opcode & 0xf);
+                                                                       uint8_t rdl = avr->data[r], rdh = avr->data[r+1];
+                                                                       uint32_t res = rdl | (rdh << 8);
+                                                                       STATE("adiw %s:%s[%04x], 0x%02x\n", avr_regname(r), avr_regname(r+1), res, k);
+                                                                       res += k;
+                                                                       _avr_set_r(avr, r + 1, res >> 8);
+                                                                       _avr_set_r(avr, r, res);
+                                                                       avr->sreg[S_V] = ~(rdh >> 7) & ((res >> 15) & 1);
+                                                                       avr->sreg[S_Z] = (res & 0xffff) == 0;
+                                                                       avr->sreg[S_N] = (res >> 15) & 1;
+                                                                       avr->sreg[S_C] = ~((res >> 15) & 1) & (rdh >> 7);
+                                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                                       SREG();
+                                                                       cycle++;
+                                                               }       break;
+                                                               case 0x9700: {  // SBIW - Subtract Immediate from Word 1001 0110 KKdd KKKK
+                                                                       uint8_t r = 24 + ((opcode >> 3) & 0x6);
+                                                                       uint8_t k = ((opcode & 0x00c0) >> 2) | (opcode & 0xf);
+                                                                       uint8_t rdl = avr->data[r], rdh = avr->data[r+1];
+                                                                       uint32_t res = rdl | (rdh << 8);
+                                                                       STATE("sbiw %s:%s[%04x], 0x%02x\n", avr_regname(r), avr_regname(r+1), res, k);
+                                                                       res -= k;
+                                                                       _avr_set_r(avr, r + 1, res >> 8);
+                                                                       _avr_set_r(avr, r, res);
+                                                                       avr->sreg[S_V] = (rdh >> 7) & (~(res >> 15) & 1);
+                                                                       avr->sreg[S_Z] = (res & 0xffff) == 0;
+                                                                       avr->sreg[S_N] = (res >> 15) & 1;
+                                                                       avr->sreg[S_C] = ((res >> 15) & 1) & (~rdh >> 7);
+                                                                       avr->sreg[S_S] = avr->sreg[S_N] ^ avr->sreg[S_V];
+                                                                       SREG();
+                                                                       cycle++;
+                                                               }       break;
+                                                               case 0x9800: {  // CBI - Clear Bit in I/O Registe 1001 1000 AAAA Abbb
+                                                                       uint8_t io = ((opcode >> 3) & 0x1f) + 32;
+                                                                       uint8_t b = opcode & 0x7;
+                                                                       uint8_t res = _avr_get_ram(avr, io) & ~(1 << b);
+                                                                       STATE("cbi %s[%04x], 0x%02x = %02x\n", avr_regname(io), avr->data[io], 1<<b, res);
+                                                                       _avr_set_ram(avr, io, res);
+                                                               }       break;
+                                                               case 0x9900: {  // SBIC - Skip if Bit in I/O Register is Cleared 1001 0111 AAAA Abbb
+                                                                       uint8_t io = ((opcode >> 3) & 0x1f) + 32;
+                                                                       uint8_t b = opcode & 0x7;
+                                                                       uint8_t res = _avr_get_ram(avr, io) & (1 << b);
+                                                                       STATE("sbic %s[%04x], 0x%02x\t; Will%s branch\n", avr_regname(io), avr->data[io], 1<<b, !res?"":"not ");
+                                                                       if (!res)
+                                                                               new_pc += 2;
+                                                               }       break;
+                                                               case 0x9a00: {  // SBI - Set Bit in I/O Register 1001 1000 AAAA Abbb
+                                                                       uint8_t io = ((opcode >> 3) & 0x1f) + 32;
+                                                                       uint8_t b = opcode & 0x7;
+                                                                       uint8_t res = _avr_get_ram(avr, io) | (1 << b);
+                                                                       STATE("sbi %s[%04x], 0x%02x = %02x\n", avr_regname(io), avr->data[io], 1<<b, res);
+                                                                       _avr_set_ram(avr, io, res);
+                                                               }       break;
+                                                               case 0x9b00: {  // SBIS - Skip if Bit in I/O Register is Cleared 1001 0111 AAAA Abbb
+                                                                       uint8_t io = (opcode >> 3) & 0x1f;
+                                                                       uint8_t b = opcode & 0x7;
+                                                                       uint8_t res = _avr_get_ram(avr, io + 32) & (1 << b);
+                                                                       STATE("sbis %s[%04x], 0x%02x\t; Will%s branch\n", avr_regname(io), avr->data[io], 1<<b, res?"":"not ");
+                                                                       if (res)
+                                                                               new_pc += 2;
+                                                               }       break;
+                                                               default:
+                                                                       switch (opcode & 0xfc00) {
+                                                                               case 0x9c00: {  // MUL - Multiply Unsigned 1001 11rd dddd rrrr
+                                                                                       get_r_d_10(opcode);
+                                                                                       uint16_t res = vd * vr;
+                                                                                       STATE("mul %s[%02x], %s[%02x] = %04x\n", avr_regname(d), vd, avr_regname(r), vr, res);
+                                                                                       _avr_set_r(avr, 0, res);
+                                                                                       _avr_set_r(avr, 1, res >> 8);
+                                                                                       avr->sreg[S_Z] = res == 0;
+                                                                                       avr->sreg[S_C] = (res >> 15) & 1;
+                                                                                       SREG();
+                                                                               }       break;
+                                                                               default: _avr_invalid_opcode(avr);
+                                                                       }
+                                                       }
+                                               }       break;
+                                       }
+                               }       break;
+                       }
+               }       break;
+
+               case 0xb000: {
+                       switch (opcode & 0xf800) {
+                               case 0xb800: {  // OUT A,Rr 1011 1AAr rrrr AAAA
+                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                       uint8_t A = ((((opcode >> 9) & 3) << 4) | ((opcode) & 0xf)) + 32;
+                                       STATE("out %s, %s[%02x]\n", avr_regname(A), avr_regname(r), avr->data[r]);
+                                       // todo: store to IO register
+                                       _avr_set_ram(avr, A, avr->data[r]);
+                               //      avr->data[A] = ;
+                               }       break;
+                               case 0xb000: {  // IN Rd,A 1011 0AAr rrrr AAAA
+                                       uint8_t r = (opcode >> 4) & 0x1f;
+                                       uint8_t A = ((((opcode >> 9) & 3) << 4) | ((opcode) & 0xf)) + 32;
+                                       STATE("in %s, %s[%02x]\n", avr_regname(r), avr_regname(A), avr->data[A]);
+                                       // todo: get the IO register
+                                       _avr_set_r(avr, r, _avr_get_ram(avr, A));
+                               }       break;
+                               default: _avr_invalid_opcode(avr);
+                       }
+               }       break;
+
+               case 0xc000: {
+                       // RJMP 1100 kkkk kkkk kkkk
+                       short o = ((short)(opcode << 4)) >> 4;
+                       STATE("rjmp .%d [%04x]\n", o, new_pc + (o << 1));
+                       new_pc = new_pc + (o << 1);
+                       TRACE_JUMP();
+               }       break;
+
+               case 0xd000: {
+                       // RCALL 1100 kkkk kkkk kkkk
+                       short o = ((short)(opcode << 4)) >> 4;
+                       STATE("rcall .%d [%04x]\n", o, new_pc + (o << 1));
+                       _avr_push16(avr, new_pc >> 1);
+                       new_pc = new_pc + (o << 1);
+                       TRACE_JUMP();
+               }       break;
+
+               case 0xe000: {  // LDI Rd, K 1110 KKKK RRRR KKKK -- aka SER (LDI r, 0xff)
+                       uint8_t d = 16 + ((opcode >> 4) & 0xf);
+                       uint8_t k = ((opcode & 0x0f00) >> 4) | (opcode & 0xf);
+                       STATE("ldi %s, 0x%02x\n", avr_regname(d), k);
+                       _avr_set_r(avr, d, k);
+               }       break;
+
+               case 0xf000: {
+                       switch (opcode & 0xfe00) {
+                               case 0xf000:
+                               case 0xf200:
+                               case 0xf400:
+                               case 0xf600: {  // All the SREG branches
+                                       short o = ((short)(opcode << 6)) >> 9; // offset
+                                       uint8_t s = opcode & 7;
+                                       int set = (opcode & 0x0400) == 0;               // this bit means BRXC otherwise BRXS
+                                       int branch = (avr->sreg[s] && set) || (!avr->sreg[s] && !set);
+                                       const char *names[2][8] = {
+                                                       { "brcc", "brne", "brpl", "brvc", NULL, "brhc", "brtc", "brid"},
+                                                       { "brcs", "breq", "brmi", "brvs", NULL, "brhs", "brts", "brie"},
+                                       };
+                                       if (names[set][s]) {
+                                               STATE("%s .%d [%04x]\t; Will%s branch\n", names[set][s], o, new_pc + (o << 1), branch ? "":" not");
+                                       } else {
+                                               STATE("%s%c .%d [%04x]\t; Will%s branch\n", set ? "brbs" : "brbc", _sreg_bit_name[s], o, new_pc + (o << 1), branch ? "":" not");
+                                       }
+                                       if (branch)
+                                               new_pc = new_pc + (o << 1);
+                               }       break;
+                               case 0xf800:
+                               case 0xf900: {  // BLD â€“ Bit Store from T into a Bit in Register 1111 100r rrrr 0bbb
+                                       uint8_t r = (opcode >> 4) & 0x1f; // register index
+                                       uint8_t s = opcode & 7;
+                                       uint8_t v = avr->data[r] | (avr->sreg[S_T] ? (1 << s) : 0);
+                                       STATE("bld %s[%02x], 0x%02x = %02x\n", avr_regname(r), avr->data[r], 1 << s, v);
+                                       _avr_set_r(avr, r, v);
+                               }       break;
+                               case 0xfa00:
+                               case 0xfb00:{   // BST â€“ Bit Store into T from bit in Register 1111 100r rrrr 0bbb
+                                       uint8_t r = (opcode >> 4) & 0x1f; // register index
+                                       uint8_t s = opcode & 7;
+                                       STATE("bst %s[%02x], 0x%02x\n", avr_regname(r), avr->data[r], 1 << s);
+                                       avr->sreg[S_T] = (avr->data[r] >> s) & 1;
+                                       SREG();
+                               }       break;
+                               case 0xfc00:
+                               case 0xfe00: {  // SBRS/SBRC â€“ Skip if Bit in Register is Set/Clear 1111 11sr rrrr 0bbb
+                                       uint8_t r = (opcode >> 4) & 0x1f; // register index
+                                       uint8_t s = opcode & 7;
+                                       int set = (opcode & 0x0200) != 0;
+                                       int branch = ((avr->data[r] & (1 << s)) && set) || (!(avr->data[r] & (1 << s)) && !set);
+                                       STATE("%s %s[%02x], 0x%02x\t; Will%s branch\n", set ? "sbrs" : "sbrc", avr_regname(r), avr->data[r], 1 << s, branch ? "":" not");
+                                       if (branch)
+                                               new_pc = new_pc + 2;
+                               }       break;
+                               default: _avr_invalid_opcode(avr);
+                       }
+               }       break;
+
+               default: _avr_invalid_opcode(avr);
+
+       }
+       avr->cycle += cycle;
+       return new_pc;
+}
+
+
diff --git a/simavr/sim/sim_core.h b/simavr/sim/sim_core.h
new file mode 100644 (file)
index 0000000..0fc5dd5
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+       sim_core.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SIM_CORE_H_
+#define SIM_CORE_H_
+
+/*
+ * Instruction decoder, run ONE instruction
+ */
+uint16_t avr_run_one(avr_t * avr);
+
+/*
+ * These are for internal access to the stack (for interupts)
+ */
+uint16_t _avr_sp_get(avr_t * avr);
+void _avr_sp_set(avr_t * avr, uint16_t sp);
+void _avr_push16(avr_t * avr, uint16_t v);
+
+/*
+ * Get a "pretty" register name
+ */
+const char * avr_regname(uint8_t reg);
+
+
+/* 
+ * DEBUG bits follow 
+ * These will diseapear when gdb arrives
+ */
+void avr_dump_state(avr_t * avr);
+
+#define DUMP_REG() { \
+                               for (int i = 0; i < 32; i++) printf("%s=%02x%c", avr_regname(i), avr->data[i],i==15?'\n':' ');\
+                               printf("\n");\
+                               uint16_t y = avr->data[R_YL] | (avr->data[R_YH]<<8);\
+                               for (int i = 0; i < 20; i++) printf("Y+%02d=%02x ", i, avr->data[y+i]);\
+                               printf("\n");\
+               }
+
+
+#define CRASH()  {\
+               DUMP_REG();\
+               printf("*** CYCLE %lld\n", avr->cycle);\
+               for (int i = OLD_PC_SIZE-1; i > 0; i--) {\
+                       int pci = (avr->old_pci + i) & 0xf;\
+                       printf("\e[31m*** %04x: %-25s RESET -%d; sp %04x\e[0m\n",\
+                                       avr->old[pci].pc, avr->codeline[avr->old[pci].pc>>1]->symbol, OLD_PC_SIZE-i, avr->old[pci].sp);\
+               }\
+               printf("Stack Ptr %04x/%04x = %d \n", _avr_sp_get(avr), avr->ramend, avr->ramend - _avr_sp_get(avr));\
+               exit(1);\
+       }
+
+#endif /* SIM_CORE_H_ */
diff --git a/simavr/sim/sim_elf.c b/simavr/sim/sim_elf.c
new file mode 100644 (file)
index 0000000..29552a9
--- /dev/null
@@ -0,0 +1,174 @@
+/*
+       sim_elf.c
+
+       Loads a .elf file, extract the code, the data, the eeprom and
+       the "mcu" specification section, also load usable code symbols
+       to be able to print meaningful trace information.
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <libelf.h>
+#include <gelf.h>
+
+#include "sim_elf.h"
+
+int elf_read_firmware(const char * file, elf_firmware_t * firmware)
+{
+       Elf32_Ehdr elf_header;                  /* ELF header */
+       Elf *elf = NULL;                       /* Our Elf pointer for libelf */
+       int fd; // File Descriptor
+
+       if ((fd = open(file, O_RDONLY)) == -1 ||
+                       (read(fd, &elf_header, sizeof(elf_header))) < sizeof(elf_header)) {
+               printf("could not read %s\n", file);
+               perror(file);
+               close(fd);
+               return -1;
+       }
+
+       Elf_Data *data_data = NULL, 
+               *data_text = NULL,
+               *data_ee = NULL;                /* Data Descriptor */
+
+       memset(firmware, 0, sizeof(*firmware));
+#if ELF_SYMBOLS
+       //int bitesize = ((avr->flashend+1) >> 1) * sizeof(avr_symbol_t);
+       firmware->codesize = 32768;
+       int bitesize = firmware->codesize * sizeof(avr_symbol_t);
+       firmware->codeline = malloc(bitesize);
+       memset(firmware->codeline,0, bitesize);
+#endif
+
+       /* this is actualy mandatory !! otherwise elf_begin() fails */
+       if (elf_version(EV_CURRENT) == EV_NONE) {
+                       /* library out of date - recover from error */
+       }
+       // Iterate through section headers again this time well stop when we find symbols
+       elf = elf_begin(fd, ELF_C_READ, NULL);
+       //printf("Loading elf %s : %p\n", file, elf);
+
+       Elf_Scn *scn = NULL;                   /* Section Descriptor */
+
+       while ((scn = elf_nextscn(elf, scn)) != NULL) {
+               GElf_Shdr shdr;                 /* Section Header */
+               gelf_getshdr(scn, &shdr);
+               char * name = elf_strptr(elf, elf_header.e_shstrndx, shdr.sh_name);
+       //      printf("Walking elf section '%s'\n", name);
+
+               if (!strcmp(name, ".text"))
+                       data_text = elf_getdata(scn, NULL);
+               else if (!strcmp(name, ".data"))
+                       data_data = elf_getdata(scn, NULL);
+               else if (!strcmp(name, ".eeprom"))
+                       data_ee = elf_getdata(scn, NULL);
+               else if (!strcmp(name, ".bss")) {
+                       Elf_Data *s = elf_getdata(scn, NULL);
+                       firmware->bsssize = s->d_size;
+               } else if (!strcmp(name, ".mmcu")) {
+                       Elf_Data *s = elf_getdata(scn, NULL);
+                       long f_cpu = s ? *((long*)s->d_buf) : 0;
+                       firmware->mmcu = *((avr_mcu_t*)s->d_buf);
+                       printf("%s: setting speed to %ld\n", __FUNCTION__, f_cpu);
+               //      avr->frequency = f_cpu;
+               }
+#if ELF_SYMBOLS
+               // When we find a section header marked SHT_SYMTAB stop and get symbols
+               if (shdr.sh_type == SHT_SYMTAB) {
+                       // edata points to our symbol table
+                       Elf_Data *edata = elf_getdata(scn, NULL);
+
+                       // how many symbols are there? this number comes from the size of
+                       // the section divided by the entry size
+                       int symbol_count = shdr.sh_size / shdr.sh_entsize;
+
+                       // loop through to grab all symbols
+                       for (int i = 0; i < symbol_count; i++) {
+                               GElf_Sym sym;                   /* Symbol */
+                               // libelf grabs the symbol data using gelf_getsym()
+                               gelf_getsym(edata, i, &sym);
+
+                               // print out the value and size
+                       //      printf("%08x %08d ", sym.st_value, sym.st_size);
+                               if (ELF32_ST_BIND(sym.st_info) == STB_GLOBAL || 
+                                               ELF32_ST_TYPE(sym.st_info) == STT_FUNC || 
+                                               ELF32_ST_TYPE(sym.st_info) == STT_OBJECT) {
+                                       const char * name = elf_strptr(elf, shdr.sh_link, sym.st_name);
+
+                                       // type of symbol
+                                       if (sym.st_value & 0xfff00000) {
+
+                                       } else {
+                                               // code
+                                               if (firmware->codeline[sym.st_value >> 1] == NULL) {
+                                                       avr_symbol_t * s = firmware->codeline[sym.st_value >> 1] = malloc(sizeof(avr_symbol_t*));
+                                                       s->symbol = strdup(name);
+                                                       s->addr = sym.st_value;
+                                               }
+                                       }
+                               }
+                       }
+               }
+#endif
+       }
+#if ELF_SYMBOLS
+       avr_symbol_t * last = NULL;
+       for (int i = 0; i < firmware->codesize; i++) {
+               if (!firmware->codeline[i])
+                       firmware->codeline[i] = last;
+               else
+                       last = firmware->codeline[i];
+       }
+#endif
+       uint32_t offset = 0;
+       firmware->flashsize =
+                       (data_text ? data_text->d_size : 0) +
+                       (data_data ? data_data->d_size : 0);
+       firmware->flash = malloc(firmware->flashsize);
+       if (data_text) {
+       //      hdump("code", data_text->d_buf, data_text->d_size);
+               memcpy(firmware->flash + offset, data_text->d_buf, data_text->d_size);
+               offset += data_text->d_size;
+               printf("Loaded %d .text\n", data_text->d_size);
+       }
+       if (data_data) {
+       //      hdump("data", data_data->d_buf, data_data->d_size);
+               memcpy(firmware->flash + offset, data_data->d_buf, data_data->d_size);
+               printf("Loaded %d .data\n", data_data->d_size);
+               offset += data_data->d_size;
+               firmware->datasize = data_data->d_size;
+       }
+       if (data_ee) {
+       //      hdump("eeprom", data_ee->d_buf, data_ee->d_size);
+               firmware->eeprom = malloc(data_ee->d_size);
+               memcpy(firmware->eeprom, data_ee->d_buf, data_ee->d_size);
+               printf("Loaded %d .eeprom\n", data_ee->d_size);
+               firmware->eesize = data_ee->d_size;
+       }
+//     hdump("flash", avr->flash, offset);
+       elf_end(elf);
+       close(fd);
+       return 0;
+}
+
diff --git a/simavr/sim/sim_elf.h b/simavr/sim/sim_elf.h
new file mode 100644 (file)
index 0000000..05af0a7
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+       sim_elf.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ELF_H_
+#define ELF_H_
+
+#include "avr_mcu_section.h"
+
+#ifndef ELF_SYMBOLS
+#define ELF_SYMBOLS 1
+#endif
+
+#if ELF_SYMBOLS
+#include "simavr.h"
+#endif
+
+typedef struct elf_firmware_t {
+       avr_mcu_t mmcu;
+       uint8_t * flash;
+       uint32_t flashsize;
+       uint32_t datasize;
+       uint32_t bsssize;
+       // read the .eeprom section of the elf, too
+       uint8_t * eeprom;
+       uint32_t eesize;
+
+#if ELF_SYMBOLS
+       avr_symbol_t **  codeline;
+       uint32_t                codesize;       // in elements
+#endif
+} elf_firmware_t ;
+
+int elf_read_firmware(const char * file, elf_firmware_t * firmware);
+
+#endif /* ELF_H_ */
diff --git a/simavr/sim/sim_gdb.c b/simavr/sim/sim_gdb.c
new file mode 100644 (file)
index 0000000..74714d1
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+       sim_gdb.c
+
+       Placeholder!
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <poll.h>
+#include "simavr.h"
+
+typedef struct avr_gdb_t {
+       avr_t * avr;
+       int             sock;
+} avr_gdb_t;
+
+int avr_gdb_init(avr_t * avr)
+{
+       avr_gdb_t * g = malloc(sizeof(avr_gdb_t));
+       memset(g, 0, sizeof(avr_gdb_t));
+
+       avr->gdb = NULL;
+
+       if ((g->sock = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
+               fprintf(stderr, "Can't create socket: %s", strerror(errno));
+               return -1;
+       }
+
+       int i = 1;
+       setsockopt(g->sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+
+       struct sockaddr_in address = { 0 };
+       address.sin_family = AF_INET;
+       address.sin_port = htons (1234);
+
+       if (bind(g->sock, (struct sockaddr *) &address, sizeof(address))) {
+               fprintf(stderr, "Can not bind socket: %s", strerror(errno));
+               return -1;
+       }
+       avr->gdb = g;
+       return 0;
+}
diff --git a/simavr/sim/sim_gdb.h b/simavr/sim/sim_gdb.h
new file mode 100644 (file)
index 0000000..67f7a07
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+       sim_gdb.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SIM_GDB_H__
+#define __SIM_GDB_H__
+
+#endif
diff --git a/simavr/sim/simavr.c b/simavr/sim/simavr.c
new file mode 100644 (file)
index 0000000..39481dc
--- /dev/null
@@ -0,0 +1,356 @@
+/*
+       simavr.c
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "simavr.h"
+#include "sim_elf.h"
+
+#include "sim_core.h"
+#include "avr_eeprom.h"
+
+void hdump(const char *w, uint8_t *b, size_t l)
+{
+       uint32_t i;
+       if (l < 16) {
+               printf("%s: ",w);
+               for (i = 0; i < l; i++) printf("%02x",b[i]);
+       } else {
+               printf("%s:\n",w);
+               for (i = 0; i < l; i++) {
+                       if (!(i & 0x1f)) printf("    ");
+                       printf("%02x",b[i]);
+                       if ((i & 0x1f) == 0x1f) {
+                               printf(" ");
+                               printf("\n");
+                       }
+               }
+       }
+       printf("\n");
+}
+
+
+
+int avr_init(avr_t * avr)
+{
+       avr->flash = malloc(avr->flashend + 1);
+       memset(avr->flash, 0xff, avr->flashend + 1);
+       avr->data = malloc(avr->ramend + 1);
+       memset(avr->data, 0, avr->ramend + 1);
+
+       avr->state = cpu_Running;
+       avr->frequency = 1000000;       // can be overriden via avr_mcu_section
+       
+       if (avr->init)
+               avr->init(avr);
+       avr_reset(avr); 
+       return 0;
+}
+
+void avr_reset(avr_t * avr)
+{
+       memset(avr->data, 0x0, avr->ramend + 1);
+       _avr_sp_set(avr, avr->ramend);
+       avr->pc = 0;
+       for (int i = 0; i < 8; i++)
+               avr->sreg[i] = 0;
+       if (avr->reset)
+               avr->reset(avr);
+
+       avr_io_t * port = avr->io_port;
+       while (port) {
+               if (port->reset)
+                       port->reset(avr, port);
+               port = port->next;
+       }
+
+}
+
+int avr_ioctl(avr_t *avr, uint32_t ctl, void * io_param)
+{
+       avr_io_t * port = avr->io_port;
+       int res = -1;
+       while (port && res == -1) {
+               if (port->ioctl)
+                       res = port->ioctl(avr, port, ctl, io_param);
+               port = port->next;
+       }
+       return res;
+}
+
+void avr_register_io(avr_t *avr, avr_io_t * io)
+{
+       io->next = avr->io_port;
+       avr->io_port = io;
+}
+
+void avr_register_io_read(avr_t *avr, uint8_t addr, avr_io_read_t readp, void * param)
+{
+       avr->ior[AVR_DATA_TO_IO(addr)].param = param;
+       avr->ior[AVR_DATA_TO_IO(addr)].r = readp;
+}
+
+void avr_register_io_write(avr_t *avr, uint8_t addr, avr_io_write_t writep, void * param)
+{
+       avr->iow[AVR_DATA_TO_IO(addr)].param = param;
+       avr->iow[AVR_DATA_TO_IO(addr)].w = writep;
+}
+
+void avr_register_vector(avr_t *avr, avr_int_vector_t * vector)
+{
+       if (vector->vector)
+               avr->vector[vector->vector] = vector;
+}
+
+int avr_has_pending_interupts(avr_t * avr)
+{
+       return avr->pending[0] || avr->pending[1];
+}
+
+int avr_is_interupt_pending(avr_t * avr, avr_int_vector_t * vector)
+{
+       return avr->pending[vector->vector >> 5] & (1 << (vector->vector & 0x1f));
+}
+
+void avr_raise_interupt(avr_t * avr, avr_int_vector_t * vector)
+{
+       if (!vector->vector)
+               return;
+//     printf("%s raising %d\n", __FUNCTION__, vector->vector);
+       if (vector->enable.reg) {
+               if (!avr_regbit_get(avr, vector->enable))
+                       return;
+       }
+       if (!avr_is_interupt_pending(avr, vector)) {
+               if (!avr->pending_wait)
+                       avr->pending_wait = 2;          // latency on interupts ??
+               avr->pending[vector->vector >> 5] |= (1 << (vector->vector & 0x1f));
+
+               if (vector->raised.reg)
+                       avr_regbit_set(avr, vector->raised);
+               if (avr->state != cpu_Running) {
+               //      printf("Waking CPU due to interrupt\n");
+                       avr->state = cpu_Running;       // in case we were sleeping
+               }
+       }
+}
+
+static void avr_clear_interupt(avr_t * avr, int v)
+{
+       avr_int_vector_t * vector = avr->vector[v];
+       avr->pending[v >> 5] &= ~(1 << (v & 0x1f));
+       if (!vector)
+               return;
+       printf("%s cleared %d\n", __FUNCTION__, vector->vector);
+       if (vector->raised.reg)
+               avr_regbit_clear(avr, vector->raised);
+}
+
+void avr_loadcode(avr_t * avr, uint8_t * code, uint32_t size, uint32_t address)
+{
+       memcpy(avr->flash + address, code, size);
+}
+
+void avr_core_watch_write(avr_t *avr, uint16_t addr, uint8_t v)
+{
+       if (addr > avr->ramend) {
+               printf("*** Invalid write address PC=%04x SP=%04x O=%04x Address %04x=%02x out of ram\n",
+                               avr->pc, _avr_sp_get(avr), avr->flash[avr->pc] | (avr->flash[avr->pc]<<8), addr, v);
+               CRASH();
+       }
+       if (addr < 32) {
+               printf("*** Invalid write address PC=%04x SP=%04x O=%04x Address %04x=%02x low registers\n",
+                               avr->pc, _avr_sp_get(avr), avr->flash[avr->pc] | (avr->flash[avr->pc]<<8), addr, v);
+               CRASH();
+       }
+#if 0
+       /*
+        * this only happend when the compiler is doctoring the stack before calls. Or
+        * if there is an invalid pointer somewhere...
+        */
+       if (addr > _avr_sp_get(avr)) {
+               avr->trace++;
+               STATE("\e[31mmunching stack SP %04x, A=%04x <= %02x\e[0m\n", _avr_sp_get(avr), addr, v);
+               avr->trace--;
+       }
+#endif
+       avr->data[addr] = v;
+}
+
+uint8_t avr_core_watch_read(avr_t *avr, uint16_t addr)
+{
+       if (addr > avr->ramend) {
+               printf("*** Invalid read address PC=%04x SP=%04x O=%04x Address %04x out of ram (%04x)\n",
+                               avr->pc, _avr_sp_get(avr), avr->flash[avr->pc] | (avr->flash[avr->pc]<<8), addr, avr->ramend);
+               CRASH();
+       }
+       return avr->data[addr];
+}
+
+/*
+ * check wether interupts are pending. I so, check if the interupt "latency" is reached,
+ * and if so triggers the handlers and jump to the vector.
+ */
+static void avr_service_interupts(avr_t * avr)
+{
+       if (!avr->sreg[S_I])
+               return;
+
+       if (avr_has_pending_interupts(avr)) {
+               if (avr->pending_wait) {
+                       avr->pending_wait--;
+                       if (avr->pending_wait == 0) {
+                               int done = 0;
+                               for (int bi = 0; bi < 2 && !done; bi++) if (avr->pending[bi]) {
+                                       for (int ii = 0; ii < 32 && !done; ii++)
+                                               if (avr->pending[bi] & (1 << ii)) {
+
+                                                       int v = (bi * 32) + ii; // vector
+
+                                               //      printf("%s calling %d\n", __FUNCTION__, v);
+                                                       _avr_push16(avr, avr->pc >> 1);
+                                                       avr->sreg[S_I] = 0;
+                                                       avr->pc = v * avr->vector_size;
+
+                                                       avr_clear_interupt(avr, v);
+                                                       done++;
+                                                       break;
+                                               }
+                                       break;
+                               }
+                       }
+               } else
+                       avr->pending_wait = 2;  // for next one...
+       }
+}
+
+
+int avr_run(avr_t * avr)
+{
+       if (avr->state == cpu_Stopped)
+               return avr->state;
+
+       uint16_t new_pc = avr->pc;
+
+       if (avr->state == cpu_Running) {
+               new_pc = avr_run_one(avr);
+               avr_dump_state(avr);
+       } else
+               avr->cycle ++;
+
+       // re-synth the SREG
+       //SREG();
+       // if we just re-enabled the interrupts...
+       if (avr->sreg[S_I] && !(avr->data[R_SREG] & (1 << S_I))) {
+       //      printf("*** %s: Renabling interupts\n", __FUNCTION__);
+               avr->pending_wait++;
+       }
+       avr_io_t * port = avr->io_port;
+       while (port) {
+               if (port->run)
+                       port->run(avr, port);
+               port = port->next;
+       }
+
+       avr->pc = new_pc;
+
+       if (avr->state == cpu_Sleeping) {
+               if (!avr->sreg[S_I]) {
+                       printf("simavr: sleeping with interupts off, quitting gracefuly\n");
+                       exit(0);
+               }
+               usleep(500);
+               long sleep = (float)avr->frequency * (1.0f / 500.0f);
+               avr->cycle += sleep;
+       //      avr->state = cpu_Running;
+       }
+       // Interrupt servicing might change the PC too
+       if (avr->state == cpu_Running || avr->state == cpu_Sleeping) {
+               avr_service_interupts(avr);
+
+               avr->data[R_SREG] = 0;
+               for (int i = 0; i < 8; i++)
+                       if (avr->sreg[i] > 1) {
+                               printf("** Invalid SREG!!\n");
+                               CRASH();
+                       } else if (avr->sreg[i])
+                               avr->data[R_SREG] |= (1 << i);
+       }
+       return avr->state;
+}
+
+extern avr_kind_t tiny85;
+extern avr_kind_t mega48,mega88,mega168;
+extern avr_kind_t mega644;
+
+avr_kind_t * avr_kind[] = {
+       &tiny85,
+       &mega48,
+       &mega88,
+       &mega168,
+       &mega644,
+       NULL
+};
+
+int main(int argc, const char **argv)
+{
+       elf_firmware_t f;
+
+       elf_read_firmware(argv[1], &f);
+
+       printf("firmware %s f=%ld mmcu=%s\n", argv[1], f.mmcu.f_cpu, f.mmcu.name);
+
+       avr_kind_t * maker = NULL;
+       for (int i = 0; avr_kind[i] && !maker; i++) {
+               for (int j = 0; avr_kind[i]->names[j]; j++)
+                       if (!strcmp(avr_kind[i]->names[j], f.mmcu.name)) {
+                               maker = avr_kind[i];
+                               break;
+                       }
+       }
+       if (!maker) {
+               fprintf(stderr, "%s: AVR '%s' now known\n", argv[0], f.mmcu.name);
+               exit(1);
+       }
+
+       avr_t * avr = maker->make();
+       printf("Starting %s - flashend %04x ramend %04x e2end %04x\n", avr->mmcu, avr->flashend, avr->ramend, avr->e2end);
+       avr_init(avr);
+       avr->frequency = f.mmcu.f_cpu;
+       avr->codeline = f.codeline;
+       avr_loadcode(avr, f.flash, f.flashsize, 0);
+       avr->codeend = f.flashsize - f.datasize;
+       if (f.eeprom && f.eesize) {
+               avr_eeprom_desc_t d = { .ee = f.eeprom, .offset = 0, .size = f.eesize };
+               avr_ioctl(avr, AVR_IOCTL_EEPROM_SET, &d);
+       }
+//     avr->trace = 1;
+
+       for (long long i = 0; i < 8000000*10; i++)
+//     for (long long i = 0; i < 80000; i++)
+               avr_run(avr);
+       
+}
diff --git a/simavr/sim/simavr.h b/simavr/sim/simavr.h
new file mode 100644 (file)
index 0000000..bc1fd3f
--- /dev/null
@@ -0,0 +1,313 @@
+/*
+       simavr.h
+
+       Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+
+       This file is part of simavr.
+
+       simavr is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       simavr is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SIMAVR_H__
+#define __SIMAVR_H__
+
+#include <stdint.h>
+
+struct avr_t;
+typedef uint8_t (*avr_io_read_t)(struct avr_t * avr, uint8_t addr, void * param);
+typedef void (*avr_io_write_t)(struct avr_t * avr, uint8_t addr, uint8_t v, void * param);
+
+enum {
+       // SREG bit indexes
+       S_C = 0,S_Z,S_N,S_V,S_S,S_H,S_T,S_I,
+
+       // 16 bits register pairs
+       R_XL    = 0x1a, R_XH,R_YL,R_YH,R_ZL,R_ZH,
+       // stack pointer
+       R_SPL   = 32+0x3d, R_SPH,
+       // real SREG
+       R_SREG  = 32+0x3f,
+
+       // maximum number of IO regisrer, on normal AVRs
+       MAX_IOs = 256 - 32,     // minus 32 GP registers
+};
+
+#define AVR_DATA_TO_IO(v) ((v) - 32)
+#define AVR_IO_TO_DATA(v) ((v) + 32)
+
+/*
+ * Core states. This will need populating with debug states for gdb
+ */
+enum {
+       cpu_Stopped,
+       cpu_Running,
+       cpu_Sleeping,
+};
+
+/*
+ * Main AVR instance. Some of these fields are set by the AVR "Core" definition files
+ * the rest is runtime data (as little as possible)
+ */
+typedef struct avr_t {
+       const char * mmcu;      // name of the AVR
+       // these are filled by sim_core_declare from constants in /usr/lib/avr/include/avr/io*.h
+       uint16_t        ramend;         
+       uint32_t        flashend;
+       uint32_t        e2end;
+       uint8_t         vector_size;
+       uint8_t         signature[3];
+       uint8_t         fuse[4];
+
+       // filled by the ELF data, this allow tracking of invalid jumps
+       uint32_t        codeend;
+
+       int                     state;          // stopped, running, sleeping
+       uint32_t        frequency;      // frequency we are running at
+       uint64_t        cycle;          // current cycle
+       
+       // called at init time
+       void (*init)(struct avr_t * avr);
+       // called at reset time
+       void (*reset)(struct avr_t * avr);
+
+       // Mirror of the SREG register, to facilitate the access to bits
+       // in the opcode decoder.
+       // This array is re-synthetized back/forth when SREG changes
+       uint8_t         sreg[8];
+
+       /* 
+        * ** current PC **
+        * Note that the PC is reoresenting /bytes/ while the AVR value is
+        * assumed to be "words". This is in line with what GDB does...
+        * this is why you will see >>1 ane <<1 in the decoder to handle jumps
+        */
+       uint32_t        pc;
+
+       /*
+        * callback when specific IO registers are read/written
+        */
+       struct {
+               void * param;
+               avr_io_read_t r;
+       } ior[MAX_IOs];
+       struct {
+               void * param;
+               avr_io_write_t w;
+       } iow[MAX_IOs];
+
+       // flash memory (initialized to 0xff, and code loaded into it)
+       uint8_t *       flash;
+       // this is the general purpose registers, IO registers, and SRAM
+       uint8_t *       data;
+
+       // queue of io modules
+       struct avr_io_t *io_port;
+
+       // interupt vectors, and their enable/clear registers
+       struct avr_int_vector_t * vector[64];
+       uint8_t         pending_wait;   // number of cycles to wait for pending
+       uint32_t        pending[2];             // pending interupts
+
+       // DEBUG ONLY
+       int             trace;
+       struct avr_symbol_t ** codeline;
+
+       /* DEBUG ONLY
+        * this keeps track of "jumps" ie, call,jmp,ret,reti and so on
+        * allows dumping of a meaningful data even if the stack is
+        * munched and so on
+        */
+       #define OLD_PC_SIZE     32
+       struct {
+               uint32_t pc;
+               uint16_t sp;
+       } old[OLD_PC_SIZE]; // catches reset..
+       int                     old_pci;
+
+       // DEBUG ONLY
+       // keeps track of wich registers gets touched by instructions
+       // reset before each new instructions. Allows meaningful traces
+       uint32_t        touched[256 / 32];      // debug
+
+       // placeholder
+       struct avr_gdb_t * gdb;
+} avr_t;
+
+
+// this is a static constructor for each of the AVR devices
+typedef struct avr_kind_t {
+       const char * names[4];  // name aliases
+       avr_t * (*make)();
+} avr_kind_t;
+
+// a symbol loaded from the .elf file
+typedef struct avr_symbol_t {
+       const char * symbol;
+       uint32_t        addr;
+} avr_symbol_t;
+
+/*
+ * this 'structure' is a packed representation of an IO register 'bit'
+ * (or consecutive bits). This allows a way to set/get/clear them.
+ * gcc is happy passing these as register value, so you don't need to
+ * use a pointer when passing them along to functions.
+ */
+typedef struct avr_regbit_t {
+       unsigned long reg : 8, bit : 3, mask : 8;
+} avr_regbit_t;
+
+// interupt vector for the IO modules
+typedef struct avr_int_vector_t {
+       uint8_t vector;         // vector number, zero (reset) is reserved
+
+       avr_regbit_t enable;    // IO register index for the "interupt enable" flag for this vector
+       avr_regbit_t raised;    // IO register index for the register where the "raised" flag is (optional)
+} avr_int_vector_t;
+
+/*
+ * used by the ioports to implement their own features
+ * see avr_eeprom.* for an example, and avr_ioctl().
+ */
+#define AVR_IOCTL_DEF(_a,_b,_c,_d) \
+       (((_a) << 24)|((_b) << 16)|((_c) << 8)|((_d)))
+
+/*
+ * IO module base struct
+ * Modules uses that as their first member in their own struct
+ */
+typedef struct avr_io_t {
+       struct avr_io_t * next;
+       const char * kind;
+       // called at every instruction
+       void (*run)(avr_t * avr, struct avr_io_t *io);
+       // called at reset time
+       void (*reset)(avr_t * avr, struct avr_io_t *io);
+       // called externally. allow access to io modules and so on
+       int (*ioctl)(avr_t * avr, struct avr_io_t *io, uint32_t ctl, void *io_param);
+} avr_io_t;
+
+// initializes a new AVR instance. Will call the IO registers init(), and then reset()
+int avr_init(avr_t * avr);
+// resets the AVR, and the IO modules
+void avr_reset(avr_t * avr);
+
+// load code in the "flash"
+void avr_loadcode(avr_t * avr, uint8_t * code, uint32_t size, uint32_t address);
+
+/*
+ * IO modules helper functions
+ */
+
+// registers an IO module, so it's run(), reset() etc are called
+// this is called by the AVR core init functions, you /could/ register an external
+// one after instanciation, for whatever purpose...
+void avr_register_io(avr_t *avr, avr_io_t * io);
+// register a callback for when IO register "addr" is read
+void avr_register_io_read(avr_t *avr, uint8_t addr, avr_io_read_t read, void * param);
+// register a callback for when the IO register is written. callback has to set the memory itself
+void avr_register_io_write(avr_t *avr, uint8_t addr, avr_io_write_t write, void * param);
+// call every IO modules until one responds to this
+int avr_ioctl(avr_t *avr, uint32_t ctl, void * io_param);
+
+/*
+ * Interupt Helper Functions
+ */
+// register an interupt vector. It's only needed if you want to use the "r_raised" flags
+void avr_register_vector(avr_t *avr, avr_int_vector_t * vector);
+// raise an interupt (if enabled). The interupt is latched and will be called later
+void avr_raise_interupt(avr_t * avr, avr_int_vector_t * vector);
+// return non-zero if the AVR core has any pending interupts
+int avr_has_pending_interupts(avr_t * avr);
+// return nonzero if a soecific interupt vector is pending
+int avr_is_interupt_pending(avr_t * avr, avr_int_vector_t * vector);
+
+/*
+ * these are accessors for avr->data but allows watchpoints to be set for gdb
+ * IO modules use that to set values to registers, and the AVR core decoder uses
+ * that to register "public" read by instructions.
+ */
+void avr_core_watch_write(avr_t *avr, uint16_t addr, uint8_t v);
+uint8_t avr_core_watch_read(avr_t *avr, uint16_t addr);
+
+
+/*
+ * These accessors are inlined and are used to perform the operations on
+ * avr_regbit_t definitions. This is the "official" way to access bits into registers
+ * The small footorint costs brings much better versatility for functions/bits that are
+ * not always defined in the same place on real AVR cores
+ */
+/*
+ * set/get/clear io register bits in one operation
+ */
+static inline uint8_t avr_regbit_set(avr_t * avr, avr_regbit_t rb)
+{
+       uint8_t a = rb.reg;
+       if (!a)
+               return 0;
+       uint8_t m = rb.mask << rb.bit;
+       avr_core_watch_write(avr, a, avr->data[a] | m);
+       return (avr->data[a] >> rb.bit) & rb.mask;
+}
+
+static inline uint8_t avr_regbit_setto(avr_t * avr, avr_regbit_t rb, uint8_t v)
+{
+       uint8_t a = rb.reg;
+       if (!a)
+               return 0;
+       uint8_t m = rb.mask << rb.bit;
+       avr_core_watch_write(avr, a, (avr->data[a] & ~(m)) | ((v << rb.bit) & m));
+       return (avr->data[a] >> rb.bit) & rb.mask;
+}
+
+static inline uint8_t avr_regbit_get(avr_t * avr, avr_regbit_t rb)
+{
+       uint8_t a = rb.reg;
+       if (!a)
+               return 0;
+       //uint8_t m = rb.mask << rb.bit;
+       return (avr->data[a] >> rb.bit) & rb.mask;
+}
+
+static inline uint8_t avr_regbit_clear(avr_t * avr, avr_regbit_t rb)
+{
+       uint8_t a = (rb.reg);
+       uint8_t m = rb.mask << rb.bit;
+       avr_core_watch_write(avr, a, avr->data[a] & ~m);
+       return avr->data[a];
+}
+
+#define ARRAY_SIZE(_aa) (sizeof(_aa) / sizeof((_aa)[0]))
+
+/*
+ * This reads the bits for an array of avr_regbit_t, make up a "byte" with them.
+ * This allows reading bits like CS0, CS1, CS2 etc even if they are not in the same
+ * physical IO register.
+ */
+static inline uint8_t avr_regbit_get_array(avr_t * avr, avr_regbit_t *rb, int count)
+{
+       uint8_t res = 0;
+
+       for (int i = 0; i < count; i++, rb++) if (rb->reg) {
+               uint8_t a = (rb->reg);
+               res |= ((avr->data[a] >> rb->bit) & rb->mask) << i;
+       }
+       return res;
+}
+
+#define AVR_IO_REGBIT(_io, _bit) { . reg = (_io), .bit = (_bit), .mask = 1 }
+#define AVR_IO_REGBITS(_io, _bit, _mask) { . reg = (_io), .bit = (_bit), .mask = (_mask) }
+
+
+#endif /*__SIMAVR_H__*/
+
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644 (file)
index 0000000..ff2ede5
--- /dev/null
@@ -0,0 +1,54 @@
+#
+# This makefile take each "at*" file, extracts it's part name
+# And compile it into an ELF binary.
+# It also disassemble it for debugging purposes.
+# 
+# The code is compiled "optimized" to the max.
+# 
+# The wierd "-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000"
+# is used to tell the linker not to discard the .mmcu section,
+# otherwise the --gc-sections will delete it.
+# 
+#      Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+#
+#      This file is part of simavr.
+#
+#      simavr is free software: you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      the Free Software Foundation, either version 3 of the License, or
+#      (at your option) any later version.
+#
+#      simavr is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with simavr.  If not, see <http://www.gnu.org/licenses/>.
+
+sources                := $(wildcard at*.c)
+
+all :  ${sources:.c=.axf} ${sources:.c=.hex}  ${sources:.c=.s}  
+
+%.hex: %.axf
+               @avr-objcopy -j .text -j .data -O ihex ${<} ${@}
+
+%.s: %.axf
+               @avr-objdump -j .text -j .data -j .bss -d  ${<} > ${@}
+
+%.axf: %.c 
+               @echo CC ${<}
+               @part=${<} ; part=$${part/_*}; \
+               avr-gcc -Wall -g -Os -std=gnu99 \
+                               -mmcu=$$part \
+                               -DF_CPU=8000000 \
+                               -mcall-prologues -fno-inline-small-functions \
+                               -ffunction-sections -fdata-sections \
+                               -Wl,--relax,--gc-sections \
+                               -Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000 \
+                               -I../include \
+                               ${<} -o ${@}
+               @avr-size ${@}|sed '1d'
+
+clean:
+       rm -f *.hex *.o *.axf *.s
diff --git a/tests/atmega88_example.c b/tests/atmega88_example.c
new file mode 100644 (file)
index 0000000..fd15e94
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+       atmega88_example.c
+
+ */
+
+#ifndef F_CPU
+#define F_CPU 8000000
+#endif
+#include <avr/io.h>
+#include <stdio.h>
+#include <avr/interrupt.h>
+#include <avr/eeprom.h>
+#include <avr/sleep.h>
+
+/*
+ * This demonstrate how to use the avr_mcu_section.h file
+ * The macro adds a section to the ELF file with useful
+ * information for the simulator
+ */
+#include "avr_mcu_section.h"
+AVR_MCU(F_CPU, "atmega88");
+
+/* declare this in a .eeprom ELF section */
+uint32_t value EEMEM = 0xdeadbeef;
+
+static int uart_putchar(char c, FILE *stream) {
+  if (c == '\n')
+    uart_putchar('\r', stream);
+  loop_until_bit_is_set(UCSR0A, UDRE0);
+  UDR0 = c;
+  return 0;
+}
+
+static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
+                                         _FDEV_SETUP_WRITE);
+
+
+int main()
+{
+       stdout = &mystdout;
+
+       // read the eeprom value
+       uint32_t c = eeprom_read_dword((void*)&value);
+       printf("Read from eeprom 0x%08lx -- should be 0xdeadbeef\n", c);
+       // change the eeprom
+       eeprom_write_dword((void*)&value, 0xcafef00d);
+       // re-read it
+       c = eeprom_read_dword((void*)&value);
+       printf("Read from eeprom 0x%08lx -- should be 0xcafef00d\n", c);
+
+       // this quits the simulator, since interupts are off
+       // this is a "feature" that allows running tests cases and exit
+       sleep_cpu();
+}