Merge pull request #491 from boriel/bugfix/read_data

Bugfix/read data

Author: boriel

src/arch/zx48k/library-asm/read_restore.asm

@@ -219,6 +219,7 @@ dynamic_cast4:
 before_to_int:
     ld a, b ;; read type
     cp _f16 ;;
+    jr c, coerce_to_int2
     jr nz, coerce_to_int  ;; From float to int
     ld a, c ;; user type
     exx

src/arch/zxnext/library-asm/read_restore.asm

@@ -219,6 +219,7 @@ dynamic_cast4:
 before_to_int:
     ld a, b ;; read type
     cp _f16 ;;
+    jr c, coerce_to_int2
     jr nz, coerce_to_int  ;; From float to int
     ld a, c ;; user type
     exx

tests/functional/arrbase1.asm

@@ -1168,6 +1168,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/data1.asm

@@ -1009,6 +1009,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/opt3_data2.asm

@@ -2283,6 +2283,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/read.asm

@@ -1025,6 +1025,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/read10.asm

@@ -2201,6 +2201,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/read12.asm

@@ -2044,6 +2044,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx

tests/functional/read13.asm

@@ -2498,6 +2498,7 @@ dynamic_cast4:
 before_to_int:
 	    ld a, b ;; read type
 	    cp 8 ;;
+	    jr c, coerce_to_int2
 	    jr nz, coerce_to_int  ;; From float to int
 	    ld a, c ;; user type
 	    exx