Initialize high part of FLOAT constants

dstogov · Feb 9, 2024 · 059a65c · 059a65c
1 parent 9d375fd
commit 059a65c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/ir.c b/ir.c
@@ -878,6 +878,7 @@ static ir_ref _ir_fold_cse(ir_ctx *ctx, uint32_t opt, ir_ref op1, ir_ref op2, ir
 
 #define IR_FOLD_CONST_F(_val) do { \
 		val.f = (_val); \
+		val.u32_hi = 0; \
 		goto ir_fold_const; \
 	} while (0)
 

diff --git a/ir.g b/ir.g
@@ -564,11 +564,11 @@ const(uint8_t t, ir_val *val):
 	|	FLOATNUMBER(t, val)
 	|	CHARACTER(val)
 	|	"inf"
-		{if (t == IR_DOUBLE) val->d = INFINITY; else val->f = INFINITY;}
+		{if (t == IR_DOUBLE) val->d = INFINITY; else {val->f = INFINITY; val->u32_hi = 0;}}
 	|	"nan"
-		{if (t == IR_DOUBLE) val->d = NAN; else val->f = NAN;}
+		{if (t == IR_DOUBLE) val->d = NAN; else {val->f = NAN; val->u32_hi = 0;}}
 	|	"-" "inf"
-		{if (t == IR_DOUBLE) val->d = -INFINITY; else val->f = -INFINITY;}
+		{if (t == IR_DOUBLE) val->d = -INFINITY; else {val->f = -INFINITY; val->u32_hi = 0;}}
 ;
 
 /* scanner rules */
@@ -580,7 +580,7 @@ ID(const char **str, size_t *len):
 DECNUMBER(uint32_t t, ir_val *val):
 	/[\-]?[0-9]+/
 	{if (t == IR_DOUBLE) val->d = atof((const char*)yy_text);
-	else if (t == IR_FLOAT) val->f = strtof((const char*)yy_text, NULL);
+	else if (t == IR_FLOAT) {val->f = strtof((const char*)yy_text, NULL); val->u32_hi = 0;}
 	else if (IR_IS_TYPE_SIGNED(t)) val->i64 = atoll((const char*)yy_text);
 	else val->u64 = strtoull((const char*)yy_text, NULL, 10);}
 ;
@@ -592,7 +592,7 @@ HEXNUMBER(uint32_t t, ir_val *val):
 
 FLOATNUMBER(uint32_t t, ir_val *val):
 	/[\-]?([0-9]*\.[0-9]+([Ee][\+\-]?[0-9]+)?|[0-9]+\.([Ee][\+\-]?[0-9]+)?|[0-9]+[Ee][\+\-]?[0-9]+)/
-	{if (t == IR_DOUBLE) val->d = atof((const char*)yy_text); else val->f = strtof((const char*)yy_text, NULL);}
+	{if (t == IR_DOUBLE) val->d = atof((const char*)yy_text); else {val->f = strtof((const char*)yy_text, NULL); val->u32_hi = 0;}}
 ;
 
 CHARACTER(ir_val *val):

diff --git a/ir_load.c b/ir_load.c
@@ -1578,19 +1578,19 @@ static int parse_const(int sym, uint8_t t, ir_val *val) {
 			break;
 		case YY_INF:
 			sym = get_sym();
-			if (t == IR_DOUBLE) val->d = INFINITY; else val->f = INFINITY;
+			if (t == IR_DOUBLE) val->d = INFINITY; else {val->f = INFINITY; val->u32_hi = 0;}
 			break;
 		case YY_NAN:
 			sym = get_sym();
-			if (t == IR_DOUBLE) val->d = NAN; else val->f = NAN;
+			if (t == IR_DOUBLE) val->d = NAN; else {val->f = NAN; val->u32_hi = 0;}
 			break;
 		case YY__MINUS:
 			sym = get_sym();
 			if (sym != YY_INF) {
 				yy_error_sym("'inf' expected, got", sym);
 			}
 			sym = get_sym();
-			if (t == IR_DOUBLE) val->d = -INFINITY; else val->f = -INFINITY;
+			if (t == IR_DOUBLE) val->d = -INFINITY; else {val->f = -INFINITY; val->u32_hi = 0;}
 			break;
 		default:
 			yy_error_sym("unexpected", sym);
@@ -1612,7 +1612,7 @@ static int parse_DECNUMBER(int sym, uint32_t t, ir_val *val) {
 		yy_error_sym("<DECNUMBER> expected, got", sym);
 	}
 	if (t == IR_DOUBLE) val->d = atof((const char*)yy_text);
-	else if (t == IR_FLOAT) val->f = strtof((const char*)yy_text, NULL);
+	else if (t == IR_FLOAT) {val->f = strtof((const char*)yy_text, NULL); val->u32_hi = 0;}
 	else if (IR_IS_TYPE_SIGNED(t)) val->i64 = atoll((const char*)yy_text);
 	else val->u64 = strtoull((const char*)yy_text, NULL, 10);
 	sym = get_sym();
@@ -1632,7 +1632,7 @@ static int parse_FLOATNUMBER(int sym, uint32_t t, ir_val *val) {
 	if (sym != YY_FLOATNUMBER) {
 		yy_error_sym("<FLOATNUMBER> expected, got", sym);
 	}
-	if (t == IR_DOUBLE) val->d = atof((const char*)yy_text); else val->f = strtof((const char*)yy_text, NULL);
+	if (t == IR_DOUBLE) val->d = atof((const char*)yy_text); else {val->f = strtof((const char*)yy_text, NULL); val->u32_hi = 0;}
 	sym = get_sym();
 	return sym;
 }

diff --git a/ir_load_llvm.c b/ir_load_llvm.c
@@ -187,6 +187,7 @@ static ir_ref llvm2ir_op(ir_ctx *ctx, LLVMValueRef op, ir_type type)
 				val.d = LLVMConstRealGetDouble(op, &lose);
 			} else {
 				val.f = (float)LLVMConstRealGetDouble(op, &lose);
+				val.u32_hi = 0;
 			}
 			return ir_const(ctx, val, type);
 		case LLVMConstantPointerNullValueKind:
@@ -2055,6 +2056,7 @@ static int llvm2ir_data(ir_loader *loader, LLVMTargetDataRef target_data, LLVMTy
 			} else {
 				IR_ASSERT(t == IR_FLOAT);
 				val.f = (float)LLVMConstRealGetDouble(op, &lose);
+				val.u32_hi = 0;
 				return loader->sym_data(loader, t, 1, &val.f);
 			}
 		case LLVMConstantPointerNullValueKind: