Skip to content

Added precision and variable precision #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HansAnderson wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added precision and variable precision #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4646bb5
Added C .gitignore
Nov 28, 2015
68a8e59
Moved newlines into TPRINTF macro for printf tests
Nov 26, 2015
afe2c78
Synchronized test cases in printf.c and sprintf.c
Nov 26, 2015
c9a7169
Added precision support
Nov 28, 2015
82d2485
Added argument defined width/precision (using '*')
Nov 28, 2015
6268c39
Simplified integer precision handling
Nov 28, 2015
cf56af9
Made precision and '*' specifiers conform to C99 specifications
Nov 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Object files
*.o
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo

# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib

# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex

# Debug files
*.dSYM/

# Editor
*.swp
53 changes: 28 additions & 25 deletions test/printf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#define UNUSED(x) (void)(x)

#define TPRINTF(expr...) \
({ printf("libc_printf(%s) -> ", #expr); printf(expr); \
printf(" tfp_printf(%s) -> ", #expr); tfp_printf(expr); })
({ printf("libc_printf(%s) -> ", #expr); printf(expr); printf("\n"); \
printf(" tfp_printf(%s) -> ", #expr); tfp_printf(expr); printf("\n"); })

static void stdout_putf(void *unused, char c)
{
Expand All @@ -28,41 +28,44 @@ int main()

printf("Fun with printf and %%!\n");

TPRINTF("d1=%016llx d2=%016lx d3=%02x d4=%02X 42=%03d\n",
TPRINTF("d1=%016llx d2=%016lx d3=%02x d4=%02X 42=%03d",
(long long unsigned)0xd1, (long unsigned)0xd2, 0xd3, 0xd4, 42);
TPRINTF("d1=%04x d2=%06x d3=%08x %%100\n", 0xd1, 0xd2, 0xd3);
TPRINTF("|%-14s| |%-16s| d2=%2x |%-30s|\n", "str14", "str16", 0xd2,
TPRINTF("d1=%04x d2=%06x d3=%08x %%100", 0xd1, 0xd2, 0xd3);
TPRINTF("|%-14s| |%-16s| d2=%2x |%-30s|", "str14", "str16", 0xd2,
"12345678901234567890123456789012345");
TPRINTF("|%4s|\n", "string4");
TPRINTF("|%-4s|\n", "string4");
TPRINTF("42=%3d d1=%4.4x |%4s| d2=%8.8x\n", 42, 0xd1, "string4", 0xd2);
TPRINTF("42=%3d d1=%4.4x |%-4s| d2=%8.8x\n", 42, 0xd1, "string4", 0xd2);
TPRINTF("84=%d 21=%ds |%s| |%sOK| d1=%x d2=%#x\n",
TPRINTF("|%4s|", "string4");
TPRINTF("|%-4s|", "string4");
TPRINTF("42=%3d d1=%4.4x |%4s| d2=%8.8x", 42, 0xd1, "string4", 0xd2);
TPRINTF("42=%3d d1=%4.4x |%-4s| d2=%8.8x", 42, 0xd1, "string4", 0xd2);
TPRINTF("84=%d 21=%ds |%s| |%sOK| d1=%x d2=%#x",
84, 21, "hello", "fine", 0xd1, 0xd2);

TPRINTF("%lld\n", LLONG_MIN);
TPRINTF("%lld\n", LLONG_MAX);
TPRINTF("%llu\n", ULLONG_MAX);
TPRINTF("%llx\n", LLONG_MIN);
TPRINTF("%llx\n", LLONG_MAX);
TPRINTF("%llx\n", ULLONG_MAX);
TPRINTF("%lld", LLONG_MIN);
TPRINTF("%lld", LLONG_MAX);
TPRINTF("%llu", ULLONG_MAX);
TPRINTF("%llx", LLONG_MIN);
TPRINTF("%llx", LLONG_MAX);
TPRINTF("%llx", ULLONG_MAX);

TPRINTF("d1=%.1x\n", 0xd1);
TPRINTF("d1=%4.1x\n", 0xd1);
TPRINTF("d1=%4.x\n", 0xd1);
TPRINTF("d1=%.1x", 0xd1);
TPRINTF("d1=%4.1x", 0xd1);
TPRINTF("d1=%4.x", 0xd1);
TPRINTF("d1=%4.4x", 0xd1);

{
char blah[256];
TPRINTF("a=%zd\n", sizeof(blah));
TPRINTF("a=%zu\n", sizeof(blah));
TPRINTF("a=%zi\n", sizeof(blah));
TPRINTF("a=0x%zx\n", sizeof(blah));
TPRINTF("a=%zd", sizeof(blah));
TPRINTF("a=%zu", sizeof(blah));
TPRINTF("a=%zi", sizeof(blah));
TPRINTF("a=0x%zx", sizeof(blah));
}

TPRINTF("Hello |%15s|.", "12345678901234");

{
int in_stack;
TPRINTF("Adddress of main: %p\n", main);
TPRINTF("Adddress of stack variable: %p\n", &in_stack);
TPRINTF("Adddress of main: %p", main);
TPRINTF("Adddress of stack variable: %p", &in_stack);
}

return 0;
Expand Down
46 changes: 46 additions & 0 deletions test/sprintf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,60 @@ int main()
TPRINTF("84=%d 21=%ds |%s| |%sOK| d1=%x d2=%#x",
84, 21, "hello", "fine", 0xd1, 0xd2);

TPRINTF("|%.6s|", "stringXXX");
TPRINTF("|%10.6s|", "stringXXX");
TPRINTF("|%-10.6s|", "stringXXX");
TPRINTF("|%.20s|", "stringXXX");
TPRINTF("|%.s|", "stringXXX");
TPRINTF("|%.50s|", "0123456789012345678901234567890123456789");

TPRINTF("%d", INT_MIN);
TPRINTF("%d", INT_MAX);
TPRINTF("%u", UINT_MAX);
TPRINTF("%x", INT_MIN);
TPRINTF("%x", INT_MAX);
TPRINTF("%x", UINT_MAX);

TPRINTF("%ld", LONG_MIN);
TPRINTF("%ld", LONG_MAX);
TPRINTF("%lu", ULONG_MAX);
TPRINTF("%lx", LONG_MIN);
TPRINTF("%lx", LONG_MAX);
TPRINTF("%lx", ULONG_MAX);

TPRINTF("%lld", LLONG_MIN);
TPRINTF("%lld", LLONG_MAX);
TPRINTF("%llu", ULLONG_MAX);
TPRINTF("%llx", LLONG_MIN);
TPRINTF("%llx", LLONG_MAX);
TPRINTF("%llx", ULLONG_MAX);

TPRINTF("d1=%.x", 0xd1);
TPRINTF("d1=%.1x", 0xd1);
TPRINTF("d1=%.2x", 0xd1);
TPRINTF("d1=%.4x", 0xd1);

TPRINTF("d1=%4.x", 0xd1);
TPRINTF("d1=%4.1x", 0xd1);
TPRINTF("d1=%4.2x", 0xd1);
TPRINTF("d1=%4.4x", 0xd1);
TPRINTF("d1=%4.50x", 0xd1);
TPRINTF("d1=|%8.4x|", 0xd1);
TPRINTF("d1=|%-8.4x|", 0xd1);

TPRINTF("0=|%.d|", 0);
TPRINTF("0=|%.4d|", 0);
TPRINTF("0=|%4.d|", 0);
TPRINTF("0=|%4.*d|", -1, 0);

TPRINTF("42=|%*d|", 5, 42);
TPRINTF("42=|%-*d|", 5, 42);
TPRINTF("42=|%0*d|", 5, 42);
TPRINTF("42=|%.*d|", 5, 42);
TPRINTF("42=|%*.*d|", 10, 5, 42);
TPRINTF("42=|%*.*d|", -10, 5, 42);
TPRINTF("42=|%*.*d|", 10, -5, 42);
TPRINTF("42=|%-*.*d|", -10, 5, 42);

{
char blah[256];
Expand Down
Loading