=== trunk/configure.ac
==================================================================
--- trunk/configure.ac	(revision 621)
+++ trunk/configure.ac	(local)
@@ -54,7 +54,6 @@
  swig_path=""
 fi
 AM_CONDITIONAL([USE_SWIG],[test x${swig_path} != "x"])
-
 if (echo $CXX | grep ccache); then
   echo
 else 
@@ -200,7 +199,13 @@
 fi
 AM_CONDITIONAL([USE_PYTHON],[test "x$have_python" != "x"])
 AM_CONDITIONAL([USE_WISH],[test "x$TCL_WISH" != "x"])
+AC_CHECK_HEADER([vpi_user.h],
+	        [AC_DEFINE(HAVE_VERILOG, [1], Icarus verilog interface)
+		 WE_HAVE_VERILOG="yes"],	
+                [])
+AM_CONDITIONAL([USE_VERILOG], [test "$WE_HAVE_VERILOG"])
 
+
 AC_CONFIG_FILES([Makefile
         doc/Makefile
         src/Makefile
=== trunk/src/Makefile.am
==================================================================
--- trunk/src/Makefile.am	(revision 621)
+++ trunk/src/Makefile.am	(local)
@@ -26,14 +26,14 @@
 
 DISTCLEANFILES:=${DISTCLEANFILES} simulavr.so keytrans.h simulavr_wrap.cpp
 
-CLEANFILES:=${CLEANFILES} simulavr.so keytrans.h simulavr_wrap.cpp
+CLEANFILES:=${CLEANFILES} simulavr.so keytrans.h simulavr_wrap.cpp avr.vpi
 
 EXTRA_DIST           = simulavr.i 
 
 SUBDIRS = python
 DIST_SUBDIRS = python
 
-lib_LTLIBRARIES		= libavrsim_pp.la
+lib_LTLIBRARIES		= libavrsim_pp.la libavrvpi_pp.la
 
 bin_PROGRAMS = simulavr kbdgentables
 
@@ -44,6 +44,7 @@
 	atmega128.cpp		\
 	avrdevice.cpp		\
 	avrerror.cpp		\
+	avrfactory.cpp		\
 	avrmalloc.cpp		\
 	decoder.cpp		\
 	decoder_trace.cpp 	\
@@ -82,8 +83,19 @@
 	serialtx.cpp		\
 	systemclock.cpp		\
 	trace.cpp		\
-	ui.cpp 			
+	ui.cpp 	
 
+if USE_VERILOG
+libavrvpi_pp_la_SOURCES =	   \
+	$(libavrsim_pp_la_SOURCES) \
+	vpi.cpp
+
+all-local:	avr.vpi
+
+avr.vpi:	libavrvpi_pp.la
+	iverilog-vpi --name=avr $(shell ar t .libs/libavrvpi_pp.a|sed su^u.libs/u) -lbfd 
+endif
+
 pkginclude_HEADERS = 	\
 	application.h \
 	at4433.h		\
@@ -92,6 +104,7 @@
 	avrdevice.h		\
 	avrdevice_impl.h	\
 	avrerror.h		\
+	avrfactory.h		\
 	avrmalloc.h		\
 	breakpoint.h		\
 	config_deprecated.h 	\
@@ -168,7 +181,7 @@
 libavrsim_pp_la_LIBADD = $(NonPortableDarwin_LIBADD_Hack)
 
 AM_CPPFLAGS=$(TCL_INCLUDE_SPEC)
-AM_CXXFLAGS=-O2
+AM_CXXFLAGS=-O2 -fPIC
 
 INCLUDES		= -I$(includedir) -I$(bfd_h_location) -I$(top_srcdir)/src -I $(top_builddir)/src
 
=== trunk/src/avrdevice.h
==================================================================
--- trunk/src/avrdevice.h	(revision 621)
+++ trunk/src/avrdevice.h	(local)
@@ -94,7 +94,10 @@
 #endif
 
         AvrDevice(unsigned int ioSpaceSize, unsigned int IRamSize, unsigned int ERamSize, unsigned int flashSize);
-        int Step(bool &, SystemClockOffset *nextStepIn_ns =0);
+	/*! Steps the AVR core.
+	  \param untilCoreStepFinished iff true, steps a core step and not a
+	  single clock cycle. */
+        int Step(bool &untilCoreStepFinished, SystemClockOffset *nextStepIn_ns =0);
         void Reset();
         void SetClockFreq(SystemClockOffset f);
         SystemClockOffset GetClockFreq();
=== trunk/src/main.cpp
==================================================================
--- trunk/src/main.cpp	(revision 621)
+++ trunk/src/main.cpp	(local)
@@ -37,9 +37,7 @@
 #include "global.h"
 #include "flash.h"
 #include "avrdevice.h"
-#include "at8515.h"
-#include "atmega128.h"
-#include "at4433.h"
+#include "avrfactory.h"
 #include "gdb.h"
 #include "ui.h"
 #include "systemclock.h"
@@ -198,9 +196,9 @@
                 cout << "-T --terminate <label> or <address> stops simulation if PC runs on <label> or <address>" << endl;
                 cout << endl;
                 cout << "Supported devices:" << endl;
-                cout << "at90s8515" << endl;
-                cout << "at90s4433" << endl;
-                cout << "atmega128" << endl;
+                cout << "AT90S4433" << endl;
+                cout << "AT90S8515" << endl;
+                cout << "ATMEGA128" << endl;
                 cout << endl;
 
                 exit(0);
@@ -209,19 +207,7 @@
     }
 
     /* now we create the device */
-    AvrDevice *dev1;
-    if (devicename=="unknown") {
-        dev1= new AvrDevice_at90s8515;
-    } else if (devicename=="at90s8515") {
-        dev1= new AvrDevice_at90s8515;
-    } else if (devicename=="atmega128") {
-        dev1= new AvrDevice_atmega128;
-    } else if (devicename=="at90s4433") {
-        dev1= new AvrDevice_at90s4433;
-    } else {
-        cerr << "Not a valid device" << endl;
-        exit(0);
-    }
+    AvrDevice *dev1=AvrFactory::instance().makeDevice(devicename);
 
     //if we want to insert some special "pipe" Registers we could do this here:
     if (readFromPipeFileName!="") {
=== trunk/src/pin.h
==================================================================
--- trunk/src/pin.h	(revision 621)
+++ trunk/src/pin.h	(local)
@@ -47,14 +47,19 @@
         NetInterface *connectedTo;  
     public:
 
-        Pin(const OpenDrain &od); 
+        Pin(const OpenDrain &od);
+
+	/*! Possible PIN states.
+	  \warning Please do not change the order of these values without
+	  thinking twice, as for example the simulavrxx VPI interface depends
+	  on this/exports this to verilog. */
         typedef enum {
+            LOW,
+            HIGH,
             SHORTED,
-            HIGH,
             PULLUP,
             TRISTATE,
             PULLDOWN,
-            LOW,
             ANALOG,
             ANALOG_SHORTED
         }T_Pinstate;
=== trunk/src/systemclocktypes.h
==================================================================
--- trunk/src/systemclocktypes.h	(revision 621)
+++ trunk/src/systemclocktypes.h	(local)
@@ -23,7 +23,7 @@
 
 /*
 This file should be removed or integrated somewhere in the near future
-Actually it is only putted to make the compile possible because of 
+Actually it is only put to make the compile possible because of 
 infinite recursion in header dependencies which I have not fixed until now
 */
 
=== trunk/src/avrfactory.cpp
==================================================================
--- trunk/src/avrfactory.cpp	(revision 621)
+++ trunk/src/avrfactory.cpp	(local)
@@ -0,0 +1,57 @@
+/*
+ ****************************************************************************
+ *
+ * simulavr - A simulator for the Atmel AVR family of microcontrollers.
+ * Copyright (C) 2001, 2002, 2003   Klaus Rudolph		
+ * Copyright (C) 2007 Onno Kortmann
+ * 
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ****************************************************************************
+ */
+#include "config.h"
+#include "at4433.h"
+#include "at8515.h"
+#include "atmega128.h"
+#include "avrfactory.h"
+
+using namespace std;
+
+/* FIXME: Replace this factory with an automatically and pluggable
+   factory pattern. (-> AVR devices register themselves.) */
+
+AvrDevice* AvrFactory::makeDevice(const std::string c) {
+    if (c=="AT90S4433") 
+	return new AvrDevice_at90s4433();
+    else if (c=="AT90S8515")
+	return new AvrDevice_at90s8515();
+    else if (c=="ATMEGA128")
+	return new AvrDevice_atmega128();
+    else {
+	cerr << "Invalid device specification:" << c << endl;
+	exit(1);
+    }
+}
+
+AvrFactory& AvrFactory::instance() {
+    static AvrFactory *f;
+    if (!f) {
+	f=new AvrFactory();
+	return *f;
+    }
+}
+
+AvrFactory::AvrFactory() {}
+
=== trunk/src/avrfactory.h
==================================================================
--- trunk/src/avrfactory.h	(revision 621)
+++ trunk/src/avrfactory.h	(local)
@@ -0,0 +1,46 @@
+/*
+ ****************************************************************************
+ *
+ * simulavr - A simulator for the Atmel AVR family of microcontrollers.
+ * Copyright (C) 2001, 2002, 2003   Klaus Rudolph		
+ * Copyright (C) 2007 Onno Kortmann
+ * 
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ****************************************************************************
+ */
+#ifndef AVRFACTORY
+#define AVRFACTORY
+
+#include <string>
+
+class AvrDevice;
+
+class AvrFactory {
+ public:
+    /*! Produces an AVR device according to the configuration string.
+      Right now, the configuration string is simply the full name of the AVR
+      device, like AT90S4433 or ATMEGA128.
+      */
+    AvrDevice* makeDevice(const std::string configuration);
+
+    //! Singleton class access. 
+    static AvrFactory& instance();
+ private:
+    AvrFactory();
+};
+
+
+#endif
=== trunk/src/vpi.cpp
==================================================================
--- trunk/src/vpi.cpp	(revision 621)
+++ trunk/src/vpi.cpp	(local)
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2002 Stephen Williams (address@hidden)
+ * Copyright (c) 2007 Onno Kortmann <address@hidden>
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 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, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+/* This has been adapted from the hello_vpi.c example in the Icarus Verilog Source
+   Distribution. */
+
+#include  <vpi_user.h>
+#include "avrdevice.h"
+#include "avrfactory.h"
+
+static std::vector<AvrDevice*> devices;
+
+static bool checkHandle(int h) {
+    if (h>=devices.size()) {
+	vpi_printf("There has never been an AVR device with the handle %d.", h);
+	vpi_control(vpiFinish, 1);
+	return false;
+    } else {
+	if (!devices[h]) {
+	    vpi_printf("The AVR with handle %d has already been destroyed.", h);
+	    vpi_control(vpiFinish, 1);
+	    return false;
+	}
+    }
+    return true;
+}
+
+/*!
+  This function creates a new AVR core and `returns' a handle to it
+  Usage from Verilog:
+
+  $avr_create(handle, device, progname)
+
+  where
+  handle is an integer handle by which the avr can be accessed in all other
+  calls here
+  devic is the name of the AVR device to create
+  progname is the path to the flash program elf binary
+*/
+static PLI_INT32 avr_create_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    vpiHandle _device=vpi_scan(argv);
+    vpiHandle _progname=vpi_scan(argv);
+
+    value.format = vpiStringVal;
+    vpi_get_value(_device, &value);
+    std::string device=value.value.str;
+
+    value.format = vpiStringVal;
+    vpi_get_value(_progname, &value);
+    std::string progname=value.value.str;
+
+    // FIXME: Better error handling than exit(...) here. Exceptions!
+    AvrDevice* dev;
+    devices.push_back(dev=AvrFactory::instance().makeDevice(device));
+    
+    /*
+    if (device=="AT90S4433") {
+	devices.push_back(dev=new AvrDevice_at90s4433());
+    } else {
+	vpi_printf("Invalid AVR device: %s\n", device.c_str());
+	vpi_control(vpiFinish, 1);
+	return 0;
+    }
+    if (!dev) {
+	vpi_printf("Can't create backend AVR simulavrxx device.");
+	vpi_control(vpiFinish, 1);
+	return 0;
+	}*/
+    
+    dev->Load(progname.c_str());
+    
+    value.format = vpiIntVal;
+    value.value.integer = devices.size()-1;
+    vpi_put_value(handle, &value, 0, vpiNoDelay);
+}
+
+/*!
+  This function resets an existing AVR core. 
+  Usage from Verilog:
+
+  $avr_reset(handle)
+*/
+static PLI_INT32 avr_reset_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    
+    value.format = vpiIntVal;
+    vpi_get_value(handle, &value);
+    int h = value.value.integer;
+    if (!checkHandle(h)) return 0;
+    
+    devices[h]->Reset();
+    return 0;
+}
+
+/*!
+  This function destroys an existing AVR core. 
+  Usage from Verilog:
+
+  $avr_destroy(handle)
+*/
+static PLI_INT32 avr_destroy_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    
+    value.format = vpiIntVal;
+    vpi_get_value(handle, &value);
+    int h = value.value.integer;
+    if (!checkHandle(h)) return 0;
+    
+    /* We leak a bit of memory for the pointer in the vector,
+       but... what the hell! */
+    delete devices[h];
+    devices[h]=0;
+    return 0;
+}
+
+/*!
+  This function ticks the clock of an AVR.
+  Usage from Verilog:
+
+  $avr_tick(handle)
+*/
+static PLI_INT32 avr_tick_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    
+    value.format = vpiIntVal;
+    vpi_get_value(handle, &value);
+    int h = value.value.integer;
+    if (!checkHandle(h)) return 0;
+    
+    /* Lets do a HARDWARE step in the AVR core.
+       uC stepping in opcode units does not seem to make any sense from this
+       HDL view. But it looks like avrdevice does have no interest in this
+       value at all? */
+    bool no_hw=false;
+    devices[h]->Step(no_hw); 
+    return 0;
+}
+
+/*!
+  This function reads an AVR pin value.
+  Usage from verilog:
+  $avr_pin_get(handle, name, value)
+*/
+static PLI_INT32 avr_get_pin_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    vpiHandle _name=vpi_scan(argv);
+    vpiHandle _value=vpi_scan(argv);
+    value.format = vpiIntVal;
+    vpi_get_value(handle, &value);
+    int h = value.value.integer;
+    if (!checkHandle(h)) return 0;
+
+    value.format = vpiStringVal;
+    vpi_get_value(_name, &value);
+    std::string name=value.value.str;
+
+    Pin *pin=devices[h]->GetPin(name.c_str());
+    int ret(pin->outState);
+
+    value.format = vpiIntVal;
+    value.value.integer = ret;
+    vpi_put_value(_value, &value, 0, vpiNoDelay);
+    return 0;
+}
+
+/*!
+  This function sets an AVR pin value.
+  Usage from verilog:
+  $avr_pin_set(handle, name, val)
+*/
+static PLI_INT32 avr_set_pin_tf(char *xx) {
+    s_vpi_value value;
+    vpiHandle ch = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, ch);
+    vpiHandle handle=vpi_scan(argv);
+    vpiHandle _name=vpi_scan(argv);
+    vpiHandle _value=vpi_scan(argv);
+    value.format = vpiIntVal;
+    vpi_get_value(handle, &value);
+    int h = value.value.integer;
+    if (!checkHandle(h)) return 0;
+
+    value.format = vpiStringVal;
+    vpi_get_value(_name, &value);
+    std::string name=value.value.str;
+
+    Pin *pin=devices[h]->GetPin(name.c_str());
+
+    value.format = vpiIntVal;
+    vpi_get_value(_value, &value);
+    int val=value.value.integer;
+    /* FIXME: Simply exports AVR pin states to verilog. This
+       a breach of abstractions. */
+    pin->SetInState(Pin::T_Pinstate(val));
+    return 0;
+}
+
+static void register_tasks() {
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_create";
+	tf_data.calltf    = avr_create_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_reset";
+	tf_data.calltf    = avr_reset_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_destroy";
+	tf_data.calltf    = avr_destroy_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_tick";
+	tf_data.calltf    = avr_tick_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_get_pin";
+	tf_data.calltf    = avr_get_pin_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+
+    {
+	s_vpi_systf_data tf_data;
+      
+	tf_data.type      = vpiSysTask;
+	tf_data.tfname    = "$avr_set_pin";
+	tf_data.calltf    = avr_set_pin_tf;
+	tf_data.compiletf = 0;
+	tf_data.sizetf    = 0;
+	vpi_register_systf(&tf_data);
+    }
+}
+
+/* This is a table of register functions. This table is the external symbol
+   that the simulator looks for when loading this .vpi module. */
+void (*vlog_startup_routines[])() = {
+    &register_tasks,
+    0
+};