Merge branch 'misc'

lucvoo · Oct 9, 2020 · 0c6896f · 0c6896f
2 parents 26f670c + a28fcda
commit 0c6896f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -273,7 +273,7 @@ version.h: FORCE
 
 check: all
 	$(Q)cd validation && ./test-suite
-validation/%: $(PROGRAMS)
+validation/%: $(PROGRAMS) FORCE
 	$(Q)validation/test-suite $*
 
 

diff --git a/lib.h b/lib.h
@@ -44,7 +44,7 @@
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 #endif
 
-#ifndef PATH_MAX
+#ifdef __gnu_hurd__
 #define PATH_MAX 4096			// Hurd doesn't define this
 #endif
 

diff --git a/opcode.def b/opcode.def
@@ -33,8 +33,6 @@ OPCODE(FMUL,            BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
 OPCODE(FDIV,            BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
 
 /* Logical */
-OPCODE(AND_BOOL,        BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
-OPCODE(OR_BOOL,         BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
 OPCODE(AND,             BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
 OPCODE(OR,              BADOP,    BADOP,    BADOP, 2, OPF_TARGET)
 OPCODE(XOR,             BADOP,    BADOP,    BADOP, 2, OPF_TARGET)

diff --git a/simplify.c b/simplify.c
@@ -1311,13 +1311,11 @@ static int simplify_unop(struct instruction *insn)
 		struct instruction *def;
 
 	case OP_NOT:
-		def = insn->src->def;
-		if (def && def->opcode == OP_NOT)
+		if (DEF_OPCODE(def, insn->src) == OP_NOT)
 			return replace_with_pseudo(insn, def->src);
 		break;
 	case OP_NEG:
-		def = insn->src->def;
-		if (def && def->opcode == OP_NEG)
+		if (DEF_OPCODE(def, insn->src) == OP_NEG)
 			return replace_with_pseudo(insn, def->src);
 		break;
 	default:

diff --git a/validation/optim/canonical-mul.c b/validation/optim/canonical-mul.c
@@ -7,7 +7,7 @@ uint xtc_umul_ytc(uint x, uint y) { return (x * 3) * (y * 2); }
  * check-description:
  *	1) verify that constants in mul chains are
  *	   pushed at the right of the whole chain.
- *	   For example '(a * 3) * b' must be canonicalized into '(a * b) * 1'
+ *	   For example '(a * 3) * b' must be canonicalized into '(a * b) * 3'
  *	   This is needed in general for constant simplification;
  *	   for example, for:
  *		'(a * 3) * (b * 2)'