--- hatari/src/debug/evaluate.c	2019/04/09 08:55:35	1.1.1.5
+++ hatari/src/debug/evaluate.c	2019/04/09 08:58:04	1.1.1.7
@@ -22,7 +22,6 @@ const char Eval_fileid[] = "Hatari calcu
 #include <stdbool.h>
 #include <SDL_types.h>
 #include <inttypes.h>
-#include "breakcond.h"
 #include "configuration.h"
 #include "dsp.h"
 #include "debugcpu.h"
@@ -31,6 +30,8 @@ const char Eval_fileid[] = "Hatari calcu
 #include "m68000.h"
 #include "stMemory.h"
 #include "symbols.h"
+#include "vars.h"
+
 
 /* define which character indicates which type of number on expression  */
 #define PREFIX_BIN '%'                            /* binary decimal     */
@@ -59,7 +60,7 @@ const char Eval_fileid[] = "Hatari calcu
 static struct {
 	const char *error;		/* global error code		*/
 	bool valid;			/* value validation		*/
-} id = {0, 0};
+} id = { NULL, 0 };
 
 /* parenthesis and function stacks					*/
 static struct {
@@ -220,7 +221,7 @@ static int getValue(const char *str, Uin
 	*base = 0; /* no base (e.g. variable) */
 
 	/* internal Hatari variable? */
-	if (BreakCond_GetHatariVariable(name, number)) {
+	if (Vars_GetVariableValue(name, number)) {
 		return len;
 	}
 
@@ -662,6 +663,7 @@ static long long apply_op (char opcode,
 		break;
         case '>':
 		value1 >>= value2;
+		break;
         case '<':
 		value1 <<= value2;
 		break;