Merge branch 'master' of https://github.com/modula3/cm3

modula3 · Dec 5, 2016 · f487e3f · f487e3f
2 parents f6d7b2a + 3cfcfcc
commit f487e3f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/m3-sys/m3gdb/gdb/gdb/m3-threads.h b/m3-sys/m3gdb/gdb/gdb/m3-threads.h
@@ -1,4 +1,4 @@
-/* M3 language support routines for GDB, the GNU debugger.
+/* Modula-3 language support routines for GDB, the GNU debugger.
    Copyright 2006 Free Software Foundation, Inc.
 
 This file is part of GDB.

diff --git a/m3-sys/m3gdb/gdb/gdb/valarith.c b/m3-sys/m3gdb/gdb/gdb/valarith.c
@@ -1011,6 +1011,15 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
 	      v = v1 < v2;
 	      break;
 
+            case BINOP_GTR:
+              v = v1 > v2; 
+
+            case BINOP_LEQ:
+              v = v1 <= v2; 
+
+            case BINOP_GEQ:
+              v = v1 >= v2; 
+
 	    default:
 	      error (_("Invalid binary operation on numbers."));
 	    }
@@ -1132,10 +1141,23 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
 	      v = v1 == v2;
 	      break;
 
+            case BINOP_NOTEQUAL:
+              v = v1 != v2;
+              break;
+
 	    case BINOP_LESS:
 	      v = v1 < v2;
 	      break;
 
+            case BINOP_GTR:
+              v = v1 > v2; 
+
+            case BINOP_LEQ:
+              v = v1 <= v2; 
+
+            case BINOP_GEQ:
+              v = v1 >= v2; 
+
 	    default:
 	      error (_("Invalid binary operation on numbers."));
 	    }