Test metering, prove that system can resume after a hang error with a range of meter sizes

test/meter/Makefile

@@ -0,0 +1,33 @@
+C_COMPILER=gcc
+
+UNITY_ROOT=../unity
+
+CFLAGS=-std=c99
+CFLAGS += -Wall
+CFLAGS += -Werror
+CFLAGS += -DUVM32_MEMORY_SIZE=16384
+
+SUITE_NAME=tests
+
+TARGET_BASE1=test1
+TARGET1 = $(TARGET_BASE1)
+SRC_FILES1=$(UNITY_ROOT)/src/unity.c test/${SUITE_NAME}.c  test/test_runners/${SUITE_NAME}_Runner.c ../../uvm32/uvm32.c
+INC_DIRS=-I$(UNITY_ROOT)/src -I../../uvm32/ -I../../common -Irom
+
+.PHONY: rom
+
+default: $(SRC_FILES1) rom
+	@$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) rom/rom-header.c -o $(TARGET1)
+	@ ./$(TARGET1)
+
+rom:
+	@(cd rom && make)
+
+test/test_runners/${SUITE_NAME}_Runner.c: test/${SUITE_NAME}.c
+	@mkdir -p test/test_runners
+	@ruby $(UNITY_ROOT)/auto/generate_test_runner.rb test/${SUITE_NAME}.c  test/test_runners/${SUITE_NAME}_Runner.c
+
+clean:
+	rm -rf $(TARGET1) test/test_runners
+	(cd rom && make clean)
+

test/meter/rom/Makefile

@@ -0,0 +1,14 @@
+TOPDIR=../../../
+PROJECT:=$(shell basename ${PWD})
+SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
+OPT=-O0 # don't let optimiser remove stall loop
+all: all_common
+	@# Convert ROM to C file and header
+	@xxd -i ${PROJECT}.bin > ${PROJECT}-header.c
+	@echo "extern unsigned char ${PROJECT}_bin[]; extern int ${PROJECT}_bin_len;" > ${PROJECT}-header.h
+
+test: test_common
+clean: clean_common
+	rm -f ${PROJECT}-header.h ${PROJECT}-header.c
+
+include ${TOPDIR}/apps/makefile.common

test/meter/rom/rom.c

@@ -0,0 +1,15 @@
+#include "uvm32_target.h"
+
+void stall(void) {
+    volatile uint32_t i;
+    for (i=0;i<100;i++) {
+    }
+}
+
+void main(void) {
+    for (int i=0;i<100;i++) {
+        stall();
+        printdec(i);
+    }
+}
+

test/meter/test/tests.c

@@ -0,0 +1,58 @@
+#include <string.h>
+#include "unity.h"
+#include "uvm32.h"
+#include "../common/uvm32_common_custom.h"
+
+#include "rom-header.h"
+
+static uvm32_state_t vmst;
+static uvm32_evt_t evt;
+
+void setUp(void) {
+    // runs before each test
+    uvm32_init(&vmst);
+    uvm32_load(&vmst, rom_bin, rom_bin_len);
+}
+
+void tearDown(void) {
+}
+
+// run program until printdec() reaches 100
+// every time it hangs, resume
+// run in batches of num_instr
+void metered_run(uint32_t num_instr) {
+    uint32_t expected = 0;
+
+    while(expected < 100) {
+        uvm32_run(&vmst, &evt, num_instr);
+        switch(evt.typ) {
+            case UVM32_EVT_SYSCALL: {
+                TEST_ASSERT_EQUAL(UVM32_SYSCALL_PRINTDEC, evt.data.syscall.code);
+                uint32_t val = uvm32_getval(&vmst, &evt, ARG0);
+                TEST_ASSERT_EQUAL(val, expected);
+                expected++;
+            } break;
+            case UVM32_EVT_ERR:
+                TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_HUNG);
+                uvm32_clearError(&vmst);    // clear the hung error so it can continue
+            break;
+            case UVM32_EVT_END:
+                TEST_ASSERT_EQUAL(0, 1);    // trigger an assert, we didn't get to 100000 yet
+            break;
+        }
+    }
+
+    // run vm to completion
+    uvm32_run(&vmst, &evt, 10000);
+    TEST_ASSERT_EQUAL(evt.typ, UVM32_EVT_END);
+}
+
+void test_meter(void) {
+    // test many different meter values, including 0 (which should run 1 instruction, as 0 is going to hang)
+    for (uint32_t i=0;i<1000;i++) {
+        uvm32_init(&vmst);
+        uvm32_load(&vmst, rom_bin, rom_bin_len);
+        metered_run(i);
+    }
+}
+