Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 6efb4d2 in mainline


Ignore:
Timestamp:
2012-05-04T09:45:34Z (9 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
master
Children:
1a23f6e
Parents:
7360332
Message:

Reorganize HelenOS specific files for MSIM

Location:
uspace/app/msim
Files:
1 added
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/msim/Makefile

    r7360332 r6efb4d2  
    3636
    3737MSIM_HELENOS_MAKEFILE = Makefile.msim.src
    38 MSIM_HELENOS_PLATFORM_FILES = helenos.c helenos_input.c
     38MSIM_HELENOS_PLATFORM_FILES = misc.c input.c
     39MSIM_HELENOS_ARCH_DIR = arch/helenos
    3940MSIM_PATCHED_FILES = \
    4041        $(MSIM_DIST)/config.h \
    4142        $(MSIM_DIST)/src/$(MSIM_HELENOS_MAKEFILE) \
    42         $(MSIM_DIST)/src/helenos.c \
    43         $(MSIM_DIST)/src/helenos_input.c
     43        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h \
     44        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c \
     45        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c
     46
     47MSIM_EXTRA_SOURCES := $(addprefix $(MSIM_HELENOS_ARCH_DIR)/,$(MSIM_HELENOS_PLATFORM_FILES))
    4448
    4549CP = /bin/cp -f
     
    6367        $(CP) $< $@
    6468
    65 $(MSIM_DIST)/src/helenos.c: helenos.c | unpack-tarball
     69$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h: arch_helenos/helenos.h | unpack-tarball
    6670        $(CP) $< $@
    6771
    68 $(MSIM_DIST)/src/helenos_input.c: helenos_input.c | unpack-tarball
     72$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c: arch_helenos/misc.c | unpack-tarball
     73        $(CP) $< $@
     74
     75$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c: arch_helenos/input.c | unpack-tarball
    6976        $(CP) $< $@
    7077
     
    7986        ) | make -f - | grep 'SOURCES' >Makefile.sources
    8087        sed \
    81                 -e 's:io/input.c:$(MSIM_HELENOS_PLATFORM_FILES):' \
     88                -e 's:io/input.c:$(MSIM_EXTRA_SOURCES):' \
    8289                -e 's:debug/gdb.c::' \
    8390                -e 's:arch/posix/stdin.c::' \
     
    9097unpack-tarball: $(MSIM_TARBALL)
    9198        tar xjf $(MSIM_TARBALL)
     99        mkdir -p $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)
  • uspace/app/msim/arch_helenos/input.c

    r7360332 r6efb4d2  
    3232/** @file HelenOS specific functions for MSIM simulator.
    3333 */
    34 #include "io/input.h"
    35 #include "io/output.h"
    36 #include "fault.h"
     34#include "../../io/input.h"
     35#include "../../io/output.h"
     36#include "../../fault.h"
     37#include "helenos.h"
    3738#include <tinput.h>
    3839#include <errno.h>
    3940
    4041static tinput_t *input_prompt;
    41 
    42 char *input_helenos_get_next_command(void);
    43 void helenos_dprinter_init(void);
    4442
    4543/** Terminal and readline initialization
     
    6765}
    6866
    69 char *input_helenos_get_next_command(void)
     67char *helenos_input_get_next_command(void)
    7068{
    7169        tinput_set_prompt(input_prompt, "[msim] ");
  • uspace/app/msim/arch_helenos/misc.c

    r7360332 r6efb4d2  
    3232/** @file HelenOS specific functions for MSIM simulator.
    3333 */
    34 #include "io/input.h"
    35 #include "io/output.h"
    36 #include "device/dprinter.h"
    37 #include "debug/gdb.h"
    38 #include "cmd.h"
    39 #include "fault.h"
    40 #include "device/machine.h"
     34#include "../../io/input.h"
     35#include "../../io/output.h"
     36#include "../../device/dprinter.h"
     37#include "../../debug/gdb.h"
     38#include "../../cmd.h"
     39#include "../../fault.h"
     40#include "../../device/machine.h"
     41#include "helenos.h"
    4142#include <str.h>
    4243#include <malloc.h>
     
    5354// #define DUMP_ANSI_ESCAPE_SEQUENCES
    5455
    55 extern char *input_helenos_get_next_command(void);
    56 
    5756void interactive_control(void)
    5857{
     
    6766
    6867        while (interactive) {
    69                 char *commline = input_helenos_get_next_command();
     68                char *commline = helenos_input_get_next_command();
    7069                if (commline == NULL) {
    7170                        mprintf("Quit\n");
     
    9897}
    9998
    100 
    101 char *input_helenos_get_next_command(void);
    10299
    103100static void (*original_printer_write)(cpu_t *, device_s *, ptr_t, uint32_t);
Note: See TracChangeset for help on using the changeset viewer.