Changeset 6efb4d2 in mainline

Timestamp:

2012-05-04T09:45:34Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1a23f6e

Parents:

7360332

Message:

Reorganize HelenOS specific files for MSIM

Location:

uspace/app/msim

Files:

• Makefile (modified) (4 diffs)
• arch_helenos/helenos.h (added)
• arch_helenos/input.c (moved) (moved from uspace/app/msim/helenos_input.c ) (2 diffs)
• arch_helenos/misc.c (moved) (moved from uspace/app/msim/helenos.c ) (4 diffs)

uspace/app/msim/Makefile

@@ -36 +36 @@
 
 MSIM_HELENOS_MAKEFILE = Makefile.msim.src
-MSIM_HELENOS_PLATFORM_FILES = helenos.c helenos_input.c
+MSIM_HELENOS_PLATFORM_FILES = misc.c input.c
+MSIM_HELENOS_ARCH_DIR = arch/helenos
 MSIM_PATCHED_FILES = \
         $(MSIM_DIST)/config.h \
         $(MSIM_DIST)/src/$(MSIM_HELENOS_MAKEFILE) \
-        $(MSIM_DIST)/src/helenos.c \
-        $(MSIM_DIST)/src/helenos_input.c
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h \
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c \
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c
+
+MSIM_EXTRA_SOURCES := $(addprefix $(MSIM_HELENOS_ARCH_DIR)/,$(MSIM_HELENOS_PLATFORM_FILES))
 
 CP = /bin/cp -f
@@ -63 +67 @@
         $(CP) $< $@
 
-$(MSIM_DIST)/src/helenos.c: helenos.c | unpack-tarball
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h: arch_helenos/helenos.h | unpack-tarball
         $(CP) $< $@
 
-$(MSIM_DIST)/src/helenos_input.c: helenos_input.c | unpack-tarball
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c: arch_helenos/misc.c | unpack-tarball
+        $(CP) $< $@
+
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c: arch_helenos/input.c | unpack-tarball
         $(CP) $< $@
 
@@ -79 +86 @@
         ) | make -f - | grep 'SOURCES' >Makefile.sources
         sed \
-                -e 's:io/input.c:$(MSIM_HELENOS_PLATFORM_FILES):' \
+                -e 's:io/input.c:$(MSIM_EXTRA_SOURCES):' \
                 -e 's:debug/gdb.c::' \
                 -e 's:arch/posix/stdin.c::' \
@@ -90 +97 @@
 unpack-tarball: $(MSIM_TARBALL)
         tar xjf $(MSIM_TARBALL)
+        mkdir -p $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)

uspace/app/msim/arch_helenos/input.c

@@ -32 +32 @@
 /** @file HelenOS specific functions for MSIM simulator.
  */
-#include "io/input.h"
-#include "io/output.h"
-#include "fault.h"
+#include "../../io/input.h"
+#include "../../io/output.h"
+#include "../../fault.h"
+#include "helenos.h"
 #include <tinput.h>
 #include <errno.h>
 
 static tinput_t *input_prompt;
-
-char *input_helenos_get_next_command(void);
-void helenos_dprinter_init(void);
 
 /** Terminal and readline initialization
@@ -67 +65 @@
 }
 
-char *input_helenos_get_next_command(void)
+char *helenos_input_get_next_command(void)
 {
         tinput_set_prompt(input_prompt, "[msim] ");

uspace/app/msim/arch_helenos/misc.c

@@ -32 +32 @@
 /** @file HelenOS specific functions for MSIM simulator.
  */
-#include "io/input.h"
-#include "io/output.h"
-#include "device/dprinter.h"
-#include "debug/gdb.h"
-#include "cmd.h"
-#include "fault.h"
-#include "device/machine.h"
+#include "../../io/input.h"
+#include "../../io/output.h"
+#include "../../device/dprinter.h"
+#include "../../debug/gdb.h"
+#include "../../cmd.h"
+#include "../../fault.h"
+#include "../../device/machine.h"
+#include "helenos.h"
 #include <str.h>
 #include <malloc.h>
@@ -53 +54 @@
 // #define DUMP_ANSI_ESCAPE_SEQUENCES
 
-extern char *input_helenos_get_next_command(void);
-
 void interactive_control(void)
 {
@@ -67 +66 @@
 
         while (interactive) {
-                char *commline = input_helenos_get_next_command();
+                char *commline = helenos_input_get_next_command();
                 if (commline == NULL) {
                         mprintf("Quit\n");
@@ -98 +97 @@
 }
 
-
-char *input_helenos_get_next_command(void);
 
 static void (*original_printer_write)(cpu_t *, device_s *, ptr_t, uint32_t);