> Manual commit: Added a buggy call-far support. Add printf to fake-libc

U201614531
recolic
Linux RECOLICPC 5.4.6-arch3-1 #1 SMP PREEMPT Tue, 24 Dec 2019 04:36:53 +0000 x86_64 GNU/Linux
 16:52:23 up 22:26,  1 user,  load average: 0.75, 0.82, 0.73
361ccaaa7913a4f359c68adc383ee66d3e28cc4d

nemu/src/cpu/exec/control.cc

@@ -65,7 +65,12 @@ namespace EHelperImpl {
   }
   
   make_EHelper(call_rm) {
-    TODO();
+    RLIB_MACRO_DEBUG_ASSERT(decoding.is_operand_size_16 == false);
+    rlib::println("Reach call_rm. WARNING: this instruction impl is heavily broken.");
+
+    rtl_push<4>(&decoding.seq_eip);
+    rtl_jr(&id_dest->val);
+    // TODO: this far call logic is absolutely wrong.
   
     print_asm("call *%s", id_dest->str);
   }

nexus-am/libs/klib/Makefile

@@ -3,5 +3,6 @@ SRCS = src/stdio.c \
        src/string.c \
        src/cpp.c \
        src/stdlib.c \
+       src/printf-lib/printf.c \
        src/io.c
 include $(AM_HOME)/Makefile.lib

nexus-am/libs/klib/include/klib.h

@@ -11,21 +11,22 @@
 //#define __NATIVE_USE_KLIB__
 
 #ifdef __NATIVE_USE_KLIB__
-#define strlen my_strlen
-#define strcpy my_strcpy
-#define strncpy my_strncpy
-#define strcat my_strcat
-#define strcmp my_strcmp
-#define strncmp my_strncmp
-#define memset my_memset
-#define memcpy my_memcpy
-#define memcmp my_memcmp
-#define printf my_printf
-#define vsprintf my_vsprintf
-#define sprintf my_sprintf
-#define snprintf my_snprintf
+#define strlen   my_strlen
+#define strcpy   my_strcpy
+#define strncpy  my_strncpy
+#define strcat   my_strcat
+#define strcmp   my_strcmp
+#define strncmp  my_strncmp
+#define memset   my_memset
+#define memcpy   my_memcpy
+#define memcmp   my_memcmp
 #endif
 
+#define printf   printf_
+#define vsprintf vsprintf_
+#define sprintf  sprintf_
+#define snprintf snprintf_
+
 #ifdef __cplusplus
 extern "C" {
 #endif

nexus-am/libs/klib/src/printf-lib/printf.h

+///////////////////////////////////////////////////////////////////////////////
+// \author (c) Marco Paland (info@paland.com)
+//             2014-2019, PALANDesign Hannover, Germany
+//
+// \license The MIT License (MIT)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// \brief Tiny printf, sprintf and snprintf implementation, optimized for speed on
+//        embedded systems with a very limited resources.
+//        Use this instead of bloated standard/newlib printf.
+//        These routines are thread safe and reentrant.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _PRINTF_H_
+#define _PRINTF_H_
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * Output a character to a custom device like UART, used by the printf() function
+ * This function is declared here only. You have to write your custom implementation somewhere
+ * \param character Character to output
+ */
+void _putchar(char character);
+
+
+/**
+ * Tiny printf implementation
+ * You have to implement _putchar if you use printf()
+ * To avoid conflicts with the regular printf() API it is overridden by macro defines
+ * and internal underscore-appended functions like printf_() are used
+ * \param format A string that specifies the format of the output
+ * \return The number of characters that are written into the array, not counting the terminating null character
+ */
+int printf_(const char* format, ...);
+
+
+/**
+ * Tiny sprintf implementation
+ * Due to security reasons (buffer overflow) YOU SHOULD CONSIDER USING (V)SNPRINTF INSTEAD!
+ * \param buffer A pointer to the buffer where to store the formatted string. MUST be big enough to store the output!
+ * \param format A string that specifies the format of the output
+ * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character
+ */
+int sprintf_(char* buffer, const char* format, ...);
+
+
+/**
+ * Tiny snprintf/vsnprintf implementation
+ * \param buffer A pointer to the buffer where to store the formatted string
+ * \param count The maximum number of characters to store in the buffer, including a terminating null character
+ * \param format A string that specifies the format of the output
+ * \param va A value identifying a variable arguments list
+ * \return The number of characters that COULD have been written into the buffer, not counting the terminating
+ *         null character. A value equal or larger than count indicates truncation. Only when the returned value
+ *         is non-negative and less than count, the string has been completely written.
+ */
+int  snprintf_(char* buffer, size_t count, const char* format, ...);
+int vsnprintf_(char* buffer, size_t count, const char* format, va_list va);
+
+
+/**
+ * Tiny vprintf implementation
+ * \param format A string that specifies the format of the output
+ * \param va A value identifying a variable arguments list
+ * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character
+ */
+int vprintf_(const char* format, va_list va);
+
+
+/**
+ * printf with output function
+ * You may use this as dynamic alternative to printf() with its fixed _putchar() output
+ * \param out An output function which takes one character and an argument pointer
+ * \param arg An argument pointer for user data passed to output function
+ * \param format A string that specifies the format of the output
+ * \return The number of characters that are sent to the output function, not counting the terminating null character
+ */
+int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif  // _PRINTF_H_

nexus-am/libs/klib/src/stdio.c

+/* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
+ *
+ * GNU Library General Public License (LGPL) version 2 or later.
+ *
+ * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
+ */
+
 #include "klib.h"
 #include <stdarg.h>
 
 #if !defined(__ISA_NATIVE__) || defined(__NATIVE_USE_KLIB__)
 
-int printf(const char *fmt, ...) {
-  return 0;
-}
+#include "printf-lib/printf.h"
 
-int vsprintf(char *out, const char *fmt, va_list ap) {
-  return 0;
-}
+//int printf(const char *fmt, ...) {
+//  return 0;
+//}
 
-int sprintf(char *out, const char *fmt, ...) {
-  return 0;
+// TODO: check c size_t
+int vsprintf_(char *out, const char *fmt, va_list va) {
+  const size_t size_t_max = (size_t)(-1);
+  return vsnprintf_(out, size_t_max, fmt, va);
 }
 
-int snprintf(char *out, size_t n, const char *fmt, ...) {
-  return 0;
+//int sprintf(char* out, const char* format, ...) {
+//  return 0;
+//}
+//
+//int snprintf(char *out, size_t n, const char *fmt, ...) {
+//  return 0;
+//}
+
+void _putchar(char character) {
+    ;
 }
 
 #endif