a12a0f78b0
stmhal relies on pfenv_* to implement its printf. Thus, it needs a pfenv_print_int which prints a proper 32-bit integer. With latest change to pfenv, this function became one that took mp_obj_t, and extracted the integer value from that object. To fix temporarily, pfenv_print_int has been renamed to pfenv_print_mp_int (to indicate it takes a mp_obj_t for the int), and pfenv_print_int has been added (which takes a normal C int). Currently, pfenv_print_int proxies to pfenv_print_mp_int, but this means it looses the MSB. Need to find a way to fix this, but the only way I can think of will duplicate lots of code.
238 lines
6.7 KiB
C
238 lines
6.7 KiB
C
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "qstr.h"
|
|
#include "obj.h"
|
|
#include "mpz.h"
|
|
#include "objint.h"
|
|
#include "pfenv.h"
|
|
|
|
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
#include "formatfloat.h"
|
|
#endif
|
|
|
|
static const char pad_spaces[] = " ";
|
|
static const char pad_zeroes[] = "0000000000000000";
|
|
|
|
void pfenv_vstr_add_strn(void *data, const char *str, unsigned int len){
|
|
vstr_add_strn(data, str, len);
|
|
}
|
|
|
|
int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, int flags, char fill, int width) {
|
|
int left_pad = 0;
|
|
int right_pad = 0;
|
|
int pad = width - len;
|
|
int pad_size;
|
|
const char *pad_chars;
|
|
|
|
if (!fill || fill == ' ' ) {
|
|
pad_chars = pad_spaces;
|
|
pad_size = sizeof(pad_spaces) - 1;
|
|
} else if (fill == '0') {
|
|
pad_chars = pad_zeroes;
|
|
pad_size = sizeof(pad_zeroes) - 1;
|
|
} else {
|
|
// Other pad characters are fairly unusual, so we'll take the hit
|
|
// and output them 1 at a time.
|
|
pad_chars = &fill;
|
|
pad_size = 1;
|
|
}
|
|
|
|
if (flags & PF_FLAG_CENTER_ADJUST) {
|
|
left_pad = pad / 2;
|
|
right_pad = pad - left_pad;
|
|
} else if (flags & PF_FLAG_LEFT_ADJUST) {
|
|
right_pad = pad;
|
|
} else {
|
|
left_pad = pad;
|
|
}
|
|
|
|
if (left_pad) {
|
|
while (left_pad > 0) {
|
|
int p = left_pad;
|
|
if (p > pad_size) {
|
|
p = pad_size;
|
|
}
|
|
pfenv->print_strn(pfenv->data, pad_chars, p);
|
|
left_pad -= p;
|
|
}
|
|
}
|
|
pfenv->print_strn(pfenv->data, str, len);
|
|
if (right_pad) {
|
|
while (right_pad > 0) {
|
|
int p = right_pad;
|
|
if (p > pad_size) {
|
|
p = pad_size;
|
|
}
|
|
pfenv->print_strn(pfenv->data, pad_chars, p);
|
|
right_pad -= p;
|
|
}
|
|
}
|
|
return len;
|
|
}
|
|
|
|
int pfenv_print_int(const pfenv_t *pfenv, int x, int sgn, int base, int base_char, int flags, char fill, int width) {
|
|
// XXX this really needs to be a dedicated function, since converting to a mp_int looses the MSB
|
|
return pfenv_print_mp_int(pfenv, MP_OBJ_NEW_SMALL_INT((machine_int_t)x), sgn, base, base_char, flags, fill, width);
|
|
}
|
|
|
|
// 32-bits is 10 digits, add 3 for commas, 1 for sign, 1 for terminating null
|
|
// We can use 16 characters for 32-bit and 32 characters for 64-bit
|
|
#define INT_BUF_SIZE (sizeof(machine_int_t) * 4)
|
|
|
|
int pfenv_print_mp_int(const pfenv_t *pfenv, mp_obj_t x, int sgn, int base, int base_char, int flags, char fill, int width) {
|
|
if (!MP_OBJ_IS_INT(x)) {
|
|
// This will convert booleans to int, or raise an error for
|
|
// non-integer types.
|
|
x = MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(x));
|
|
}
|
|
|
|
char prefix_buf[4];
|
|
char *prefix = prefix_buf;
|
|
|
|
if (mp_obj_int_is_positive(x)) {
|
|
if (flags & PF_FLAG_SHOW_SIGN) {
|
|
*prefix++ = '+';
|
|
} else if (flags & PF_FLAG_SPACE_SIGN) {
|
|
*prefix++ = ' ';
|
|
}
|
|
}
|
|
|
|
if (flags & PF_FLAG_SHOW_PREFIX) {
|
|
if (base == 2) {
|
|
*prefix++ = '0';
|
|
*prefix++ = base_char + 'b' - 'a';
|
|
} else if (base == 8) {
|
|
*prefix++ = '0';
|
|
if (flags & PF_FLAG_SHOW_OCTAL_LETTER) {
|
|
*prefix++ = base_char + 'o' - 'a';
|
|
}
|
|
} else if (base == 16) {
|
|
*prefix++ = '0';
|
|
*prefix++ = base_char + 'x' - 'a';
|
|
}
|
|
}
|
|
*prefix = '\0';
|
|
int prefix_len = prefix - prefix_buf;
|
|
prefix = prefix_buf;
|
|
|
|
char comma = '\0';
|
|
if (flags & PF_FLAG_SHOW_COMMA) {
|
|
comma = ',';
|
|
}
|
|
|
|
// The size of this buffer is rather arbitrary. If it's not large
|
|
// enough, a dynamic one will be allocated.
|
|
char stack_buf[sizeof(machine_int_t) * 4];
|
|
char *buf = stack_buf;
|
|
int buf_size = sizeof(stack_buf);
|
|
int fmt_size = 0;
|
|
char *str;
|
|
|
|
char sign = '\0';
|
|
if (flags & PF_FLAG_PAD_AFTER_SIGN) {
|
|
// We add the pad in this function, so since the pad goes after
|
|
// the sign & prefix, we format without a prefix
|
|
str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size,
|
|
x, base, NULL, base_char, comma);
|
|
if (*str == '-') {
|
|
sign = *str++;
|
|
fmt_size--;
|
|
}
|
|
} else {
|
|
str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size,
|
|
x, base, prefix, base_char, comma);
|
|
}
|
|
|
|
int len = 0;
|
|
if (flags & PF_FLAG_PAD_AFTER_SIGN) {
|
|
// pad after sign implies pad after prefix as well.
|
|
if (sign) {
|
|
len += pfenv_print_strn(pfenv, &sign, 1, 0, 0, 1);
|
|
width--;
|
|
}
|
|
if (prefix_len) {
|
|
len += pfenv_print_strn(pfenv, prefix, prefix_len, 0, 0, 1);
|
|
width -= prefix_len;
|
|
}
|
|
}
|
|
|
|
len += pfenv_print_strn(pfenv, str, fmt_size, flags, fill, width);
|
|
|
|
if (buf != stack_buf) {
|
|
m_free(buf, buf_size);
|
|
}
|
|
return len;
|
|
}
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
int pfenv_print_float(const pfenv_t *pfenv, mp_float_t f, char fmt, int flags, char fill, int width, int prec) {
|
|
char buf[32];
|
|
char sign = '\0';
|
|
int chrs = 0;
|
|
|
|
if (flags & PF_FLAG_SHOW_SIGN) {
|
|
sign = '+';
|
|
}
|
|
else
|
|
if (flags & PF_FLAG_SPACE_SIGN) {
|
|
sign = ' ';
|
|
}
|
|
int len;
|
|
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
|
|
len = format_float(f, buf, sizeof(buf), fmt, prec, sign);
|
|
#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
|
|
char fmt_buf[6];
|
|
char *fmt_s = fmt_buf;
|
|
|
|
*fmt_s++ = '%';
|
|
if (sign) {
|
|
*fmt_s++ = sign;
|
|
}
|
|
*fmt_s++ = '.';
|
|
*fmt_s++ = '*';
|
|
*fmt_s++ = fmt;
|
|
*fmt_s = '\0';
|
|
|
|
len = snprintf(buf, sizeof(buf), fmt_buf, prec, f);
|
|
#else
|
|
#error Unknown MICROPY FLOAT IMPL
|
|
#endif
|
|
char *s = buf;
|
|
|
|
if ((flags & PF_FLAG_ADD_PERCENT) && (len + 1) < sizeof(buf)) {
|
|
buf[len++] = '%';
|
|
buf[len] = '\0';
|
|
}
|
|
|
|
// buf[0] < '0' returns true if the first character is space, + or -
|
|
if ((flags & PF_FLAG_PAD_AFTER_SIGN) && buf[0] < '0') {
|
|
// We have a sign character
|
|
s++;
|
|
if (*s <= '9' || (flags & PF_FLAG_PAD_NAN_INF)) {
|
|
// We have a number, or we have a inf/nan and PAD_NAN_INF is set
|
|
// With '{:06e}'.format(float('-inf')) you get '-00inf'
|
|
chrs += pfenv_print_strn(pfenv, &buf[0], 1, 0, 0, 1);
|
|
width--;
|
|
len--;
|
|
}
|
|
}
|
|
|
|
if (*s > 'A' && (flags & PF_FLAG_PAD_NAN_INF) == 0) {
|
|
// We have one of the inf or nan variants, suppress zero fill.
|
|
// With printf, if you use: printf("%06e", -inf) then you get " -inf"
|
|
// so suppress the zero fill.
|
|
fill = ' ';
|
|
}
|
|
chrs += pfenv_print_strn(pfenv, s, len, flags, fill, width);
|
|
|
|
return chrs;
|
|
}
|
|
#endif
|