origen_sim 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a37dd737642a62e60b4cc98f47928b659004f3b89e771aa9efabfd2610622080
-  data.tar.gz: 74309fc46e200d299e8704e4599fdd3553abd1cb380ec56a9c7d926f1a7728f7
+  metadata.gz: 43c4c9b46fca49ffc621f5fe6acc1e10c0961db6453c3a67f09e8bc2e0bc233f
+  data.tar.gz: bc825d94eb0859054fbfcd1cb7bbae4c980a8a1b356c489ecbfb2308f0b17697
 SHA512:
-  metadata.gz: e94281aa75824657de8e4df717201db48d8b8fc02669b84b78e34f271533a119e88b6881a28d41ce6ecb5e2d12192d78d042764d6efabb2548e8c3fec7069080
-  data.tar.gz: 0404e46a47d0d02d5933ed238fc84b6660f3cbae5f70d7c632c4ca2cb87c8ada52b8a2b382becf4e59b2c276a423890b569de6a227b6d31f329eee26ca66711f
+  metadata.gz: 731d4bf00e0f801b08063445a17373dc8d8f48162ed517db8fe154547e7c384e1bbb6b9ab4e4432fb995cc20bd840a0792dc3700e66b3a85cc92d1ee444cc910
+  data.tar.gz: f68c396143c15f87f210d6c94d2d5020bc07d21c2da3a8664b4e85f6c9fcd3c039e82b963e2d539d58d5bd46cd5b5670450f4f5615cb1359dad353d9f3b9a84d

data/config/application.rb

@@ -42,7 +42,7 @@ class OrigenSimApplication < Origen::Application
         section.page :flows, heading: "Simulating Flows"
         section.page :log, heading: "Simulator Log Output"
         section.page :artifacts, heading: "Artifacts"
-        section.page :debugging, heading: "Interactive Debugging"
+        section.page :debugging, heading: "Debugging"
       end
     end
   }

data/config/shared_commands.rb

@@ -1,15 +1,20 @@
 # The requested command is passed in here as @command
 case @command
 
-when 'generate'
+when 'generate', 'program'
   $use_fast_probe_depth = false
   @application_options << ["--fast", "Fast simulation, minimum probe depth"]
   $use_fast_probe_depth = ARGV.include?('--fast')
 
-  @application_options << ["--sim_capture", "Update sim captures (ignored when not running a simulation)"]
-  Origen.app!.update_sim_captures = ARGV.include?('--sim_capture')
+  @application_options << ["--sim_capture", "Update sim captures (ignored when not running a simulation)", ->(options) {
+    Origen.app!.update_sim_captures = true
+  }]
 
-  @application_options << ["--flow NAME", "Simulate multiple patterns back-back within a single simulation with the given name", ->(options, name) { OrigenSim.flow = name }]
+  unless @command == 'program'
+    @application_options << ["--flow NAME", "Simulate multiple patterns back-back within a single simulation with the given name", ->(options, name) {
+      OrigenSim.flow = name
+    }]
+  end
 
   @application_options << ["--socket_dir PATH", "Specify the directory to be used for creating the Origen -> simulator communication socket (/tmp by default) ", ->(options, path) {
     FileUtils.mkdir_p(path) unless File.exist?(path)
@@ -18,6 +23,10 @@ when 'generate'
     OrigenSim.socket_dir = path
   }]
 
+  @application_options << ["--max_errors VALUE", Integer, "Override the maximum number of errors allowed in a simulation before aborting ", ->(options, value) {
+    OrigenSim.max_errors = value
+  }]
+
 when "sim:ci", "origen_sim:ci"
   require "#{Origen.root!}/lib/origen_sim/commands/ci"
   exit 0

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenSim
   MAJOR = 0
-  MINOR = 15
+  MINOR = 16
   BUGFIX = 0
   DEV = nil
 

data/ext/bridge.c

@@ -10,9 +10,11 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
+#include <stdarg.h>
 
 #define MAX_NUMBER_PINS 2000
 #define MAX_WAVE_EVENTS 50
+#define MAX_TRANSACTION_ERRORS 128
 
 typedef struct Pin {
   char *name;
@@ -42,8 +44,22 @@ typedef struct Wave {
   int active_pin_count;
 } Wave;
 
-static uint64_t period_in_ps;
-static long repeat = 0;
+// Used to record a miscompare event that is used by OrigenSim to work out the actual data
+// from a failed register read transaction
+typedef struct Miscompare {
+  char *pin_name;
+  unsigned long long cycle;
+  int expected;
+  int received;
+} Miscompare;
+
+static Miscompare miscompares[MAX_TRANSACTION_ERRORS];
+static int transaction_error_count = 0;
+static bool transaction_open = false;
+static int match_loop_error_count = 0;
+static bool match_loop_open = false;
+static uint64_t period_in_simtime_units;
+static unsigned long repeat = 0;
 static Pin pins[MAX_NUMBER_PINS];
 static int number_of_pins = 0;
 // Allocate space for a unique wave for each pin, in reality it will be much less
@@ -53,27 +69,34 @@ static Wave compare_waves[MAX_NUMBER_PINS];
 static int number_of_compare_waves = 0;
 static int runtime_errors = 0;
 static int log_messages = 0;
-
-static void bridge_set_period(char*);
-static void bridge_define_pin(char*, char*, char*, char*);
-static void bridge_define_wave(char*, char*, char*);
-static void bridge_cycle(void);
-static void bridge_drive_pin(char*, char*);
-static void bridge_compare_pin(char*, char*);
-static void bridge_capture_pin(char*);
-static void bridge_stop_capture_pin(char*);
-static void bridge_dont_care_pin(char*);
-static void bridge_register_wave_events(void);
-static void bridge_register_wave_event(int, int, int, uint64_t);
-static void bridge_enable_drive_wave(Pin*);
-static void bridge_disable_drive_wave(Pin*);
-static void bridge_enable_compare_wave(Pin*);
-static void bridge_disable_compare_wave(Pin*);
-static void bridge_clear_waves_and_pins(void);
-static bool bridge_is_drive_whole_cycle(Pin*);
+static int error_count = 0;
+static int max_errors = 100;
+static unsigned long long cycle_count = 0;
+static bool max_errors_exceeded = false;
+static bool max_errors_exceeded_during_transaction = false;
+
+static void set_period(char*);
+static void define_pin(char*, char*, char*, char*);
+static void define_wave(char*, char*, char*);
+static void cycle(void);
+static void drive_pin(char*, char*);
+static void compare_pin(char*, char*);
+static void capture_pin(char*);
+static void stop_capture_pin(char*);
+static void dont_care_pin(char*);
+static void register_wave_events(void);
+static void register_wave_event(int, int, int, uint64_t);
+static void enable_drive_wave(Pin*);
+static void disable_drive_wave(Pin*);
+static void enable_compare_wave(Pin*);
+static void disable_compare_wave(Pin*);
+static void clear_waves_and_pins(void);
+static bool is_drive_whole_cycle(Pin*);
+static void origen_log(int, const char*, ...);
 static void end_simulation(void);
+static void on_max_errors_exceeded(void);
 
-static void bridge_define_pin(char * name, char * pin_ix, char * drive_wave_ix, char * compare_wave_ix) {
+static void define_pin(char * name, char * pin_ix, char * drive_wave_ix, char * compare_wave_ix) {
   int index = atoi(pin_ix);
   Pin *pin = &pins[index];
   number_of_pins += 1;
@@ -98,7 +121,7 @@ static void bridge_define_pin(char * name, char * pin_ix, char * drive_wave_ix,
   free(data);
 
   if (!(*pin).data) {
-    vpi_printf("WARNING: Your DUT defines pin '%s', however it is not present in the testbench and will be ignored\n", (*pin).name);
+    origen_log(LOG_WARNING, "Your DUT defines pin '%s', however it is not present in the testbench and will be ignored", (*pin).name);
     (*pin).present = false;
   } else {
     (*pin).present = true;
@@ -132,7 +155,7 @@ static void bridge_define_pin(char * name, char * pin_ix, char * drive_wave_ix,
 }
 
 
-static void bridge_define_wave(char * index, char * compare, char * events) {
+static void define_wave(char * index, char * compare, char * events) {
   int ix = atoi(index);
   Wave * wave;
  
@@ -165,7 +188,7 @@ static void bridge_define_wave(char * index, char * compare, char * events) {
 }
 
 
-static void bridge_register_wave_events() {
+static void register_wave_events() {
   for (int i = 0; i < number_of_drive_waves; i++) {
 
     if (drive_waves[i].active_pin_count) {
@@ -179,7 +202,7 @@ static void bridge_register_wave_events() {
         // TODO: May save some time by calling directly at time 0
         //if (time == 0) {
         //} else {
-          bridge_register_wave_event(i, x, 0, time);
+          register_wave_event(i, x, 0, time);
         //}
         x++;
       }
@@ -199,7 +222,7 @@ static void bridge_register_wave_events() {
         // TODO: May save some time by calling directly at time 0
         //if (time == 0) {
         //} else {
-          bridge_register_wave_event(i, x, 1, time);
+          register_wave_event(i, x, 1, time);
         //}
         x++;
       }
@@ -212,7 +235,7 @@ static void bridge_register_wave_events() {
 /// This is done by adding the pin to the wave's active pin list, if the wave has
 /// at least one pin in its list, the necessary callbacks will get triggered on every
 /// cycle to implement the required waveform.
-static void bridge_enable_drive_wave(Pin * pin) {
+static void enable_drive_wave(Pin * pin) {
   Wave *wave = &drive_waves[(*pin).drive_wave];
 
   (*wave).active_pins[(*wave).active_pin_count] = pin;
@@ -221,11 +244,11 @@ static void bridge_enable_drive_wave(Pin * pin) {
 }
 
 
-static void bridge_disable_drive_wave(Pin * pin) {
+static void disable_drive_wave(Pin * pin) {
   Wave *wave = &drive_waves[(*pin).drive_wave];
 
   if ((*wave).active_pin_count == 0) {
-    vpi_printf("Wanted to disable drive on pin %i, but its drive wave has no active pins!\n", (*pin).index);
+    origen_log(LOG_ERROR, "Wanted to disable drive on pin %i, but its drive wave has no active pins!", (*pin).index);
     end_simulation();
   }
 
@@ -241,7 +264,7 @@ static void bridge_disable_drive_wave(Pin * pin) {
   (*wave).active_pin_count -= 1;
 }
 
-static void bridge_enable_compare_wave(Pin * pin) {
+static void enable_compare_wave(Pin * pin) {
   Wave *wave = &compare_waves[(*pin).compare_wave];
 
   (*wave).active_pins[(*wave).active_pin_count] = pin;
@@ -249,7 +272,7 @@ static void bridge_enable_compare_wave(Pin * pin) {
   (*wave).active_pin_count += 1;
 }
 
-static void bridge_disable_compare_wave(Pin * pin) {
+static void disable_compare_wave(Pin * pin) {
   Wave *wave = &compare_waves[(*pin).compare_wave];
 
   // If pin is last, we can clear it by just decrementing the active pin counter
@@ -265,7 +288,7 @@ static void bridge_disable_compare_wave(Pin * pin) {
 }
 
 
-static void bridge_clear_waves_and_pins() {
+static void clear_waves_and_pins() {
   for (int i = 0; i < number_of_pins; i++) {
     Pin *pin = &pins[i];
     free((*pin).name);
@@ -276,14 +299,14 @@ static void bridge_clear_waves_and_pins() {
 }
 
 
-static void bridge_set_period(char * p_in_ps_str) {
-  uint64_t p = (uint64_t) strtol(p_in_ps_str, NULL, 10);
-  period_in_ps = p;
-  bridge_clear_waves_and_pins();
+static void set_period(char * p_in_simtime_units_str) {
+  uint64_t p = (uint64_t) strtol(p_in_simtime_units_str, NULL, 10);
+  period_in_simtime_units = p;
+  clear_waves_and_pins();
 }
 
 
-static bool bridge_is_drive_whole_cycle(Pin * pin) {
+static bool is_drive_whole_cycle(Pin * pin) {
   Wave *wave = &drive_waves[(*pin).drive_wave];
 
   // If drive wave only has one event
@@ -298,7 +321,7 @@ static bool bridge_is_drive_whole_cycle(Pin * pin) {
 
 
 /// Immediately drives the given pin to the given value
-static void bridge_drive_pin(char * index, char * val) {
+static void drive_pin(char * index, char * val) {
   Pin *pin = &pins[atoi(index)];
   s_vpi_value v = {vpiIntVal, {0}};
 
@@ -316,15 +339,15 @@ static void bridge_drive_pin(char * index, char * val) {
     if ((*pin).previous_state != 1) {
       // If the drive is for the whole cycle, then we can enable it here
       // and don't need a callback
-      if (bridge_is_drive_whole_cycle(pin)) {
+      if (is_drive_whole_cycle(pin)) {
         v.value.integer = 1;
         vpi_put_value((*pin).drive, &v, NULL, vpiNoDelay);
       } else {
-        bridge_enable_drive_wave(pin);
+        enable_drive_wave(pin);
       }
 
       if ((*pin).previous_state == 2) {
-        bridge_disable_compare_wave(pin);
+        disable_compare_wave(pin);
       }
       (*pin).previous_state = 1;
     }
@@ -333,7 +356,7 @@ static void bridge_drive_pin(char * index, char * val) {
 
 
 /// Immediately sets the given pin to compare against the given value
-static void bridge_compare_pin(char * index, char * val) {
+static void compare_pin(char * index, char * val) {
   Pin *pin = &pins[atoi(index)];
   s_vpi_value v = {vpiIntVal, {0}};
 
@@ -350,10 +373,10 @@ static void bridge_compare_pin(char * index, char * val) {
     
     // If it is already comparing the wave will already be setup
     if ((*pin).previous_state != 2) {
-      bridge_enable_compare_wave(pin);
+      enable_compare_wave(pin);
       if ((*pin).previous_state == 1) {
-        if (!bridge_is_drive_whole_cycle(pin)) {
-          bridge_disable_drive_wave(pin);
+        if (!is_drive_whole_cycle(pin)) {
+          disable_drive_wave(pin);
         }
       }
       (*pin).previous_state = 2;
@@ -364,22 +387,22 @@ static void bridge_compare_pin(char * index, char * val) {
 
 /// Immediately sets the given pin to capture by registering it for compare
 /// but with its capture flag set
-static void bridge_capture_pin(char * index) {
+static void capture_pin(char * index) {
   Pin *pin = &pins[atoi(index)];
   (*pin).capture_en = true;
-  bridge_compare_pin(index, "0");
+  compare_pin(index, "0");
 }
 
 
 /// Immediately sets the given pin to stop capture by clearing its capture flag
-static void bridge_stop_capture_pin(char * index) {
+static void stop_capture_pin(char * index) {
   Pin *pin = &pins[atoi(index)];
   (*pin).capture_en = false;
 }
 
 
 /// Immediately sets the given pin to don't compare
-static void bridge_dont_care_pin(char * index) {
+static void dont_care_pin(char * index) {
   Pin *pin = &pins[atoi(index)];
   s_vpi_value v = {vpiIntVal, {0}};
 
@@ -391,12 +414,12 @@ static void bridge_dont_care_pin(char * index) {
 
     if ((*pin).previous_state != 0) {
       if ((*pin).previous_state == 1) {
-        if (!bridge_is_drive_whole_cycle(pin)) {
-          bridge_disable_drive_wave(pin);
+        if (!is_drive_whole_cycle(pin)) {
+          disable_drive_wave(pin);
         }
       }
       if ((*pin).previous_state == 2) {
-        bridge_disable_compare_wave(pin);
+        disable_compare_wave(pin);
       }
       (*pin).previous_state = 0;
     }
@@ -404,8 +427,8 @@ static void bridge_dont_care_pin(char * index) {
 }
 
 
-/// Callback handler to implement the events registered by bridge_register_wave_event
-PLI_INT32 bridge_apply_wave_event_cb(p_cb_data data) {
+/// Callback handler to implement the events registered by register_wave_event
+PLI_INT32 apply_wave_event_cb(p_cb_data data) {
   s_vpi_value v = {vpiIntVal, {0}};
   s_vpi_value v2 = {vpiIntVal, {0}};
 
@@ -427,7 +450,7 @@ PLI_INT32 bridge_apply_wave_event_cb(p_cb_data data) {
         d = 0;
         break;
       default :
-        vpi_printf("ERROR: Unknown compare event: %c\n", (*wave).events[*event_ix].data);
+        origen_log(LOG_ERROR, "Unknown compare event: %c", (*wave).events[*event_ix].data);
         runtime_errors += 1;
         end_simulation();
         return 1;
@@ -469,7 +492,7 @@ PLI_INT32 bridge_apply_wave_event_cb(p_cb_data data) {
         on = 0;
         break;
       default :
-        vpi_printf("ERROR: Unknown drive event: %c\n", (*wave).events[*event_ix].data);
+        origen_log(LOG_ERROR, "Unknown drive event: %c\n", (*wave).events[*event_ix].data);
         runtime_errors += 1;
         end_simulation();
         return 1;
@@ -496,7 +519,7 @@ PLI_INT32 bridge_apply_wave_event_cb(p_cb_data data) {
 
 
 /// Registers a callback to apply the given wave during this cycle
-static void bridge_register_wave_event(int wave_ix, int event_ix, int compare, uint64_t delay_in_ps) {
+static void register_wave_event(int wave_ix, int event_ix, int compare, uint64_t delay_in_simtime_units) {
   s_cb_data call;
   s_vpi_time time;
 
@@ -513,11 +536,11 @@ static void bridge_register_wave_event(int wave_ix, int event_ix, int compare, u
 
   time.type = vpiSimTime;
 
-  time.high = (uint32_t)(delay_in_ps >> 32);
-  time.low  = (uint32_t)(delay_in_ps);
+  time.high = (uint32_t)(delay_in_simtime_units >> 32);
+  time.low  = (uint32_t)(delay_in_simtime_units);
 
   call.reason    = cbAfterDelay;
-  call.cb_rtn    = bridge_apply_wave_event_cb;
+  call.cb_rtn    = apply_wave_event_cb;
   call.obj       = 0;
   call.time      = &time;
   call.value     = 0;
@@ -534,6 +557,28 @@ PLI_INT32 bridge_init() {
 }
 
 
+/// Send output to the Origen log, this will be automatically timestamped to the simulation and
+/// sprintf type arguments can be supplied when calling:
+///
+///    origen_log(LOG_ERROR, "Wanted to disable drive on pin %i, but its drive wave has no active pins!", (*pin).index);
+///    origen_log(LOG_INFO, "Something to tell you about");
+static void origen_log(int type, const char * fmt, ...) {
+  s_vpi_time now;
+  int max_msg_len = 2048;
+  char msg[max_msg_len];
+  va_list aptr;
+
+  now.type = vpiSimTime;
+  vpi_get_time(0, &now);
+
+  va_start(aptr, fmt);
+  vsprintf(msg, fmt, aptr);
+  va_end(aptr);
+
+  vpi_printf("!%d![%u,%u] %s\n", type, now.high, now.low, msg);
+};
+
+
 /// Waits and responds to instructions from Origen (to set pin states).
 /// When Origen requests a cycle, time will be advanced and this func will be called again.
 PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
@@ -542,6 +587,8 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
   char msg[max_msg_len];
   char comment[128];
   int err;
+  int timescale;
+  int type;
   char *opcode, *arg1, *arg2, *arg3, *arg4;
   vpiHandle handle;
   s_vpi_value v;
@@ -550,6 +597,7 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
 
     err = client_get(max_msg_len, msg);
     if (err) {
+      // Don't send to the Origen log since Origen may not be there
       vpi_printf("ERROR: Failed to receive from Origen!\n");
       end_simulation();
       return 1;
@@ -569,211 +617,317 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
 
     opcode = strtok(msg, "^");
 
-    switch(*opcode) {
-      // Define pin
-      //   0^pin_name^pin_index^drive_wave_ix^capture_wave_ix
-      //
-      //   0 for the wave indexes means the default, custom waves
-      //   must therefore start from index 1
-      //
-      //   The pin index must be uniquely assigned to the pin by the caller
-      //   and must be less than MAX_NUMBER_PINS
-      //
-      //   0^tdi^12^0^0  
-      case '0' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-        arg3 = strtok(NULL, "^");
-        arg4 = strtok(NULL, "^");
-        //DEBUG("Define Pin: %s, %s, %s, %s\n", arg1, arg2, arg3, arg4);
-        bridge_define_pin(arg1, arg2, arg3, arg4);
-        break;
-      // Set Period
-      //   1^100000
-      case '1' :
-        arg1 = strtok(NULL, "^");
-        bridge_set_period(arg1);
-        break;
-      // Drive Pin
-      //   2^pin_index^data
-      //
-      //   2^12^0
-      //   2^12^1
-      case '2' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-        //DEBUG("Drive Pin: %s, %s\n", arg1, arg2);
-        bridge_drive_pin(arg1, arg2);
-        break;
-      // Cycle
-      //   3^number_of_cycles
-      //
-      //   3^1
-      //   3^65535
-      case '3' :
-        arg1 = strtok(NULL, "^");
-        repeat = strtol(arg1, NULL, 10);
-        if (repeat) {
-          repeat = repeat - 1;
-        }
-        bridge_cycle();
-        return 0;
-      // Compare Pin
-      //   4^pin_index^data
-      //
-      //   4^14^0
-      //   4^14^1
-      case '4' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-        bridge_compare_pin(arg1, arg2);
-        break;
-      // Don't Care Pin
-      //   5^pin_index
-      //
-      //   5^14
-      case '5' :
-        arg1 = strtok(NULL, "^");
-        bridge_dont_care_pin(arg1);
-        break;
-      // Define wave
-      //   6^wave_index^compare^events
-      //
-      //   0 for the wave indexes means the default, custom waves
-      //   must therefore start from index 1
-      //
-      //   0 for the compare parameter means it is a drive wave, 1 means it is
-      //   for when the pin is in compare mode
-      //
-      //   Some example events are shown below:
-      //
-      //   6^1^0^0_D_25_0_50_D_75_0  // Drive at 0ns, off at 25ns, drive at 50ns, off at 75ns
-      case '6' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-        arg3 = strtok(NULL, "^");
-        //DEBUG("Define Wave: %s, %s, %s\n", arg1, arg2, arg3);
-        bridge_define_wave(arg1, arg2, arg3);
-        break;
-      // Sync-up
-      //   7^
-      case '7' :
-        client_put("OK!\n");
-        break;
-      // Complete
-      //   8^
-      case '8' :
-        end_simulation();
-        return 0;
-      // Peek
-      //   Returns the current value of the given net
-      //
-      //   9^origen.debug.errors
-      case '9' :
-        arg1 = strtok(NULL, "^");
-        handle = vpi_handle_by_name(arg1, NULL);
-        if (handle) {
-          //v.format = vpiDecStrVal; // Seems important to set this before get
-          v.format = vpiBinStrVal;
-          vpi_get_value(handle, &v);
-          //DEBUG("%s\n", v.value.str);
-          sprintf(msg, "%s\n", v.value.str);
-          client_put(msg);
-        } else {
-          client_put("FAIL\n");
-        }
-        break;
-      // Set Pattern Name
-      //   a^atd_ramp_25mhz
-      case 'a' :
-        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.pattern"), NULL);
-        arg1 = strtok(NULL, "^");
-
-        v.format = vpiStringVal;
-        v.value.str = arg1;
-        vpi_put_value(handle, &v, NULL, vpiNoDelay);
-        break;
-      // Poke
-      //   Sets the given value on the given net, the number should be
-      //   given as a decimal string
-      //
-      //   b^origen.debug.errors^15
-      case 'b' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-        handle = vpi_handle_by_name(arg1, NULL);
-        if (handle) {
-          v.format = vpiDecStrVal;
+    if (!max_errors_exceeded || (max_errors_exceeded && (
+      // When max_errors_exceeded, only continue to process the following opcodes.
+      // These are the ones required to enable a controlled shutdown driven by the main Origen process
+      // and also any that return data to Origen so that the main process does not get blocked:
+      //     Sync-up           End Simulation    Peek              Flush               Log
+            *opcode == '7' || *opcode == '8' || *opcode == '9' || *opcode == 'j' || *opcode == 'k' ||
+      //     Get version      Get timescale     Read reg trans   Get cycle count
+            *opcode == 'i' || *opcode == 'l' || *opcode == 'n' || *opcode == 'o'
+      ))) {
+      switch(*opcode) {
+        // Define pin
+        //   0^pin_name^pin_index^drive_wave_ix^capture_wave_ix
+        //
+        //   0 for the wave indexes means the default, custom waves
+        //   must therefore start from index 1
+        //
+        //   The pin index must be uniquely assigned to the pin by the caller
+        //   and must be less than MAX_NUMBER_PINS
+        //
+        //   0^tdi^12^0^0  
+        case '0' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          arg3 = strtok(NULL, "^");
+          arg4 = strtok(NULL, "^");
+          //DEBUG("Define Pin: %s, %s, %s, %s\n", arg1, arg2, arg3, arg4);
+          define_pin(arg1, arg2, arg3, arg4);
+          break;
+        // Set Period
+        //   1^100000
+        case '1' :
+          arg1 = strtok(NULL, "^");
+          set_period(arg1);
+          break;
+        // Drive Pin
+        //   2^pin_index^data
+        //
+        //   2^12^0
+        //   2^12^1
+        case '2' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          //DEBUG("Drive Pin: %s, %s\n", arg1, arg2);
+          drive_pin(arg1, arg2);
+          break;
+        // Cycle
+        //   3^number_of_cycles
+        //
+        //   3^1
+        //   3^65535
+        case '3' :
+          arg1 = strtok(NULL, "^");
+          repeat = strtol(arg1, NULL, 10);
+          if (repeat) {
+            repeat = repeat - 1;
+          }
+          cycle();
+          return 0;
+        // Compare Pin
+        //   4^pin_index^data
+        //
+        //   4^14^0
+        //   4^14^1
+        case '4' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          compare_pin(arg1, arg2);
+          break;
+        // Don't Care Pin
+        //   5^pin_index
+        //
+        //   5^14
+        case '5' :
+          arg1 = strtok(NULL, "^");
+          dont_care_pin(arg1);
+          break;
+        // Define wave
+        //   6^wave_index^compare^events
+        //
+        //   0 for the wave indexes means the default, custom waves
+        //   must therefore start from index 1
+        //
+        //   0 for the compare parameter means it is a drive wave, 1 means it is
+        //   for when the pin is in compare mode
+        //
+        //   Some example events are shown below:
+        //
+        //   6^1^0^0_D_25_0_50_D_75_0  // Drive at 0ns, off at 25ns, drive at 50ns, off at 75ns
+        case '6' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          arg3 = strtok(NULL, "^");
+          //DEBUG("Define Wave: %s, %s, %s\n", arg1, arg2, arg3);
+          define_wave(arg1, arg2, arg3);
+          break;
+        // Sync-up
+        //   7^
+        case '7' :
+          client_put("OK!\n");
+          break;
+        // Complete
+        //   8^
+        case '8' :
+          end_simulation();
+          return 0;
+        // Peek
+        //   Returns the current value of the given net
+        //
+        //   9^origen.debug.errors
+        case '9' :
+          arg1 = strtok(NULL, "^");
+          handle = vpi_handle_by_name(arg1, NULL);
+          if (handle) {
+            //v.format = vpiDecStrVal; // Seems important to set this before get
+            v.format = vpiBinStrVal;
+            vpi_get_value(handle, &v);
+            //DEBUG("%s\n", v.value.str);
+            sprintf(msg, "%s\n", v.value.str);
+            client_put(msg);
+          } else {
+            client_put("FAIL\n");
+          }
+          break;
+        // Set Pattern Name
+        //   a^atd_ramp_25mhz
+        case 'a' :
+          handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.pattern"), NULL);
+          arg1 = strtok(NULL, "^");
+
+          v.format = vpiStringVal;
+          v.value.str = arg1;
+          vpi_put_value(handle, &v, NULL, vpiNoDelay);
+          break;
+        // Poke
+        //   Sets the given value on the given net, the number should be
+        //   given as a decimal string
+        //
+        //   b^origen.debug.errors^15
+        case 'b' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          handle = vpi_handle_by_name(arg1, NULL);
+          if (handle) {
+            v.format = vpiDecStrVal;
+            v.value.str = arg2;
+            vpi_put_value(handle, &v, NULL, vpiNoDelay);
+          }
+          break;
+        // Set Comment
+        //   c^0^Some comment about the pattern
+        case 'c' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+
+          strcpy(comment, ORIGEN_SIM_TESTBENCH_CAT("debug.comments"));
+          strcat(comment, arg1);
+
+          handle = vpi_handle_by_name(comment, NULL);
+
+          v.format = vpiStringVal;
           v.value.str = arg2;
           vpi_put_value(handle, &v, NULL, vpiNoDelay);
-        }
-        break;
-      // Set Comment
-      //   c^0^Some comment about the pattern
-      case 'c' :
-        arg1 = strtok(NULL, "^");
-        arg2 = strtok(NULL, "^");
-
-        strcpy(comment, ORIGEN_SIM_TESTBENCH_CAT("debug.comments"));
-        strcat(comment, arg1);
-
-        handle = vpi_handle_by_name(comment, NULL);
-
-        v.format = vpiStringVal;
-        v.value.str = arg2;
-        vpi_put_value(handle, &v, NULL, vpiNoDelay);
-        break;
-      // Log all messages
-      //   d^1  Turn logging on
-      //   d^0  Turn logging off
-      case 'd' :
-        arg1 = strtok(NULL, "^");
-        log_messages = atoi(arg1);
-        break;
-      // Capture Pin
-      //   e^pin_index
-      //
-      //   e^14
-      case 'e' :
-        arg1 = strtok(NULL, "^");
-        bridge_capture_pin(arg1);
-        break;
-      // Sync enable
-      case 'f' :
-        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
-        v.format = vpiDecStrVal;
-        v.value.str = "1";
-        vpi_put_value(handle, &v, NULL, vpiNoDelay);
-        break;
-      // Sync disable
-      case 'g' :
-        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
-        v.format = vpiDecStrVal;
-        v.value.str = "0";
-        vpi_put_value(handle, &v, NULL, vpiNoDelay);
-        break;
-      // Stop Capture Pin
-      //   h^pin_index
-      //
-      //   h^14
-      case 'h' :
-        arg1 = strtok(NULL, "^");
-        bridge_stop_capture_pin(arg1);
-        break;
-      // Get version, returns the version of OrigenSim the DUT object was compiled with
-      //   i^
-      case 'i' :
-        client_put(ORIGEN_SIM_VERSION"\n");
-        break;
-      // Flush
-      case 'j' :
-        vpi_flush();
-        break;
-      default :
-        vpi_printf("ERROR: Illegal message received from Origen: %s\n", orig_msg);
-        runtime_errors += 1;
-        end_simulation();
-        return 1;
+          break;
+        // Log all messages
+        //   d^1  Turn logging on
+        //   d^0  Turn logging off
+        case 'd' :
+          arg1 = strtok(NULL, "^");
+          log_messages = atoi(arg1);
+          break;
+        // Capture Pin
+        //   e^pin_index
+        //
+        //   e^14
+        case 'e' :
+          arg1 = strtok(NULL, "^");
+          capture_pin(arg1);
+          break;
+        // Sync enable
+        case 'f' :
+          handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
+          v.format = vpiDecStrVal;
+          v.value.str = "1";
+          vpi_put_value(handle, &v, NULL, vpiNoDelay);
+          break;
+        // Sync disable
+        case 'g' :
+          handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
+          v.format = vpiDecStrVal;
+          v.value.str = "0";
+          vpi_put_value(handle, &v, NULL, vpiNoDelay);
+          break;
+        // Stop Capture Pin
+        //   h^pin_index
+        //
+        //   h^14
+        case 'h' :
+          arg1 = strtok(NULL, "^");
+          stop_capture_pin(arg1);
+          break;
+        // Get version, returns the version of OrigenSim the DUT object was compiled with
+        //   i^
+        case 'i' :
+          client_put(ORIGEN_SIM_VERSION"\n");
+          break;
+        // Flush
+        case 'j' :
+          vpi_flush();
+          break;
+        // Log message
+        //   k^2^A message to output to the console/log
+        case 'k' :
+          arg1 = strtok(NULL, "^");
+          arg2 = strtok(NULL, "^");
+          type = atoi(arg1);
+          origen_log(type, arg2); 
+          break;
+        // Get timescale, returns a number that maps as follows:
+        //      -15 - fs
+        //      -14 - 10fs
+        //      -13 - 100fs
+        //      -12 - ps
+        //      -11 - 10ps
+        //      -10 - 100ps
+        //      -9  - ns
+        //      -8  - 10ns
+        //      -7  - 100ns
+        //      -6  - us
+        //      -5  - 10us
+        //      -4  - 100us
+        //      -3  - ms
+        //      -2  - 10ms
+        //      -1  - 100ms
+        //       0   - s
+        //       1   - 10s
+        //       2   - 100s
+        //   l^
+        case 'l' :
+          timescale = vpi_get(vpiTimeUnit, 0);
+          sprintf(msg, "%d\n", timescale);
+          client_put(msg);
+          break;
+        // Set max_errors
+        //   m^10
+        case 'm' :
+          arg1 = strtok(NULL, "^");
+          max_errors = atoi(arg1);
+          break;
+        // Read reg transaction
+        //   n^1   - Start transaction
+        //   n^0   - Stop transaction
+        case 'n' :
+          arg1 = strtok(NULL, "^");
+          
+          if (*arg1 == '1') {
+            transaction_error_count = 0;
+            transaction_open = true;
+          } else {
+            // Send Origen the error data
+            sprintf(msg, "%d,%d\n", transaction_error_count, MAX_TRANSACTION_ERRORS);
+            client_put(msg);
+            for (int i = 0; i < transaction_error_count; i++) {
+              Miscompare *m = &miscompares[i];
+
+              sprintf(msg, "%s,%llu,%d,%d\n", (*m).pin_name, (*m).cycle, (*m).expected, (*m).received);
+              client_put(msg);
+
+              free((*m).pin_name);
+            }
+            transaction_open = false;
+            if (max_errors_exceeded_during_transaction) {
+              on_max_errors_exceeded();
+            }
+          }
+          break;
+        // Get cycle count
+        //   o^
+        case 'o' :
+          sprintf(msg, "%llu\n", cycle_count);
+          client_put(msg);
+          break;
+        // Set cycle count
+        //   p^100
+        case 'p' :
+          arg1 = strtok(NULL, "^");
+          cycle_count = atoll(arg1);
+          break;
+        // Match loop
+        //   q^1    - Start match loop
+        //   q^0    - Stop match loop
+        case 'q' :
+          arg1 = strtok(NULL, "^");
+          
+          if (*arg1 == '1') {
+            match_loop_error_count = 0;
+            match_loop_open = true;
+          } else {
+            match_loop_open = false;
+          }
+          break;
+        default :
+          origen_log(LOG_ERROR, "Illegal message received from Origen: %s", orig_msg);
+          runtime_errors += 1;
+          end_simulation();
+          return 1;
+      }
+    } else {
+      // Simulation has been aborted but not told to end yet by Origen
+      repeat = 0;
+      set_period("1");
+      cycle();
     }
     free(orig_msg);
   }
@@ -790,29 +944,31 @@ static void end_simulation() {
   v.value.str = "1";
   vpi_put_value(handle, &v, NULL, vpiNoDelay);
   // Corner case during testing, the timeset may not have been set yet
-  bridge_set_period("1000");
+  set_period("1");
   // Do a cycle so that the simulation sees the edge on origen.finish
-  bridge_cycle();
+  cycle();
 }
 
 
-PLI_INT32 bridge_cycle_cb(p_cb_data data) {
+PLI_INT32 cycle_cb(p_cb_data data) {
   UNUSED(data);
   repeat = repeat - 1;
-  bridge_cycle();
+  cycle();
   return 0;
 }
 
 
 /// Registers a callback after a cycle period, the main server loop should unblock
 /// after calling this to allow the simulation to proceed for a cycle
-static void bridge_cycle() {
+static void cycle() {
   s_cb_data call;
   s_vpi_time time;
 
   time.type = vpiSimTime;
-  time.high = (uint32_t)(period_in_ps >> 32);
-  time.low  = (uint32_t)(period_in_ps);
+  time.high = (uint32_t)(period_in_simtime_units >> 32);
+  time.low  = (uint32_t)(period_in_simtime_units);
+
+  cycle_count++;
 
   call.reason    = cbAfterDelay;
   call.obj       = 0;
@@ -822,12 +978,105 @@ static void bridge_cycle() {
 
   //DEBUG("REPEAT: %d\n", repeat);
   if (repeat) {
-    call.cb_rtn    = bridge_cycle_cb;
+    call.cb_rtn    = cycle_cb;
   } else {
     call.cb_rtn    = bridge_wait_for_msg;
   }
 
   vpi_free_object(vpi_register_cb(&call));
 
-  bridge_register_wave_events();
+  register_wave_events();
+}
+
+static void on_max_errors_exceeded() {
+  // This will cause the simulation to stop processing messages from Origen
+  max_errors_exceeded = true;
+  // And this let's the Origen process know that we have stopped processing
+  origen_log(LOG_ERROR, "!MAX_ERROR_ABORT!");
+}
+
+/// Called every time a miscompare event occurs, 3 args will be passed in:
+/// the pin name, expected data, actual data
+PLI_INT32 bridge_on_miscompare(PLI_BYTE8 * user_dat) {
+  char *pin_name;
+  int expected;
+  int received;
+  s_vpi_value val;
+  vpiHandle handle;
+
+  if (match_loop_open) {
+    match_loop_error_count++;
+
+    handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.match_errors"), NULL);
+    val.format = vpiIntVal;
+    val.value.integer = match_loop_error_count;
+    vpi_put_value(handle, &val, NULL, vpiNoDelay);
+
+  } else {
+    vpiHandle callh = vpi_handle(vpiSysTfCall, 0);
+    vpiHandle argv = vpi_iterate(vpiArgument, callh);
+    vpiHandle arg;
+
+    arg = vpi_scan(argv);
+    val.format = vpiStringVal;
+    vpi_get_value(arg, &val);
+    pin_name = val.value.str;
+
+    arg = vpi_scan(argv);
+    val.format = vpiIntVal;
+    vpi_get_value(arg, &val);
+    expected = val.value.integer;
+
+    arg = vpi_scan(argv);
+    val.format = vpiIntVal;
+    vpi_get_value(arg, &val);
+    received = val.value.integer;
+
+    vpi_free_object(argv);
+
+    origen_log(LOG_ERROR, "Miscompare on pin %s, expected %d received %d", pin_name, expected, received);
+
+    error_count++;
+
+    handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.errors"), NULL);
+    val.format = vpiIntVal;
+    val.value.integer = error_count;
+    vpi_put_value(handle, &val, NULL, vpiNoDelay);
+
+    if (error_count > max_errors) {
+      // If a transaction is currently open hold off aborting until after that has completed
+      // to enable a proper error message to be generated for it
+      if (transaction_open) {
+        max_errors_exceeded_during_transaction = true;
+      } else {
+        on_max_errors_exceeded();
+      }
+    }
+
+    // Store all errors during a transaction
+    if (transaction_open) {
+      if (transaction_error_count < MAX_TRANSACTION_ERRORS) {
+        Miscompare *miscompare = &miscompares[transaction_error_count];
+
+        (*miscompare).pin_name = malloc(strlen(pin_name) + 1);
+        strcpy((*miscompare).pin_name, pin_name);
+        (*miscompare).cycle = cycle_count;
+        (*miscompare).expected = expected;
+        (*miscompare).received = received;
+      }
+      transaction_error_count++;
+    }
+  }
+  return 0;
+}
+
+/// Defines which functions are callable from Verilog as system tasks
+void bridge_register_system_tasks() {
+  s_vpi_systf_data tf_data;
+
+  tf_data.type = vpiSysTask;
+  tf_data.tfname = "$bridge_on_miscompare";
+  tf_data.calltf = bridge_on_miscompare;
+  tf_data.compiletf = 0;
+  vpi_register_systf(&tf_data);
 }