taigrr/gopher-os
1
0
Fork 0
mirror of https://github.com/taigrr/gopher-os synced 2025-01-18 04:43:13 -08:00
Code Issues Projects Releases Wiki Activity

Make %x formatting verb in early.Printf behave like fmt.Printf

Browse Source 
The %x verb in fmt.Printf does not add the "0x" prefix automatically so
early.Printf has been changed to match this behavior.
This commit is contained in:
Achilleas Anagnostopoulos 2017-05-15 07:05:07 +01:00
parent 1d8d81095c
commit 52266c9f66
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/kfmt/early/early_fmt.go
View File

@ -246,13 +246,6 @@ func fmtInt(v interface{}, base, padLen int) {
buf[right] = padCh buf[right] = padCh
} }
// Apply hex prefix
if base == 16 {
buf[right] = 'x'
buf[right+1] = '0'
right += 2
}
// Apply negative sign to the rightmost blank character (if using enough padding); // Apply negative sign to the rightmost blank character (if using enough padding);
// otherwise append the sign as a new char // otherwise append the sign as a new char
if sval < 0 { if sval < 0 {

12
kernel/kfmt/early/early_fmt_test.go
View File

@ -71,7 +71,7 @@ func TestPrintf(t *testing.T) {
"uint arg: 777", "uint arg: 777",
}, },
{ {
func() { printfn("uint arg: %x", uint32(0xbadf00d)) }, func() { printfn("uint arg: 0x%x", uint32(0xbadf00d)) },
"uint arg: 0xbadf00d", "uint arg: 0xbadf00d",
}, },
{ {
@ -83,16 +83,16 @@ func TestPrintf(t *testing.T) {
"uint arg with padding: '0777'", "uint arg with padding: '0777'",
}, },
{ {
func() { printfn("uint arg with padding: '%10x'", uint64(0xbadf00d)) }, func() { printfn("uint arg with padding: '0x%10x'", uint64(0xbadf00d)) },
"uint arg with padding: '0x000badf00d'", "uint arg with padding: '0x000badf00d'",
}, },
{ {
func() { printfn("uint arg longer than padding: '%5x'", int64(0xbadf00d)) }, func() { printfn("uint arg longer than padding: '0x%5x'", int64(0xbadf00d)) },
"uint arg longer than padding: '0xbadf00d'", "uint arg longer than padding: '0xbadf00d'",
}, },
// pointers // pointers
{ {
func() { printfn("uintptr %x", uintptr(0xb8000)) }, func() { printfn("uintptr 0x%x", uintptr(0xb8000)) },
"uintptr 0xb8000", "uintptr 0xb8000",
}, },
// ints // ints
@ -107,7 +107,7 @@ func TestPrintf(t *testing.T) {
}, },
{ {
func() { printfn("int arg: %x", int32(-0xbadf00d)) }, func() { printfn("int arg: %x", int32(-0xbadf00d)) },
"int arg: -0xbadf00d", "int arg: -badf00d",
}, },
{ {
func() { printfn("int arg with padding: '%10d'", int64(-12345678)) }, func() { printfn("int arg with padding: '%10d'", int64(-12345678)) },
@ -123,7 +123,7 @@ func TestPrintf(t *testing.T) {
}, },
{ {
func() { printfn("int arg longer than padding: '%5x'", int(-0xbadf00d)) }, func() { printfn("int arg longer than padding: '%5x'", int(-0xbadf00d)) },
"int arg longer than padding: '-0xbadf00d'", "int arg longer than padding: '-badf00d'",
}, },
// multiple arguments // multiple arguments
{ {