7296 - rough support for printing floats

No rounding yet, and we have a blunt way to decide when to start truncating.
This commit is contained in:
Kartik Agaram 2020-11-29 08:43:00 -08:00
parent a518d84bf4
commit 4a280280cd
2 changed files with 527 additions and 0 deletions

526
412print-float-decimal.mu Normal file
View File

@ -0,0 +1,526 @@
# print out floats in decimal
# https://research.swtch.com/ftoa
#
# Basic idea:
# Ignoring sign, floating point numbers are represented as 1.mantissa * 2^exponent
# Therefore, to print a float in decimal, we need to:
# - compute its value without decimal point
# - convert to an array of decimal digits
# - print out the array while inserting the decimal point appropriately
#
# Basic complication: the computation generates numbers larger than an int can
# hold. We need a way to represent big ints.
#
# Key insight: use a representation for big ints that's close to what we need
# anyway, an array of decimal digits.
#
# Style note: we aren't creating a big int library here. The only operations
# we need are halving and doubling. Following the link above, it seems more
# comprehensible to keep these operations inlined so that we can track the
# position of the decimal point with dispatch.
#
# This approach turns out to be fast enough for most purposes.
# Optimizations, however, get wildly more complex.
fn test-print-float-decimal-approximate-normal {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
# 0.5
var half/xmm0: float <- rational 1, 2
print-float-decimal-approximate screen, half, 3
check-screen-row screen, 1, "0.5 ", "F - test-print-float-decimal-approximate-normal 0.5"
# 0.25
clear-screen screen
var quarter/xmm0: float <- rational 1, 4
print-float-decimal-approximate screen, quarter, 3
check-screen-row screen, 1, "0.25 ", "F - test-print-float-decimal-approximate-normal 0.25"
# 0.75
clear-screen screen
var three-quarters/xmm0: float <- rational 3, 4
print-float-decimal-approximate screen, three-quarters, 3
check-screen-row screen, 1, "0.75 ", "F - test-print-float-decimal-approximate-normal 0.75"
# 0.125
clear-screen screen
var eighth/xmm0: float <- rational 1, 8
print-float-decimal-approximate screen, eighth, 3
check-screen-row screen, 1, "0.125 ", "F - test-print-float-decimal-approximate-normal 0.1"
# 0.0625; start using scientific notation
clear-screen screen
var sixteenth/xmm0: float <- rational 1, 0x10
print-float-decimal-approximate screen, sixteenth, 3
check-screen-row screen, 1, "6.25e-2 ", "F - test-print-float-decimal-approximate-normal 0.625"
}
# print whole integers without decimals
fn test-print-float-decimal-approximate-integer {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
# 1
var one-f/xmm0: float <- rational 1, 1
print-float-decimal-approximate screen, one-f, 3
check-screen-row screen, 1, "1 ", "F - test-print-float-decimal-approximate-integer 1"
# 2
clear-screen screen
var two-f/xmm0: float <- rational 2, 1
print-float-decimal-approximate screen, two-f, 3
check-screen-row screen, 1, "2 ", "F - test-print-float-decimal-approximate-integer 2"
# 10
clear-screen screen
var ten-f/xmm0: float <- rational 0xa, 1
print-float-decimal-approximate screen, ten-f, 3
check-screen-row screen, 1, "10 ", "F - test-print-float-decimal-approximate-integer 10"
# -10
clear-screen screen
var minus-ten-f/xmm0: float <- rational -0xa, 1
print-float-decimal-approximate screen, minus-ten-f, 3
check-screen-row screen, 1, "-10 ", "F - test-print-float-decimal-approximate-integer -10"
# 100,000 - start using scientific notation
clear-screen screen
var hundred-thousand/eax: int <- copy 0x186a0
var hundred-thousand-f/xmm0: float <- convert hundred-thousand
print-float-decimal-approximate screen, hundred-thousand-f, 3
check-screen-row screen, 1, "1.00e5 ", "F - test-print-float-decimal-approximate-integer 100,000"
}
fn test-print-float-decimal-approximate-zero {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
var zero: float
print-float-decimal-approximate screen, zero, 3
check-screen-row screen, 1, "0 ", "F - test-print-float-decimal-approximate-zero"
}
fn test-print-float-decimal-approximate-negative-zero {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
var n: int
copy-to n, 0x80000000
var negative-zero/xmm0: float <- reinterpret n
print-float-decimal-approximate screen, negative-zero, 3
check-screen-row screen, 1, "-0 ", "F - test-print-float-decimal-approximate-negative-zero"
}
fn test-print-float-decimal-approximate-infinity {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
var n: int
# 0|11111111|00000000000000000000000
# 0111|1111|1000|0000|0000|0000|0000|0000
copy-to n, 0x7f800000
var infinity/xmm0: float <- reinterpret n
print-float-decimal-approximate screen, infinity, 3
check-screen-row screen, 1, "Inf ", "F - test-print-float-decimal-approximate-infinity"
}
fn test-print-float-decimal-approximate-negative-infinity {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
var n: int
copy-to n, 0xff800000
var negative-infinity/xmm0: float <- reinterpret n
print-float-decimal-approximate screen, negative-infinity, 3
check-screen-row screen, 1, "-Inf ", "F - test-print-float-decimal-approximate-negative-infinity"
}
fn test-print-float-decimal-approximate-not-a-number {
var screen-on-stack: screen
var screen/esi: (addr screen) <- address screen-on-stack
initialize-screen screen, 5, 0x20 # 32 columns should be more than enough
var n: int
copy-to n, 0xffffffff # exponent must be all 1's, and mantissa must be non-zero
var negative-infinity/xmm0: float <- reinterpret n
print-float-decimal-approximate screen, negative-infinity, 3
check-screen-row screen, 1, "NaN ", "F - test-print-float-decimal-approximate-not-a-number"
}
# 'precision' controls the maximum width past which we resort to scientific notation
fn print-float-decimal-approximate screen: (addr screen), n: float, precision: int {
# - special names
var bits/eax: int <- reinterpret n
compare bits, 0
{
break-if-!=
print-string screen, "0"
return
}
compare bits, 0x80000000
{
break-if-!=
print-string screen, "-0"
return
}
compare bits, 0x7f800000
{
break-if-!=
print-string screen, "Inf"
return
}
compare bits, 0xff800000
{
break-if-!=
print-string screen, "-Inf"
return
}
var exponent/ecx: int <- copy bits
exponent <- shift-right 0x17 # 23 bits of mantissa
exponent <- and 0xff
exponent <- subtract 0x7f
compare exponent, 0x80
{
break-if-!=
print-string screen, "NaN"
return
}
# - regular numbers
var sign/edx: int <- copy bits
sign <- shift-right 0x1f
{
compare sign, 1
break-if-!=
print-string screen, "-"
}
# v = 1.mantissa (in base 2) << 0x17
var v/ebx: int <- copy bits
v <- and 0x7fffff
v <- or 0x00800000 # insert implicit 1
# e = exponent - 0x17
var e/ecx: int <- copy exponent
e <- subtract 0x17 # move decimal place from before mantissa to after
# initialize buffer with decimal representation of v
# unlike https://research.swtch.com/ftoa, no ascii here
var buf-storage: (array byte 0x7f)
var buf/edi: (addr array byte) <- address buf-storage
#? print-int32-decimal 0, v
#? print-string 0, "\n"
var n/eax: int <- decimal-digits v, buf
#? dump-digits buf, n, "init"
# I suspect we can do without reversing, but we'll follow https://research.swtch.com/ftoa
# closely for now.
reverse-digits buf, n
#? dump-digits buf, n, "reverse"
# loop if e > 0
{
compare e, 0
break-if-<=
n <- double-array-of-decimal-digits buf, n
#? dump-digits buf, n, "double"
e <- decrement
loop
}
var dp/edx: int <- copy n
# loop if e < 0
{
compare e, 0
break-if->=
n, dp <- halve-array-of-decimal-digits buf, n, dp
#? print-int32-decimal 0, dp
#? print-string 0, ", "
#? dump-digits buf, n, "halve"
e <- increment
loop
}
print-float-buffer screen, buf, n, dp, precision
}
# store the decimal digits of 'n' into 'buf', units first
# n must be positive
fn decimal-digits n: int, _buf: (addr array byte) -> _/eax: int {
var buf/edi: (addr array byte) <- copy _buf
var i/ecx: int <- copy 0
var curr/eax: int <- copy n
var curr-byte/edx: int <- copy 0
{
compare curr, 0
break-if-=
curr, curr-byte <- integer-divide curr, 0xa
var dest/ebx: (addr byte) <- index buf, i
copy-byte-to *dest, curr-byte
i <- increment
loop
}
return i
}
fn reverse-digits _buf: (addr array byte), n: int {
var buf/esi: (addr array byte) <- copy _buf
var left/ecx: int <- copy 0
var right/edx: int <- copy n
right <- decrement
{
compare left, right
break-if->=
{
var l-a/ecx: (addr byte) <- index buf, left
var r-a/edx: (addr byte) <- index buf, right
var l/ebx: byte <- copy-byte *l-a
var r/eax: byte <- copy-byte *r-a
copy-byte-to *l-a, r
copy-byte-to *r-a, l
}
left <- increment
right <- decrement
loop
}
}
# debug helper
fn dump-digits _buf: (addr array byte), count: int, msg: (addr array byte) {
var buf/edi: (addr array byte) <- copy _buf
var i/ecx: int <- copy 0
print-string 0, msg
print-string 0, ": "
{
compare i, count
break-if->=
var curr/edx: (addr byte) <- index buf, i
var curr-byte/eax: byte <- copy-byte *curr
var curr-int/eax: int <- copy curr-byte
print-int32-decimal 0, curr-int
print-string 0, " "
break-if-=
i <- increment
loop
}
print-string 0, "\n"
}
fn double-array-of-decimal-digits _buf: (addr array byte), _n: int -> _/eax: int {
var buf/edi: (addr array byte) <- copy _buf
# initialize delta
var delta/edx: int <- copy 0
{
var curr/ebx: (addr byte) <- index buf, 0
var tmp/eax: byte <- copy-byte *curr
compare tmp, 5
break-if-<
delta <- copy 1
}
# loop
var x/eax: int <- copy 0
var i/ecx: int <- copy _n
i <- decrement
{
compare i, 0
break-if-<=
# x += 2*buf[i]
{
var tmp/ecx: (addr byte) <- index buf, i
var tmp2/ecx: byte <- copy-byte *tmp
x <- add tmp2
x <- add tmp2
}
# x, buf[i+delta] = x/10, x%10
{
var dest-index/ecx: int <- copy i
dest-index <- add delta
var dest/edi: (addr byte) <- index buf, dest-index
var next-digit/edx: int <- copy 0
x, next-digit <- integer-divide x, 0xa
copy-byte-to *dest, next-digit
}
#
i <- decrement
loop
}
# final patch-up
var n/eax: int <- copy _n
compare delta, 1
{
break-if-!=
var curr/ebx: (addr byte) <- index buf, 0
var one/edx: int <- copy 1
copy-byte-to *curr, one
n <- increment
}
return n
}
fn halve-array-of-decimal-digits _buf: (addr array byte), _n: int, _dp: int -> _/eax: int, _/edx: int {
var buf/edi: (addr array byte) <- copy _buf
var n/eax: int <- copy _n
var dp/edx: int <- copy _dp
# initialize one side
{
# if buf[n-1]%2 == 0, break
var right-index/ecx: int <- copy n
right-index <- decrement
var right-a/ecx: (addr byte) <- index buf, right-index
var right/ecx: byte <- copy-byte *right-a
var right-int/ecx: int <- copy right
var remainder/edx: int <- copy 0
{
var dummy/eax: int <- copy 0
dummy, remainder <- integer-divide right-int, 2
}
compare remainder, 0
break-if-=
# buf[n] = 0
var next-a/ecx: (addr byte) <- index buf, n
var zero/edx: byte <- copy 0
copy-byte-to *next-a, zero
# n++
n <- increment
}
# initialize the other
var delta/ebx: int <- copy 0
var x/esi: int <- copy 0
{
# if buf[0] >= 2, break
var left/ecx: (addr byte) <- index buf, 0
var src/ecx: byte <- copy-byte *left
compare src, 2
break-if->=
# delta, x = 1, buf[0]
delta <- copy 1
x <- copy src
# n--
n <- decrement
# dp--
dp <- decrement
}
# loop
var i/ecx: int <- copy 0
{
compare i, n
break-if->=
# x = x*10 + buf[i+delta]
{
var ten/edx: int <- copy 0xa
x <- multiply ten
var src-index/edx: int <- copy i
src-index <- add delta
var src-a/edx: (addr byte) <- index buf, src-index
var src/edx: byte <- copy-byte *src-a
x <- add src
}
# buf[i], x = x/2, x%2
{
var quotient/eax: int <- copy 0
var remainder/edx: int <- copy 0
quotient, remainder <- integer-divide x, 2
x <- copy remainder
var dest/edx: (addr byte) <- index buf, i
copy-byte-to *dest, quotient
}
#
i <- increment
loop
}
return n, dp
}
fn print-float-buffer screen: (addr screen), _buf: (addr array byte), n: int, dp: int, precision: int {
var buf/edi: (addr array byte) <- copy _buf
#? print-int32-hex 0, dp
#? print-string 0, "\n"
{
compare dp, 0
break-if->=
print-float-buffer-in-scientific-notation screen, buf, n, dp, precision
return
}
{
var dp2/eax: int <- copy dp
compare dp2, precision
break-if-<
print-float-buffer-in-scientific-notation screen, buf, n, dp, precision
return
}
{
compare dp, 0
break-if-!=
print-string screen, "0"
}
var i/eax: int <- copy 0
{
compare i, n
break-if->=
# print '.' if necessary
compare i, dp
{
break-if-!=
print-string screen, "."
}
var curr-a/ecx: (addr byte) <- index buf, i
var curr/ecx: byte <- copy-byte *curr-a
curr <- add 0x30 # '0'
var curr-grapheme/ecx: grapheme <- copy curr
print-grapheme screen, curr-grapheme
i <- increment
loop
}
}
fn print-float-buffer-in-scientific-notation screen: (addr screen), _buf: (addr array byte), n: int, dp: int, precision: int {
var buf/edi: (addr array byte) <- copy _buf
var i/eax: int <- copy 0
{
compare i, n
break-if->=
compare i, precision
break-if->=
compare i, 1
{
break-if-!=
print-string screen, "."
}
var curr-a/ecx: (addr byte) <- index buf, i
var curr/ecx: byte <- copy-byte *curr-a
curr <- add 0x30 # '0'
var curr-grapheme/ecx: grapheme <- copy curr
print-grapheme screen, curr-grapheme
#
i <- increment
loop
}
print-string screen, "e"
decrement dp
print-int32-decimal screen, dp
}
## helper
# like check-strings-equal, except array sizes don't have to match
fn check-buffer-contains _buf: (addr array byte), _contents: (addr array byte), msg: (addr array byte) {
var buf/esi: (addr array byte) <- copy _buf
var contents/edi: (addr array byte) <- copy _contents
var a/eax: boolean <- string-starts-with? buf, contents
check-true a, msg
var len/ecx: int <- length contents
var len2/eax: int <- length buf
compare len, len2
break-if-=
var c/eax: (addr byte) <- index buf, len
var d/eax: byte <- copy-byte *c
var e/eax: int <- copy d
check-ints-equal e, 0, msg
}
fn test-check-buffer-contains {
var arr: (array byte 4)
var a/esi: (addr array byte) <- address arr
var b/eax: (addr byte) <- index a, 0
var c/ecx: byte <- copy 0x61 # 'a'
copy-byte-to *b, c
check-buffer-contains a, "a", "F - test-check-buffer-contains"
check-buffer-contains "a", "a", "F - test-check-buffer-contains/null" # no null check when arrays have same length
}
#? fn main -> _/ebx: int {
#? run-tests
#? #? test-print-float-decimal-approximate-integer
#? #? test-print-float-decimal-approximate-normal
#? return 0
#? }

View File

@ -130,6 +130,7 @@ compare var, n => "81 7/subop/compare *(ebp+" var.stack-offse
compare *var/reg, n => "81 7/subop/compare *" reg " " n "/imm32"
var/reg <- multiply var2 => "0f af/multiply *(ebp+" var2.stack-offset ") " reg "/r32"
var/reg <- multiply var2/reg2 => "0f af/multiply %" reg2 " " reg "/r32"
var/reg <- multiply *var2/reg2 => "0f af/multiply *" reg2 " " reg "/r32"
## Floating-point operations