From f15a50657790fcfdd1542fcd99e7bab13c201005 Mon Sep 17 00:00:00 2001 From: Bertrand BRUN Date: Thu, 21 Oct 2010 17:57:39 +0200 Subject: [PATCH] Continuation des tests unitaire --- instructions.lisp | 46 ++++++++++++++++++++++++++++++++++++++++------ main.lisp | 2 +- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/instructions.lisp b/instructions.lisp index 1228d5a..344cda6 100644 --- a/instructions.lisp +++ b/instructions.lisp @@ -221,18 +221,52 @@ et termine par la liste APPEND." (get-register vm 'R1)) t-value) -(set-register vm 'R0 21) -(set-register vm 'R1 21) (deftest virtual-machine - (progn (ISN-ADD vm 'R0 'R1) + (progn (set-register vm 'R0 21) + (set-register vm 'R1 21) + (ISN-ADD vm 'R0 'R1) (get-register vm 'R1)) 42) -(set-register vm 'R0 21) -(set-register vm 'R1 21) (deftest virtual-machine - (progn (ISN-SUB vm 'R0 'R1) + (progn (set-register vm 'R0 21) + (set-register vm 'R1 21) + (ISN-SUB vm 'R0 'R1) (get-register vm 'R1)) 0) +(deftest virtual-machine + (progn (set-register vm 'R0 21) + (set-register vm 'R1 2) + (ISN-MULT vm 'R0 'R1) + (get-register vm 'R1)) + 42) + +(deftest virtual-machine + (progn (set-register vm 'R0 2) + (set-register vm 'R1 84) + (ISN-DIV vm 'R0 'R1) + (get-register vm 'R1)) + 42) + +(deftest virtual-machine + (progn (set-register vm 'R0 0) + (ISN-INCR vm 'R0) + (get-register vm 'R0)) + 1) + +(deftest virtual-machine + (progn (set-register vm 'R0 1) + (ISN-DECR vm 'R0) + (get-register vm 'R0)) + 0) + +(deftest virtual-machine + (progn (set-register vm 'R1 42) + (ISN-PUSH vm 'R1) + (get-memory vm (get-register vm 'SP))) + 42) + + + (dump-vm vm) diff --git a/main.lisp b/main.lisp index aea024f..53aa9a1 100644 --- a/main.lisp +++ b/main.lisp @@ -5,7 +5,7 @@ (cons (copytree (car l)) (copytree (cdr l))))) (load "environnement") -(load "VM/instruction") +(load "instructions") ;; ... (run-test t) ;(print-env-stack exemple-env-stack)