erts_printf %R for relative ets-terms in halfword-vm

Conflicts:

	erts/emulator/beam/erl_printf_term.c

1 files changed, 16 insertions, 13 deletions

diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index 968d563325..fba3fd723c 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -25,7 +25,7 @@
  *  width:      [0-9]+ | '*' 
  *  precision:  [0-9]+ | '*' 
  *  length: hh | h | l | ll | L | j | t | b<sz>
- *  conversion: d,i | o,u,x,X | e,E | f,F | g,G | a,A | c | s | T |
+ *  conversion: d,i | o,u,x,X | e,E | f,F | g,G | a,A | c | s | T | R |
  *              p | n | %
  *  sz: 8 | 16 | 32 | 64 | p | e
  */
@@ -101,7 +101,7 @@
 #endif
 
 #define FMTC_d    0x0000
-#define FMTC_i    0x0001
+#define FMTC_R    0x0001
 #define FMTC_o    0x0002
 #define FMTC_u    0x0003
 #define FMTC_x    0x0004
@@ -165,7 +165,7 @@ static char heX[] = "0123456789ABCDEF";
 #define SIGN(X) ((X) > 0 ? 1 : ((X) < 0 ? -1 : 0)) 
 #define USIGN(X) ((X) == 0 ? 0 : 1)
 
-int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long) = NULL;
+int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long, unsigned long*) = NULL;
 
 static int
 noop_fn(void *vfp, char* buf, size_t len)
@@ -183,8 +183,8 @@ static int fmt_fld(fmtfn_t fn,void* arg,
     int len;
 
     /* format the prefix */
-    if ((sign || (fmt & (FMTF_sgn|FMTF_blk))) &&
-	(((fmt & FMTC_MASK) == FMTC_d) || ((fmt & FMTC_MASK) == FMTC_i))) {
+    if ((sign || (fmt & (FMTF_sgn|FMTF_blk)))
+	&& (fmt & FMTC_MASK) == FMTC_d) {
 	if (sign < 0)
 	    *pp++ = '-';
 	else if ((fmt & FMTF_sgn))
@@ -245,7 +245,6 @@ static int fmt_long(fmtfn_t fn,void* arg,int sign,unsigned long uval,
 
     switch(fmt & FMTC_MASK) {
     case FMTC_d:
-    case FMTC_i:
     case FMTC_u:
 	break;
     case FMTC_o: 
@@ -298,7 +297,6 @@ static int fmt_long_long(fmtfn_t fn,void* arg,int sign,
 
     switch(fmt & FMTC_MASK) {
     case FMTC_d:
-    case FMTC_i:
     case FMTC_u:
 	break;
     case FMTC_o: 
@@ -622,7 +620,7 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 	    /* specifier */
 	    switch(*ptr) {
 	    case 'd': ptr++; fmt |= FMTC_d; break;
-	    case 'i': ptr++; fmt |= FMTC_i; break;
+	    case 'i': ptr++; fmt |= FMTC_d; break;
 	    case 'o': ptr++; fmt |= FMTC_o; break;
 	    case 'u': ptr++; fmt |= FMTC_u; break;
 	    case 'x': ptr++; fmt |= FMTC_x; break;
@@ -637,6 +635,7 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 	    case 'p': ptr++; fmt |= FMTC_p; break;
 	    case 'n': ptr++; fmt |= FMTC_n; break;
 	    case 'T': ptr++; fmt |= FMTC_T; break;
+	    case 'R': ptr++; fmt |= FMTC_R; break;
 	    case '%':
 		FMT(fn,arg,ptr,1,count);
 		ptr++;
@@ -650,7 +649,6 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 
 	    switch(fmt & FMTC_MASK) {
 	    case FMTC_d:
-	    case FMTC_i:
 		switch(fmt & FMTL_MASK) {
 		case FMTL_hh: {
 		    signed char tval = (signed char) va_arg(ap,int);
@@ -814,9 +812,12 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		default: *va_arg(ap,int*) = count; break;
 		}
 		break;
-	    case FMTC_T: {
+	    case FMTC_T:    /* Eterm */
+	    case FMTC_R: {  /* Eterm, Eterm* base  (base ignored if !HALFWORD_HEAP) */
 		long prec;
 		unsigned long eterm;
+		unsigned long* eterm_base;
+		
 		if (!erts_printf_eterm_func)
 		    return -EINVAL;
 		if (precision < 0)
@@ -826,14 +827,16 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		else
 		    prec = (long) precision;
 		eterm = va_arg(ap, unsigned long);
+		eterm_base = ((fmt & FMTC_MASK) == FMTC_R) ?
+		    va_arg(ap, unsigned long*) : NULL;
 		if (width > 0 && !(fmt & FMTF_adj)) {
-		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec);
+		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec, eterm_base);
 		    if (res < 0)
 			return res;
 		    if (width > res)
 			BLANKS(fn, arg, width - res, count);
 		}
-		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec);
+		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec, eterm_base);
 		if (res < 0)
 		    return res;
 		count += res;
@@ -924,7 +927,7 @@ erts_printf_slong(fmtfn_t fn, void *arg, char conv, int pad, int width,
     unsigned long ul_val;
     switch (conv) {
     case 'd': fmt |= FMTC_d; break;
-    case 'i': fmt |= FMTC_i; break;
+    case 'i': fmt |= FMTC_d; break;
     case 'o': fmt |= FMTC_o; break;
     case 'x': fmt |= FMTC_x; break;
     case 'X': fmt |= FMTC_X; break;