Changes in / [b183ce0a:b92a0ee] in mainline

Files:

• HelenOS.config (modified) (9 diffs)
• boot/arch/mips32/Makefile.inc (modified) (1 diff)
• boot/arch/mips32/_link.ld.in (modified) (1 diff)
• boot/arch/mips32/include/arch.h (modified) (2 diffs)
• boot/arch/mips32/include/types.h (modified) (1 diff)
• boot/arch/mips32/src/asm.S (modified) (1 diff)
• boot/arch/mips32/src/main.c (modified) (3 diffs)
• boot/arch/mips32/src/putchar.c (modified) (1 diff)
• contrib/conf/ia32-qe.sh (modified) (2 diffs)
• contrib/conf/mips32-gx.sh (added)
• contrib/conf/net-qe.sh (modified) (1 diff)
• defaults/mips32/GXemul/Makefile.config (added)
• defaults/mips32/malta-be/Makefile.config (deleted)
• defaults/mips32/malta-le/Makefile.config (deleted)
• kernel/arch/mips32/Makefile.inc (modified) (3 diffs)
• kernel/arch/mips32/_link.ld.in (modified) (1 diff)
• kernel/arch/mips32/include/arch/arch.h (modified) (2 diffs)
• kernel/arch/mips32/include/arch/cp0.h (modified) (1 diff)
• kernel/arch/mips32/include/arch/mach/malta/malta.h (deleted)
• kernel/arch/mips32/include/arch/mach/msim/msim.h (deleted)
• kernel/arch/mips32/include/arch/machine_func.h (deleted)
• kernel/arch/mips32/include/arch/mm/tlb.h (modified) (2 diffs)
• kernel/arch/mips32/src/exception.c (modified) (1 diff)
• kernel/arch/mips32/src/interrupt.c (modified) (5 diffs)
• kernel/arch/mips32/src/mach/malta/malta.c (deleted)
• kernel/arch/mips32/src/mach/msim/msim.c (deleted)
• kernel/arch/mips32/src/machine_func.c (deleted)
• kernel/arch/mips32/src/mips32.c (modified) (5 diffs)
• kernel/arch/mips32/src/mm/frame.c (modified) (4 diffs)
• kernel/arch/mips32/src/mm/tlb.c (modified) (19 diffs)
• kernel/arch/mips64/src/mips64.c (modified) (3 diffs)
• kernel/arch/mips64/src/mm/frame.c (modified) (1 diff)
• kernel/generic/include/mm/tlb.h (modified) (1 diff)
• release/Makefile (modified) (1 diff)
• tools/autotool.py (modified) (2 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/app/netecho/netecho.c (modified) (5 diffs)
• uspace/app/nettest3/nettest3.c (modified) (4 diffs)
• uspace/lib/c/arch/mips32/Makefile.common (modified) (2 diffs)
• uspace/lib/c/arch/mips32eb/Makefile.common (modified) (2 diffs)
• uspace/lib/c/generic/async.c (modified) (3 diffs)
• uspace/lib/c/generic/fibril.c (modified) (2 diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (1 diff)
• uspace/lib/c/include/fibril.h (modified) (1 diff)
• uspace/srv/bd/gxe_bd/Makefile (added)
• uspace/srv/bd/gxe_bd/gxe_bd.c (added)
• uspace/srv/hid/input/Makefile (modified) (2 diffs)
• uspace/srv/hid/input/ctl/gxe_fb.c (added)
• uspace/srv/hid/input/input.c (modified) (1 diff)
• uspace/srv/hid/input/kbd_ctl.h (modified) (1 diff)
• uspace/srv/hid/input/kbd_port.h (modified) (1 diff)
• uspace/srv/hid/input/port/gxemul.c (added)
• uspace/srv/net/tcp/conn.c (modified) (2 diffs)
• uspace/srv/net/tcp/sock.c (modified) (6 diffs)
• uspace/srv/net/udp/assoc.c (modified) (3 diffs)
• uspace/srv/net/udp/assoc.h (modified) (1 diff)
• uspace/srv/net/udp/sock.c (modified) (13 diffs)
• uspace/srv/net/udp/ucall.c (modified) (1 diff)
• uspace/srv/net/udp/ucall.h (modified) (1 diff)
• uspace/srv/net/udp/udp_type.h (modified) (1 diff)

HelenOS.config

@@ -44 +44 @@
 % Machine type
 @ "msim" MSIM
-@ "bmalta" MIPS Malta Development Board big endian
-@ "lmalta" MIPS Malta Development Board little endian
+@ "bgxemul" GXEmul big endian
+@ "lgxemul" GXEmul little endian
 ! [PLATFORM=mips32] MACHINE (choice)
 
@@ -115 +115 @@
 ! [PLATFORM=arm32&(PROCESSOR=cortex_a8)] PROCESSOR_ARCH (choice)
 
-% CPU type
-@ "R4000" MIPS R4000
-! [PLATFORM=mips32&MACHINE=msim] PROCESSOR (choice)
-
-% CPU type
-@ "4Kc" MIPS 4Kc
-! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] PROCESSOR (choice)
-
 % RAM disk format
 @ "tmpfs" TMPFS image
@@ -201 +193 @@
 % User space architecture
 @ "mips32"
-! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lmalta)] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul)] UARCH (choice)
 
 % User space architecture
 @ "mips32eb"
-! [PLATFORM=mips32&MACHINE=bmalta] UARCH (choice)
+! [PLATFORM=mips32&MACHINE=bgxemul] UARCH (choice)
 
 % User space architecture
@@ -278 +270 @@
 
 % Image format
-@ "elf"
-! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
+@ "ecoff"
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
 
 % Image format
@@ -368 +360 @@
 ! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
 
+% FPU support
+! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
+
 ## armv7 made fpu hardware compulsory
 % FPU support
@@ -452 +447 @@
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
+
+% Output device class
+@ "generic" Monitor or serial line
+@ "monitor" Monitor
+@ "serial" Serial line
+@ "none" No output device
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
 
 % PC keyboard support
@@ -463 +465 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
 
-% Support for msim keyboard
-! [CONFIG_HID_IN=generic&MACHINE=msim] CONFIG_MSIM_KBD (y/n)
-
-% Support for msim printer
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=msim] CONFIG_MSIM_PRN (y/n)
+% Support for msim/GXemul keyboard
+! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
+
+% Support for msim/GXemul printer
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
 
 % Support for VIA CUDA controller
@@ -509 +511 @@
 
 % Dummy serial line input
-! [CONFIG_MSIM_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
+! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
 
 % Dummy serial line output
-! [CONFIG_MSIM_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module
@@ -525 +527 @@
 % Framebuffer support
 ! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n)
+
+% Framebuffer support
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)
 
 % Framebuffer support

boot/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BITS = 32
-EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
+EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
+RD_SRVS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
+
+ifeq ($(MACHINE),lgxemul)
+        BFD_NAME = elf32-tradlittlemips
+        BFD_OUTPUT = ecoff-littlemips
+        ENDIANESS = LE
+endif
+ifeq ($(MACHINE),bgxemul)
+        BFD_NAME = elf32-tradbigmips
+        BFD_OUTPUT = ecoff-bigmips
+        ENDIANESS = BE
+endif
 ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
         BFD_OUTPUT = binary
         ENDIANESS = LE
-        EXTRA_CFLAGS += -march=r4000
 endif
-ifeq ($(MACHINE),lmalta)
-        BFD_NAME = elf32-tradlittlemips
-        BFD_OUTPUT = elf32-tradlittlemips 
-        ENDIANESS = LE
-        EXTRA_CFLAGS += -march=4kc
-endif
-ifeq ($(MACHINE),bmalta)
-        BFD_NAME = elf32-tradbigmips
-        BFD_OUTPUT = elf32-tradbigmips 
-        ENDIANESS = BE
-        EXTRA_CFLAGS += -march=4kc
-endif
-
 
 SOURCES = \

boot/arch/mips32/_link.ld.in

@@ -2 +2 @@
 
 SECTIONS {
-#if defined(MACHINE_msim)
         . = 0xbfc00000;
-#elif defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        . = 0x80103000;
-#endif
         .text : {
                 *(BOOTSTRAP);

boot/arch/mips32/include/arch.h

@@ -33 +33 @@
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#if defined(MACHINE_msim)
 #define CPUMAP_OFFSET    0x00001000
 #define STACK_OFFSET     0x00002000
@@ -42 +41 @@
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
 #define MSIM_DORDER_ADDRESS    0xb0000100
-#endif
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-#define CPUMAP_OFFSET    0x00100000
-#define STACK_OFFSET     0x00101000
-#define BOOTINFO_OFFSET  0x00102000
-#define BOOT_OFFSET      0x00200000
-#define LOADER_OFFSET    0x00103000
-
-#define YAMON_SUBR_BASE         PA2KA(0x1fc00500)
-#define YAMON_SUBR_PRINT_COUNT  (YAMON_SUBR_BASE + 0x4)
-#endif
 
 #ifndef __ASM__
         #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
-        #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
-        #define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
         #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
 #else

boot/arch/mips32/include/types.h

@@ -47 +47 @@
 
 typedef struct {
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        uint32_t sdram_size;
-#endif
         uint32_t cpumap;
         size_t cnt;

boot/arch/mips32/src/asm.S

@@ -51 +51 @@
         and $a0, $a1, $a0
         mtc0 $a0, $status
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        /*
-         * Remember the size of the SDRAM in bootinfo.
-         */
-        la $a0, PA2KA(BOOTINFO_OFFSET)
-        sw $a3, 0($a0)
-#endif
         
         /*

boot/arch/mips32/src/main.c

@@ -65 +65 @@
         for (i = 0; i < COMPONENTS; i++)
                 printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    (uintptr_t) components[i].start >= PA2KSEG(0) ?
-                    (void *) KSEG2PA(components[i].start) :
-                    (void *) KA2PA(components[i].start),
-                    components[i].name, components[i].inflated,
-                    components[i].size);
+                    (void *) KSEG2PA(components[i].start), components[i].name,
+                    components[i].inflated, components[i].size);
         
         void *dest[COMPONENTS];
@@ -96 +93 @@
         
         for (i = cnt; i > 0; i--) {
-#ifdef MACHINE_msim
                 void *tail = dest[i - 1] + components[i].inflated;
                 if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
@@ -103 +99 @@
                         halt();
                 }
-#endif
                 
                 printf("%s ", components[i - 1].name);

boot/arch/mips32/src/putchar.c

@@ -32 +32 @@
 #include <str.h>
 
-#ifdef PUTCHAR_ADDRESS
-#undef PUTCHAR_ADDRESS
-#endif
-
-#if defined(MACHINE_msim)
-#define _putchar(ch)    msim_putchar((ch))
-static void msim_putchar(const wchar_t ch)
-{
-        *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
-}
-#endif
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-#define _putchar(ch)    yamon_putchar((ch))
-typedef void (**yamon_print_count_ptr_t)(uint32_t, const char *, uint32_t);
-yamon_print_count_ptr_t yamon_print_count =
-    (yamon_print_count_ptr_t) YAMON_SUBR_PRINT_COUNT;
-
-static void yamon_putchar(const wchar_t wch)
-{
-        const char ch = (char) wch;
-
-        (*yamon_print_count)(0, &ch, 1);
-}
-#endif
-
 void putchar(const wchar_t ch)
 {
         if (ascii_check(ch))
-                _putchar(ch);
+                *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
         else
-                _putchar(U_SPECIAL);
+                *((char *) MSIM_VIDEORAM_ADDRESS) = U_SPECIAL;
 }
-

contrib/conf/ia32-qe.sh

@@ -1 +1 @@
 #!/bin/sh
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
-fi
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
-fi
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        echo "QEMU binary not found"
-fi
 
 DISK_IMG=hdisk.img
@@ -20 +8 @@
 fi
 
-"${QEMU_BINARY}" "$@" -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d
+qemu $@ -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d

contrib/conf/net-qe.sh

@@ -1 +1 @@
 #!/bin/sh
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
-fi
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        QEMU_BINARY="`which --tty-only qemu-system-x86_64 2> /dev/null`"
-fi
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
-fi
-
-if [ -z "${QEMU_BINARY}" ] ; then
-        echo "QEMU binary not found"
-fi
 
 case "$1" in
         ne2k)
                 shift
-                "${QEMU_BINARY}" "$@" -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                qemu $@ -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         e1k)
                 shift
-                "${QEMU_BINARY}" "$@" -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                qemu $@ -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         rtl8139)
                 shift
-                "${QEMU_BINARY}" "$@" -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                qemu $@ -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         *)

kernel/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BFD = binary
-GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
+GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
 BITS = 32
@@ -36 +36 @@
 #
 
+ifeq ($(MACHINE),lgxemul)
+        BFD_NAME = elf32-tradlittlemips
+        ENDIANESS = LE
+endif
+ifeq ($(MACHINE),bgxemul)
+        BFD_NAME = elf32-tradbigmips
+        ENDIANESS = BE
+        GCC_CFLAGS += -D__BE__
+endif
 ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
         ENDIANESS = LE
-        GCC_CFLAGS += -march=r4000
-endif
-ifeq ($(MACHINE),bmalta)
-        BFD_NAME = elf32-tradbigmips
-        ENDIANESS = BE
-        GCC_CFLAGS += -D__BE__ -march=4kc
-endif
-ifeq ($(MACHINE),lmalta)
-        BFD_NAME = elf32-tradlittlemips
-        ENDIANESS = LE
-        GCC_CFLAGS += -march=4kc
 endif
 
@@ -71 +69 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/ddi/ddi.c \
-        arch/$(KARCH)/src/smp/smp.c \
-        arch/$(KARCH)/src/machine_func.c
-
-ifeq ($(MACHINE),msim)
-        ARCH_SOURCES += \
-                arch/$(KARCH)/src/smp/dorder.c
-endif
-
-ifeq ($(MACHINE),$(filter lmalta bmalta,$(MACHINE)))
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/malta/malta.c
-endif
-ifeq ($(MACHINE),msim)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/msim/msim.c
-endif
-
+        arch/$(KARCH)/src/smp/dorder.c \
+        arch/$(KARCH)/src/smp/smp.c

kernel/arch/mips32/_link.ld.in

@@ -10 +10 @@
 #define mips mips
 
-#if defined(MACHINE_msim)
 #define KERNEL_LOAD_ADDRESS 0x80100000
-#endif
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-#define KERNEL_LOAD_ADDRESS 0x80200000
-#endif
 
 OUTPUT_ARCH(mips)

kernel/arch/mips32/include/arch/arch.h

@@ -44 +44 @@
 extern size_t cpu_count;
 
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-extern size_t sdram_size;
-#endif
-
 typedef struct {
         void *addr;
@@ -55 +51 @@
 
 typedef struct {
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        uint32_t sdram_size;
-#endif
         uint32_t cpumap;
         size_t cnt;

kernel/arch/mips32/include/arch/cp0.h

@@ -45 +45 @@
 #define cp0_status_im_shift  8
 #define cp0_status_im_mask   0xff00
-
-#define cp0_cause_ip_shift  8
-#define cp0_cause_ip_mask   0xff00
 
 #define cp0_cause_excno(cause)   ((cause >> 2) & 0x1f)

kernel/arch/mips32/include/arch/mm/tlb.h

@@ -41 +41 @@
 #include <trace.h>
 
-#if defined(PROCESSOR_R4000)
 #define TLB_ENTRY_COUNT  48
-#define TLB_INDEX_BITS   6
-#elif defined(PROCESSOR_4Kc)
-#define TLB_ENTRY_COUNT  16
-#define TLB_INDEX_BITS   4
-#else
-#error Please define TLB_ENTRY_COUNT for the target processor.
-#endif
 
-#define TLB_WIRED               0 
+#define TLB_WIRED               1
+#define TLB_KSTACK_WIRED_INDEX  0
 
 #define TLB_PAGE_MASK_4K    (0x000 << 13)
@@ -119 +112 @@
 #ifdef __BE__
                 unsigned p : 1;
-                unsigned : 32 - TLB_INDEX_BITS - 1;
-                unsigned index : TLB_INDEX_BITS;
+                unsigned : 25;
+                unsigned index : 6;
 #else
-                unsigned index : TLB_INDEX_BITS;
-                unsigned : 32 - TLB_INDEX_BITS - 1;
+                unsigned index : 6;
+                unsigned : 25;
                 unsigned p : 1;
 #endif

kernel/arch/mips32/src/exception.c

@@ -165 +165 @@
 static void interrupt_exception(unsigned int n, istate_t *istate)
 {
-        uint32_t ip;
-        uint32_t im;
-
         /* Decode interrupt number and process the interrupt */
-        ip = (cp0_cause_read() & cp0_cause_ip_mask) >> cp0_cause_ip_shift;
-        im = (cp0_status_read() & cp0_status_im_mask) >> cp0_status_im_shift;
+        uint32_t cause = (cp0_cause_read() >> 8) & 0xff;
         
         unsigned int i;
         for (i = 0; i < 8; i++) {
-
-                /*
-                 * The interrupt could only occur if it is unmasked in the
-                 * status register. On the other hand, an interrupt can be
-                 * apparently pending even if it is masked, so we need to
-                 * check both the masked and pending interrupts.
-                 */
-                if (im & ip & (1 << i)) {
+                if (cause & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);
                         if (irq) {

kernel/arch/mips32/src/interrupt.c

@@ -45 +45 @@
 #define IRQ_COUNT   8
 #define TIMER_IRQ   7
-
-#ifdef MACHINE_msim
 #define DORDER_IRQ  5
-#endif
 
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
-
-#ifdef MACHINE_msim
 static irq_t dorder_irq;
-#endif
 
 // TODO: This is SMP unsafe!!!
@@ -157 +151 @@
 }
 
-#ifdef MACHINE_msim
 static irq_ownership_t dorder_claim(irq_t *irq)
 {
@@ -167 +160 @@
         dorder_ipi_ack(1 << dorder_cpuid());
 }
-#endif
 
 /* Initialize basic tables for exception dispatching */
@@ -184 +176 @@
         cp0_unmask_int(TIMER_IRQ);
         
-#ifdef MACHINE_msim
         irq_initialize(&dorder_irq);
         dorder_irq.devno = device_assign_devno();
@@ -193 +184 @@
         
         cp0_unmask_int(DORDER_IRQ);
-#endif
 }
 

kernel/arch/mips32/src/mips32.c

@@ -41 +41 @@
 #include <memstr.h>
 #include <userspace.h>
+#include <console/console.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/debug.h>
 #include <arch/debugger.h>
-#include <arch/machine_func.h>
+#include <arch/drivers/msim.h>
+#include <genarch/fb/fb.h>
+#include <genarch/drivers/dsrln/dsrlnin.h>
+#include <genarch/drivers/dsrln/dsrlnout.h>
+#include <genarch/srln/srln.h>
 
 /* Size of the code jumping to the exception handler code
@@ -65 +70 @@
 
 size_t cpu_count = 0;
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-size_t sdram_size = 0;
-#endif
 
 /** Performs mips32-specific initialization before main_bsp() is called. */
@@ -87 +88 @@
                         cpu_count++;
         }
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        sdram_size = bootinfo->sdram_size;
-#endif
-
-        /* Initialize machine_ops pointer. */
-        machine_ops_init();
 }
 
@@ -130 +124 @@
 {
         interrupt_init();
-
-        machine_init();
-        machine_output_init();
+        
+#ifdef CONFIG_FB
+        /* GXemul framebuffer */
+        fb_properties_t gxemul_prop = {
+                .addr = 0x12000000,
+                .offset = 0,
+                .x = 640,
+                .y = 480,
+                .scan = 1920,
+                .visual = VISUAL_RGB_8_8_8,
+        };
+        
+        outdev_t *fbdev = fb_init(&gxemul_prop);
+        if (fbdev)
+                stdout_wire(fbdev);
+#endif
+
+#ifdef CONFIG_MIPS_PRN
+        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
+        if (dsrlndev)
+                stdout_wire(dsrlndev);
+#endif
 }
 
@@ -145 +158 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
         /* Set platform name. */
-        sysinfo_set_item_data("platform", NULL,
-            (void *) machine_get_platform_name(),
-            str_size(machine_get_platform_name()));
-
-        machine_input_init();
+#ifdef MACHINE_msim
+        platform = "msim";
+#endif
+#ifdef MACHINE_bgxemul
+        platform = "gxemul";
+#endif
+#ifdef MACHINE_lgxemul
+        platform = "gxemul";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
+#ifdef CONFIG_MIPS_KBD
+        /*
+         * Initialize the msim/GXemul keyboard port. Then initialize the serial line
+         * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+         */
+        dsrlnin_instance_t *dsrlnin_instance
+            = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_KBD_IRQ);
+        if (dsrlnin_instance) {
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        dsrlnin_wire(dsrlnin_instance, srln);
+                        cp0_unmask_int(MSIM_KBD_IRQ);
+                }
+        }
+        
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            PA2KA(MSIM_KBD_ADDRESS));
+#endif
 }
 

kernel/arch/mips32/src/mm/frame.c

@@ -40 +40 @@
 #include <mm/asid.h>
 #include <config.h>
-#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
-#endif
-#include <arch/arch.h>
 #include <print.h>
 
@@ -87 +84 @@
                 return false;
 #endif
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        if (frame >= (sdram_size >> ZERO_PAGE_WIDTH))
+        
+#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
+        /* gxemul devices */
+        if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
+            0x10000000, MiB2SIZE(256)))
                 return false;
 #endif
@@ -226 +225 @@
                                         if (ZERO_PAGE_VALUE != 0xdeadbeef)
                                                 avail = false;
+#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
+                                        else {
+                                                ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
+                                                if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)
+                                                        avail = false;
+                                        }
+#endif
                                 }
                         }
@@ -241 +247 @@
         /* Blacklist interrupt vector frame */
         frame_mark_unavailable(0, 1);
-
-#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
-        /* Blacklist memory regions used by YAMON.
-         *
-         * The YAMON User's Manual vaguely says the following physical addresses
-         * are taken by YAMON:
-         *
-         * 0x1000       YAMON functions
-         * 0x5000       YAMON code
-         *
-         * These addresses overlap with the beginning of the SDRAM so we need to
-         * make sure they cannot be allocated.
-         *
-         * The User's Manual unfortunately does not say where does the SDRAM
-         * portion used by YAMON end.
-         *
-         * Looking into the YAMON 02.21 sources, it looks like the first free
-         * address is computed dynamically and depends on the size of the YAMON
-         * image. From the YAMON binary, it appears to be 0xc0d50 or roughly
-         * 772 KiB for that particular version.
-         *
-         * Linux is linked to 1MiB which seems to be a safe bet and a reasonable
-         * upper bound for memory taken by YAMON. We will use it too.
-         */
-        frame_mark_unavailable(0, 1024 * 1024 / FRAME_SIZE);
-#endif
         
         /* Cleanup */

kernel/arch/mips32/src/mm/tlb.c

@@ -48 +48 @@
 #include <symtab.h>
 
-#define PFN_SHIFT       12
-#define VPN_SHIFT       12
-#define ADDR2VPN(a)     ((a) >> VPN_SHIFT)
-#define ADDR2VPN2(a)    (ADDR2VPN((a)) >> 1)
-#define VPN2ADDR(vpn)   ((vpn) << VPN_SHIFT)
-#define VPN22ADDR(vpn2) (VPN2ADDR(vpn2) << 1)
-#define PFN2ADDR(pfn)   ((pfn) << PFN_SHIFT)
-
-#define BANK_SELECT_BIT(a)      (((a) >> PAGE_WIDTH) & 1) 
-        
+static pte_t *find_mapping_and_check(uintptr_t, int, istate_t *);
 
 /** Initialize TLB.
@@ -93 +84 @@
 {
         entry_lo_t lo;
+        entry_hi_t hi;
+        asid_t asid;
         uintptr_t badvaddr;
-        uintptr_t page;
         pte_t *pte;
         
         badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
-
-        pte = page_mapping_find(AS, page, true);
-        if (pte && pte->p) {
+        asid = AS->asid;
+        
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate);
+        if (pte) {
                 /*
                  * Record access to PTE.
@@ -107 +99 @@
                 pte->a = 1;
 
+                tlb_prepare_entry_hi(&hi, asid, badvaddr);
                 tlb_prepare_entry_lo(&lo, pte->g, pte->p, pte->d,
                     pte->cacheable, pte->pfn);
@@ -113 +106 @@
                  * New entry is to be inserted into TLB
                  */
-                if (BANK_SELECT_BIT(badvaddr) == 0) {
+                cp0_entry_hi_write(hi.value);
+                if ((badvaddr / PAGE_SIZE) % 2 == 0) {
                         cp0_entry_lo0_write(lo.value);
                         cp0_entry_lo1_write(0);
@@ -122 +116 @@
                 cp0_pagemask_write(TLB_PAGE_MASK_16K);
                 tlbwr();
-                return;
-        }
-
-        (void) as_page_fault(page, PF_ACCESS_READ, istate);
+        }
 }
 
@@ -134 +125 @@
 void tlb_invalid(istate_t *istate)
 {
-        entry_lo_t lo;
         tlb_index_t index;
         uintptr_t badvaddr;
-        uintptr_t page;
+        entry_lo_t lo;
+        entry_hi_t hi;
         pte_t *pte;
+
+        badvaddr = cp0_badvaddr_read();
 
         /*
          * Locate the faulting entry in TLB.
          */
+        hi.value = cp0_entry_hi_read();
+        tlb_prepare_entry_hi(&hi, hi.asid, badvaddr);
+        cp0_entry_hi_write(hi.value);
         tlbp();
         index.value = cp0_index_read();
 
-#if defined(PROCESSOR_4Kc)
-        /*
-         * This can happen on a 4Kc when Status.EXL is 1 and there is a TLB miss.
-         * EXL is 1 when interrupts are disabled. The combination of a TLB miss
-         * and disabled interrupts is possible in copy_to/from_uspace().
-         */
-        if (index.p) {
-                tlb_refill(istate);
-                return;
-        }
-#endif
-
         ASSERT(!index.p);
 
-        badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
-
-        pte = page_mapping_find(AS, page, true);
-        if (pte && pte->p) {
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate);
+        if (pte) {
                 /*
                  * Read the faulting TLB entry.
@@ -181 +162 @@
                  * The entry is to be updated in TLB.
                  */
-                if (BANK_SELECT_BIT(badvaddr) == 0)
+                if ((badvaddr / PAGE_SIZE) % 2 == 0)
                         cp0_entry_lo0_write(lo.value);
                 else
                         cp0_entry_lo1_write(lo.value);
+                cp0_pagemask_write(TLB_PAGE_MASK_16K);
                 tlbwi();
-                return;
-        }
-
-        (void) as_page_fault(page, PF_ACCESS_READ, istate);
+        }
 }
 
@@ -198 +177 @@
 void tlb_modified(istate_t *istate)
 {
-        entry_lo_t lo;
         tlb_index_t index;
         uintptr_t badvaddr;
-        uintptr_t page;
+        entry_lo_t lo;
+        entry_hi_t hi;
         pte_t *pte;
 
         badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
 
         /*
          * Locate the faulting entry in TLB.
          */
+        hi.value = cp0_entry_hi_read();
+        tlb_prepare_entry_hi(&hi, hi.asid, badvaddr);
+        cp0_entry_hi_write(hi.value);
         tlbp();
         index.value = cp0_index_read();
 
         /*
-         * Emit warning if the entry is not in TLB.
-         *
-         * We do not assert on this because this could be a manifestation of
-         * an emulator bug, such as QEMU Bug #1128935:
-         * https://bugs.launchpad.net/qemu/+bug/1128935  
+         * Fail if the entry is not in TLB.
          */
-        if (index.p) {
-                printf("%s: TLBP failed in exception handler (badvaddr=%#"
-                    PRIxn ", ASID=%d).\n", __func__, badvaddr,
-                    AS ? AS->asid : -1);
-                return;
-        }
-
-        pte = page_mapping_find(AS, page, true);
-        if (pte && pte->p && pte->w) {
+        ASSERT(!index.p);
+
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_WRITE, istate);
+        if (pte) {
                 /*
                  * Read the faulting TLB entry.
@@ -246 +218 @@
                  * The entry is to be updated in TLB.
                  */
-                if (BANK_SELECT_BIT(badvaddr) == 0)
+                if ((badvaddr / PAGE_SIZE) % 2 == 0)
                         cp0_entry_lo0_write(lo.value);
                 else
                         cp0_entry_lo1_write(lo.value);
+                cp0_pagemask_write(TLB_PAGE_MASK_16K);
                 tlbwi();
-                return;
-        }
-
-        (void) as_page_fault(page, PF_ACCESS_WRITE, istate);
+        }
+}
+
+/** Try to find PTE for faulting address.
+ *
+ * @param badvaddr      Faulting virtual address.
+ * @param access        Access mode that caused the fault.
+ * @param istate        Pointer to interrupted state.
+ *
+ * @return              PTE on success, NULL otherwise.
+ */
+pte_t *find_mapping_and_check(uintptr_t badvaddr, int access, istate_t *istate)
+{
+        entry_hi_t hi;
+        pte_t *pte;
+
+        hi.value = cp0_entry_hi_read();
+
+        ASSERT(hi.asid == AS->asid);
+
+        /*
+         * Check if the mapping exists in page tables.
+         */     
+        pte = page_mapping_find(AS, badvaddr, true);
+        if (pte && pte->p && (pte->w || access != PF_ACCESS_WRITE)) {
+                /*
+                 * Mapping found in page tables.
+                 * Immediately succeed.
+                 */
+                return pte;
+        }
+
+        /*
+         * Mapping not found in page tables.
+         * Resort to higher-level page fault handler.
+         */
+        if (as_page_fault(badvaddr, access, istate) == AS_PF_OK) {
+                pte = page_mapping_find(AS, badvaddr, true);
+                ASSERT(pte && pte->p);
+                ASSERT(pte->w || access != PF_ACCESS_WRITE);
+                return pte;
+        }
+
+        return NULL;
 }
 
@@ -271 +284 @@
 void tlb_prepare_entry_hi(entry_hi_t *hi, asid_t asid, uintptr_t addr)
 {
-        hi->value = 0;
-        hi->vpn2 = ADDR2VPN2(ALIGN_DOWN(addr, PAGE_SIZE));
+        hi->value = ALIGN_DOWN(addr, PAGE_SIZE * 2);
         hi->asid = asid;
 }
@@ -279 +291 @@
 void tlb_print(void)
 {
-        page_mask_t mask, mask_save;
-        entry_lo_t lo0, lo0_save, lo1, lo1_save;
+        page_mask_t mask;
+        entry_lo_t lo0, lo1;
         entry_hi_t hi, hi_save;
         unsigned int i;
 
         hi_save.value = cp0_entry_hi_read();
-        lo0_save.value = cp0_entry_lo0_read();
-        lo1_save.value = cp0_entry_lo1_read();
-        mask_save.value = cp0_pagemask_read();
-        
-        printf("[nr] [asid] [vpn2    ] [mask] [gvdc] [pfn     ]\n");
+        
+        printf("[nr] [asid] [vpn2] [mask] [gvdc] [pfn ]\n");
         
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
@@ -300 +309 @@
                 lo1.value = cp0_entry_lo1_read();
                 
-                printf("%-4u %-6u %0#10x %-#6x  %1u%1u%1u%1u  %0#10x\n",
-                    i, hi.asid, VPN22ADDR(hi.vpn2), mask.mask,
-                    lo0.g, lo0.v, lo0.d, lo0.c, PFN2ADDR(lo0.pfn));
-                printf("                               %1u%1u%1u%1u  %0#10x\n",
-                    lo1.g, lo1.v, lo1.d, lo1.c, PFN2ADDR(lo1.pfn));
+                printf("%-4u %-6u %#6x %#6x  %1u%1u%1u%1u  %#6x\n",
+                    i, hi.asid, hi.vpn2, mask.mask,
+                    lo0.g, lo0.v, lo0.d, lo0.c, lo0.pfn);
+                printf("                           %1u%1u%1u%1u  %#6x\n",
+                    lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);
         }
         
         cp0_entry_hi_write(hi_save.value);
-        cp0_entry_lo0_write(lo0_save.value);
-        cp0_entry_lo1_write(lo1_save.value);
-        cp0_pagemask_write(mask_save.value);
 }
 
@@ -316 +322 @@
 void tlb_invalidate_all(void)
 {
+        ipl_t ipl;
         entry_lo_t lo0, lo1;
         entry_hi_t hi_save;
         int i;
 
-        ASSERT(interrupts_disabled());
-
         hi_save.value = cp0_entry_hi_read();
+        ipl = interrupts_disable();
 
         for (i = TLB_WIRED; i < TLB_ENTRY_COUNT; i++) {
@@ -340 +346 @@
         }
         
+        interrupts_restore(ipl);
         cp0_entry_hi_write(hi_save.value);
 }
@@ -349 +356 @@
 void tlb_invalidate_asid(asid_t asid)
 {
+        ipl_t ipl;
         entry_lo_t lo0, lo1;
         entry_hi_t hi, hi_save;
         int i;
 
-        ASSERT(interrupts_disabled());
         ASSERT(asid != ASID_INVALID);
 
         hi_save.value = cp0_entry_hi_read();
+        ipl = interrupts_disable();
         
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
@@ -378 +386 @@
         }
         
+        interrupts_restore(ipl);
         cp0_entry_hi_write(hi_save.value);
 }
@@ -391 +400 @@
 {
         unsigned int i;
+        ipl_t ipl;
         entry_lo_t lo0, lo1;
         entry_hi_t hi, hi_save;
         tlb_index_t index;
-
-        ASSERT(interrupts_disabled());
         
         if (asid == ASID_INVALID)
@@ -401 +409 @@
 
         hi_save.value = cp0_entry_hi_read();
+        ipl = interrupts_disable();
 
         for (i = 0; i < cnt + 1; i += 2) {
+                hi.value = 0;
                 tlb_prepare_entry_hi(&hi, asid, page + i * PAGE_SIZE);
                 cp0_entry_hi_write(hi.value);
@@ -429 +439 @@
         }
         
+        interrupts_restore(ipl);
         cp0_entry_hi_write(hi_save.value);
 }

kernel/arch/mips64/src/mips64.c

@@ -46 +46 @@
 #include <arch/debug.h>
 #include <arch/debugger.h>
-#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
-#endif
 #include <genarch/fb/fb.h>
 #include <genarch/drivers/dsrln/dsrlnin.h>
@@ -127 +125 @@
         interrupt_init();
         
-#ifdef CONFIG_MSIM_PRN
+#ifdef CONFIG_MIPS_PRN
         outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
         if (dsrlndev)
@@ -153 +151 @@
             str_size(platform));
         
-#ifdef CONFIG_MSIM_KBD
-        /*
-         * Initialize the msim keyboard port. Then initialize the serial line
-         * module and connect it to the msim keyboard. Enable keyboard
-         * interrupts.
+#ifdef CONFIG_MIPS_KBD
+        /*
+         * Initialize the msim/GXemul keyboard port. Then initialize the serial line
+         * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
          */
         dsrlnin_instance_t *dsrlnin_instance

kernel/arch/mips64/src/mm/frame.c

@@ -40 +40 @@
 #include <mm/asid.h>
 #include <config.h>
-#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
-#endif
 #include <print.h>
 

kernel/generic/include/mm/tlb.h

@@ -73 +73 @@
 extern void tlb_shootdown_ipi_recv(void);
 #else
-#define tlb_shootdown_start(w, x, y, z) interrupts_disable()    
-#define tlb_shootdown_finalize(i)       (interrupts_restore(i));
+#define tlb_shootdown_start(w, x, y, z) (0)
+#define tlb_shootdown_finalize(i)       ((i) = (i));
 #define tlb_shootdown_ipi_recv()
 #endif /* CONFIG_SMP */

release/Makefile

@@ -33 +33 @@
 
 PROFILES = amd64 arm32/integratorcp arm32/gta02 arm32/beagleboardxm ia32 \
-    ia64/i460GX ia64/ski mips32/msim ppc32 sparc64/ultra
+    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
+    sparc64/ultra
 
 BZR = bzr

tools/autotool.py

@@ -224 +224 @@
                 cc_args.append("-mabi=32")
                 
-                if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
+                if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim")):
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
                 
-                if ((config['MACHINE'] == "bmalta")):
+                if (config['MACHINE'] == "bgxemul"):
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
@@ -715 +715 @@
                 if (config['COMPILER'] == "gcc_cross"):
                         target, cc_args, gnu_target, clang_target_unused = get_target(config)
+                                
                         path = "%s/%s/bin" % (cross_prefix, target)
                         prefix = "%s-" % gnu_target

uspace/Makefile

@@ -93 +93 @@
         srv/bd/sata_bd \
         srv/bd/file_bd \
+        srv/bd/gxe_bd \
         srv/bd/rd \
         srv/bd/part/guid_part \

uspace/app/init/init.c

@@ -369 +369 @@
 #ifdef CONFIG_START_BD
         srv_start("/srv/ata_bd");
+        srv_start("/srv/gxe_bd");
 #endif
         

uspace/app/netecho/netecho.c

@@ -243 +243 @@
                 if (verbose)
                         printf("accept()\n");
-                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
+                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
                 if (socket_id <= 0) {
                         socket_print_error(stderr, socket_id, "Socket accept: ", "\n");
@@ -312 +312 @@
                                 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
                                 if (rc != EOK)
-                                        socket_print_error(stderr, rc, "Socket sendto: ", "\n");
+                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
                         }
                 }
@@ -394 +394 @@
                 return listening_id;
         }
-        
-        /* Bind the listening socket */
-        rc = bind(listening_id, address, addrlen);
-        if (rc != EOK) {
-                socket_print_error(stderr, rc, "Socket bind: ", "\n");
-                return rc;
-        }
-        
+
         /* if the stream socket is used */
         if (type == SOCK_STREAM) {
@@ -409 +402 @@
                         backlog = 3;
                 }
-                
+
                 /* Set the backlog */
                 rc = listen(listening_id, backlog);
@@ -416 +409 @@
                         return rc;
                 }
+        }
+
+        /* Bind the listening socket */
+        rc = bind(listening_id, address, addrlen);
+        if (rc != EOK) {
+                socket_print_error(stderr, rc, "Socket bind: ", "\n");
+                return rc;
         }
 

uspace/app/nettest3/nettest3.c

@@ -63 +63 @@
         port = 7;
 
-        data = (char *) "Hello World!";
+        data = (char *)"Hello World!";
         size = str_size(data);
 
@@ -98 +98 @@
 
         printf("connect()\n");
-        rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
+        rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
         printf(" -> %d\n", rc);
         if (rc != 0)
@@ -115 +115 @@
         } while (rc > 0);
 
-        async_usleep(1000 * 1000);
+        async_usleep(1000*1000);
 
         printf("closesocket()\n");
@@ -124 +124 @@
 }
 
+
 /** @}
  */

uspace/lib/c/arch/mips32/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -msoft-float -mabi=32
+GCC_CFLAGS += -msoft-float -mips3 -mabi=32
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 
@@ -34 +34 @@
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips
-
-ifeq ($(MACHINE),msim)
-        GCC_CFLAGS += -march=r4000 
-endif
-
-ifeq ($(MACHINE),lmalta)
-        GCC_CFLAGS += -march=4kc
-endif
-

uspace/lib/c/arch/mips32eb/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -msoft-float -mabi=32
+GCC_CFLAGS += -msoft-float -mips3 -mabi=32
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 
@@ -34 +34 @@
 BFD_ARCH = mips
 BFD_NAME = elf32-tradbigmips
-
-ifeq ($(MACHINE),bmalta)
-        GCC_CFLAGS += -march=4kc
-endif
-

uspace/lib/c/generic/async.c

@@ -350 +350 @@
 static async_client_conn_t client_connection = default_client_connection;
 static async_interrupt_handler_t interrupt_received = default_interrupt_received;
-static size_t interrupt_handler_stksz = FIBRIL_DFLT_STK_SIZE;
+static size_t interrupt_handler_stksz = (size_t) -1;
 
 /** Setter for client_connection function pointer.
@@ -375 +375 @@
 /** Set the stack size for the interrupt handler notification fibrils.
  *
- * @param size Stack size in bytes.
+ * @param size Stack size. Use -1 to use the system default stack size.
  */
 void async_set_interrupt_handler_stack_size(size_t size)
@@ -2068 +2068 @@
         
         async_sess_t *sess = exch->sess;
-        assert(sess != NULL);
         
         atomic_dec(&sess->refcnt);

uspace/lib/c/generic/fibril.c

@@ -256 +256 @@
  * @param func Implementing function of the new fibril.
  * @param arg Argument to pass to func.
- * @param stksz Stack size in bytes.
+ * @param stksz Stack size, -1 for the system default stack size.
  *
  * @return 0 on failure or TLS of the new fibril.
@@ -269 +269 @@
                 return 0;
         
-        size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ?
-            stack_size_get() : stksz;
+        size_t stack_size = (stksz == (size_t) -1) ? stack_size_get() : stksz;
         fibril->stack = as_area_create((void *) -1, stack_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |

uspace/lib/c/generic/net/socket_client.c

@@ -192 +192 @@
 /** Default thread for new connections.
  *
- * @param[in] iid   The initial message identifier.
- * @param[in] icall The initial message call structure.
- * @param[in] arg   Local argument.
- *
+ * @param[in] iid       The initial message identifier.
+ * @param[in] icall     The initial message call structure.
+ * @param[in] arg       Local argument.
  */
 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall, void *arg)
 {
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
-                        async_answer_0(callid, 0);
-                        return;
+        ipc_callid_t callid;
+        ipc_call_t call;
+        socket_t *socket;
+        int rc;
+
+loop:
+        callid = async_get_call(&call);
+
+        switch (IPC_GET_IMETHOD(call)) {
+        case NET_SOCKET_RECEIVED:
+        case NET_SOCKET_ACCEPTED:
+        case NET_SOCKET_DATA_FRAGMENT_SIZE:
+                fibril_rwlock_read_lock(&socket_globals.lock);
+
+                /* Find the socket */
+                socket = sockets_find(socket_get_sockets(),
+                    SOCKET_GET_SOCKET_ID(call));
+                if (!socket) {
+                        rc = ENOTSOCK;
+                        fibril_rwlock_read_unlock(&socket_globals.lock);
+                        break;
                 }
-                
-                int rc;
                 
                 switch (IPC_GET_IMETHOD(call)) {
                 case NET_SOCKET_RECEIVED:
+                        fibril_mutex_lock(&socket->receive_lock);
+                        /* Push the number of received packet fragments */
+                        rc = dyn_fifo_push(&socket->received,
+                            SOCKET_GET_DATA_FRAGMENTS(call),
+                            SOCKET_MAX_RECEIVED_SIZE);
+                        if (rc == EOK) {
+                                /* Signal the received packet */
+                                fibril_condvar_signal(&socket->receive_signal);
+                        }
+                        fibril_mutex_unlock(&socket->receive_lock);
+                        break;
+
                 case NET_SOCKET_ACCEPTED:
-                case NET_SOCKET_DATA_FRAGMENT_SIZE:
-                        fibril_rwlock_read_lock(&socket_globals.lock);
-                        
-                        /* Find the socket */
-                        socket_t *socket = sockets_find(socket_get_sockets(),
-                            SOCKET_GET_SOCKET_ID(call));
-                        if (!socket) {
-                                rc = ENOTSOCK;
-                                fibril_rwlock_read_unlock(&socket_globals.lock);
-                                break;
+                        /* Push the new socket identifier */
+                        fibril_mutex_lock(&socket->accept_lock);
+                        rc = dyn_fifo_push(&socket->accepted, 1,
+                            SOCKET_MAX_ACCEPTED_SIZE);
+                        if (rc == EOK) {
+                                /* Signal the accepted socket */
+                                fibril_condvar_signal(&socket->accept_signal);
                         }
-                        
-                        switch (IPC_GET_IMETHOD(call)) {
-                        case NET_SOCKET_RECEIVED:
-                                fibril_mutex_lock(&socket->receive_lock);
-                                /* Push the number of received packet fragments */
-                                rc = dyn_fifo_push(&socket->received,
-                                    SOCKET_GET_DATA_FRAGMENTS(call),
-                                    SOCKET_MAX_RECEIVED_SIZE);
-                                if (rc == EOK) {
-                                        /* Signal the received packet */
-                                        fibril_condvar_signal(&socket->receive_signal);
-                                }
-                                fibril_mutex_unlock(&socket->receive_lock);
-                                break;
-                                
-                        case NET_SOCKET_ACCEPTED:
-                                /* Push the new socket identifier */
-                                fibril_mutex_lock(&socket->accept_lock);
-                                rc = dyn_fifo_push(&socket->accepted, 1,
-                                    SOCKET_MAX_ACCEPTED_SIZE);
-                                if (rc == EOK) {
-                                        /* Signal the accepted socket */
-                                        fibril_condvar_signal(&socket->accept_signal);
-                                }
-                                fibril_mutex_unlock(&socket->accept_lock);
-                                break;
-                        
-                        default:
-                                rc = ENOTSUP;
-                        }
-                        
-                        if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) &&
-                            (SOCKET_GET_DATA_FRAGMENT_SIZE(call) !=
-                            socket->data_fragment_size)) {
-                                fibril_rwlock_write_lock(&socket->sending_lock);
-                                
-                                /* Set the data fragment size */
-                                socket->data_fragment_size =
-                                    SOCKET_GET_DATA_FRAGMENT_SIZE(call);
-                                
-                                fibril_rwlock_write_unlock(&socket->sending_lock);
-                        }
-                        
-                        fibril_rwlock_read_unlock(&socket_globals.lock);
+                        fibril_mutex_unlock(&socket->accept_lock);
                         break;
-                        
+
                 default:
                         rc = ENOTSUP;
                 }
-                
-                async_answer_0(callid, (sysarg_t) rc);
-        }
+
+                if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) &&
+                    (SOCKET_GET_DATA_FRAGMENT_SIZE(call) !=
+                    socket->data_fragment_size)) {
+                        fibril_rwlock_write_lock(&socket->sending_lock);
+
+                        /* Set the data fragment size */
+                        socket->data_fragment_size =
+                            SOCKET_GET_DATA_FRAGMENT_SIZE(call);
+
+                        fibril_rwlock_write_unlock(&socket->sending_lock);
+                }
+
+                fibril_rwlock_read_unlock(&socket_globals.lock);
+                break;
+
+        default:
+                rc = ENOTSUP;
+        }
+
+        async_answer_0(callid, (sysarg_t) rc);
+        goto loop;
 }
 

uspace/lib/c/include/fibril.h

@@ -86 +86 @@
 extern void context_restore(context_t *ctx) __attribute__((noreturn));
 
-#define FIBRIL_DFLT_STK_SIZE    0
-
 #define fibril_create(func, arg) \
-        fibril_create_generic((func), (arg), FIBRIL_DFLT_STK_SIZE)
+        fibril_create_generic((func), (arg), (size_t) -1)
 extern fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t);
 extern void fibril_destroy(fid_t fid);

uspace/srv/hid/input/Makefile

@@ -39 +39 @@
         port/adb_mouse.c \
         port/chardev.c \
+        port/gxemul.c \
         port/msim.c \
         port/niagara.c \
@@ -47 +48 @@
         proto/mousedev.c \
         ctl/apple.c \
+        ctl/gxe_fb.c \
         ctl/kbdev.c \
         ctl/pc.c \

uspace/srv/hid/input/input.c

@@ -440 +440 @@
         kbd_add_dev(&msim_port, &stty_ctl);
 #endif
+#if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
+        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
+#endif
+#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
+        kbd_add_dev(&gxemul_port, &stty_ctl);
+#endif
 #if defined(UARCH_ppc32)
         kbd_add_dev(&adb_port, &apple_ctl);

uspace/srv/hid/input/kbd_ctl.h

@@ -49 +49 @@
 
 extern kbd_ctl_ops_t apple_ctl;
+extern kbd_ctl_ops_t gxe_fb_ctl;
 extern kbd_ctl_ops_t kbdev_ctl;
 extern kbd_ctl_ops_t pc_ctl;

uspace/srv/hid/input/kbd_port.h

@@ -51 +51 @@
 extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
+extern kbd_port_ops_t gxemul_port;
 extern kbd_port_ops_t msim_port;
 extern kbd_port_ops_t niagara_port;

uspace/srv/net/tcp/conn.c

@@ -354 +354 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp);
-        
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare conn (f:(%x,%u), l:(%x,%u))",
-            sp->foreign.addr.ipv4, sp->foreign.port,
-            sp->local.addr.ipv4, sp->local.port);
-        
+
         fibril_mutex_lock(&conn_list_lock);
-        
+
         list_foreach(conn_list, link) {
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
                 tcp_sockpair_t *csp = &conn->ident;
-                
-                log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%x,%u), l:(%x,%u))",
+                log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))",
                     csp->foreign.addr.ipv4, csp->foreign.port,
                     csp->local.addr.ipv4, csp->local.port);
-                
                 if (tcp_sockpair_match(sp, csp)) {
                         tcp_conn_addref(conn);
@@ -375 +369 @@
                 }
         }
-        
+
         fibril_mutex_unlock(&conn_list_lock);
         return NULL;

uspace/srv/net/tcp/sock.c

@@ -203 +203 @@
 {
         int rc;
-        struct sockaddr_in *addr;
-        size_t addr_size;
+        struct sockaddr *addr;
+        size_t addr_len;
         socket_core_t *sock_core;
         tcp_sockdata_t *socket;
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_bind()");
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept");
-        
-        addr = NULL;
-        
-        rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_size);
+        rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
-                goto out;
-        }
-        
-        if (addr_size != sizeof(struct sockaddr_in)) {
-                async_answer_0(callid, EINVAL);
-                goto out;
-        }
-        
+                return;
+        }
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind");
         rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call),
-            addr, addr_size, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,
+            addr, addr_len, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,
             last_used_port);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
-                goto out;
-        }
-        
+                return;
+        }
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find");
         sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call));
-        if (sock_core == NULL) {
-                async_answer_0(callid, ENOENT);
-                goto out;
-        }
-        
-        socket = (tcp_sockdata_t *)sock_core->specific_data;
-        /* XXX Anything to do? */
-        (void) socket;
-        
+        if (sock_core != NULL) {
+                socket = (tcp_sockdata_t *)sock_core->specific_data;
+                /* XXX Anything to do? */
+                (void) socket;
+        }
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - success");
         async_answer_0(callid, EOK);
-        
-out:
-        if (addr != NULL)
-                free(addr);
 }
 
@@ -264 +249 @@
         tcp_sock_lconn_t *lconn;
         int i;
-        int rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_listen()");
@@ -284 +268 @@
                 return;
         }
-        
-        if (sock_core->port <= 0) {
-                rc = socket_bind_free_port(&gsock, sock_core,
-                    TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,
-                    last_used_port);
-                if (rc != EOK) {
-                        async_answer_0(callid, rc);
-                        return;
-                }
-                
-                last_used_port = sock_core->port;
-        }
-        
-        socket = (tcp_sockdata_t *) sock_core->specific_data;
-        
+
+        socket = (tcp_sockdata_t *)sock_core->specific_data;
+
         /*
          * Prepare @c backlog listening connections.
          */
         fibril_mutex_lock(&socket->lock);
-        
+
         socket->backlog = backlog;
         socket->lconn = calloc(backlog, sizeof(tcp_conn_t *));
@@ -311 +283 @@
                 return;
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections");
-        
+
         lsocket.addr.ipv4 = TCP_IPV4_ANY;
         lsocket.port = sock_core->port;
         fsocket.addr.ipv4 = TCP_IPV4_ANY;
         fsocket.port = TCP_PORT_ANY;
-        
+
         for (i = 0; i < backlog; i++) {
 
@@ -390 +362 @@
                         return;
                 }
-                
+
                 last_used_port = sock_core->port;
         }
@@ -469 +441 @@
                 return;
         }
-        
-        if (sock_core->port <= 0) {
-                rc = socket_bind_free_port(&gsock, sock_core,
-                    TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,
-                    last_used_port);
-                if (rc != EOK) {
-                        async_answer_0(callid, rc);
-                        return;
-                }
-                
-                last_used_port = sock_core->port;
-        }
 
         socket = (tcp_sockdata_t *)sock_core->specific_data;

uspace/srv/net/udp/assoc.c

@@ -200 +200 @@
 /** Set local socket in association.
  *
- * @param assoc Association
- * @param lsock Local socket (deeply copied)
- *
+ * @param assoc         Association
+ * @param fsock         Foreign socket (deeply copied)
  */
 void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
@@ -209 +208 @@
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.local = *lsock;
-        fibril_mutex_unlock(&assoc->lock);
-}
-
-/** Set local port in association.
- *
- * @param assoc Association
- * @param lport Local port
- *
- */
-void udp_assoc_set_local_port(udp_assoc_t *assoc, uint16_t lport)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %" PRIu16 ")", assoc, lport);
-        fibril_mutex_lock(&assoc->lock);
-        assoc->ident.local.port = lport;
         fibril_mutex_unlock(&assoc->lock);
 }
@@ -421 +406 @@
 }
 
+
 /**
  * @}

uspace/srv/net/udp/assoc.h

@@ -47 +47 @@
 extern void udp_assoc_set_foreign(udp_assoc_t *, udp_sock_t *);
 extern void udp_assoc_set_local(udp_assoc_t *, udp_sock_t *);
-extern void udp_assoc_set_local_port(udp_assoc_t *, uint16_t);
 extern int udp_assoc_send(udp_assoc_t *, udp_sock_t *, udp_msg_t *);
 extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, udp_sock_t *);

uspace/srv/net/udp/sock.c

@@ -90 +90 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_notify_data(%d)", sock_core->socket_id);
         async_exch_t *exch = async_exchange_begin(sock_core->sess);
-        async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t) sock_core->socket_id,
+        async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t)sock_core->socket_id,
             UDP_FRAGMENT_SIZE, 0, 0, 1);
         async_exchange_end(exch);
@@ -177 +177 @@
                 goto out;
         }
-        
-        if (addr_size != sizeof(struct sockaddr_in)) {
-                async_answer_0(callid, EINVAL);
-                goto out;
-        }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind");
         rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call),
@@ -191 +186 @@
                 goto out;
         }
-        
+
+        if (addr_size != sizeof(struct sockaddr_in)) {
+                async_answer_0(callid, EINVAL);
+                goto out;
+        }
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find");
         sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call));
@@ -249 +249 @@
 static void udp_sock_sendto(udp_client_t *client, ipc_callid_t callid, ipc_call_t call)
 {
+        int socket_id;
+        int fragments;
+        int index;
+        struct sockaddr_in *addr;
+        size_t addr_size;
+        socket_core_t *sock_core;
+        udp_sockdata_t *socket;
+        udp_sock_t fsock, *fsockp;
+        ipc_call_t answer;
+        ipc_callid_t wcallid;
+        size_t length;
+        uint8_t buffer[UDP_FRAGMENT_SIZE];
+        udp_error_t urc;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()");
-        
-        struct sockaddr_in *addr = NULL;
-        udp_sock_t fsock;
-        udp_sock_t *fsock_ptr;
-        
+
+        addr = NULL;
+
         if (IPC_GET_IMETHOD(call) == NET_SOCKET_SENDTO) {
-                size_t addr_size;
-                int rc = async_data_write_accept((void **) &addr, false,
+                rc = async_data_write_accept((void **) &addr, false,
                     0, 0, 0, &addr_size);
                 if (rc != EOK) {
@@ -263 +275 @@
                         goto out;
                 }
-                
+
                 if (addr_size != sizeof(struct sockaddr_in)) {
                         async_answer_0(callid, EINVAL);
                         goto out;
                 }
-                
+
                 fsock.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
                 fsock.port = uint16_t_be2host(addr->sin_port);
-                fsock_ptr = &fsock;
-        } else
-                fsock_ptr = NULL;
-        
-        int socket_id = SOCKET_GET_SOCKET_ID(call);
-        
+                fsockp = &fsock;
+        } else {
+                fsockp = NULL;
+        }
+
+        socket_id = SOCKET_GET_SOCKET_ID(call);
+        fragments = SOCKET_GET_DATA_FRAGMENTS(call);
         SOCKET_GET_FLAGS(call);
-        
-        socket_core_t *sock_core =
-            socket_cores_find(&client->sockets, socket_id);
+
+        sock_core = socket_cores_find(&client->sockets, socket_id);
         if (sock_core == NULL) {
                 async_answer_0(callid, ENOTSOCK);
                 goto out;
         }
-        
-        udp_sockdata_t *socket =
-            (udp_sockdata_t *) sock_core->specific_data;
-        
-        if (sock_core->port <= 0) {
+
+        if (sock_core->port == 0) {
                 /* Implicitly bind socket to port */
-                int rc = socket_bind_free_port(&gsock, sock_core,
-                    UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, last_used_port);
+                rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call),
+                    addr, addr_size, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END,
+                    last_used_port);
                 if (rc != EOK) {
                         async_answer_0(callid, rc);
                         goto out;
                 }
-                
-                assert(sock_core->port > 0);
-                
-                udp_error_t urc = udp_uc_set_local_port(socket->assoc,
-                    sock_core->port);
-                
-                if (urc != UDP_EOK) {
-                        // TODO: better error handling
-                        async_answer_0(callid, EINTR);
-                        goto out;
-                }
-                
-                last_used_port = sock_core->port;
-        }
-        
+        }
+
+        socket = (udp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-        
+
         if (socket->assoc->ident.local.addr.ipv4 == UDP_IPV4_ANY) {
                 /* Determine local IP address */
                 inet_addr_t loc_addr, rem_addr;
-                
-                rem_addr.ipv4 = fsock_ptr ? fsock.addr.ipv4 :
+
+                rem_addr.ipv4 = fsockp ? fsock.addr.ipv4 :
                     socket->assoc->ident.foreign.addr.ipv4;
-                
-                int rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
+
+                rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
@@ -329 +327 @@
                         return;
                 }
-                
+
                 socket->assoc->ident.local.addr.ipv4 = loc_addr.ipv4;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x",
                     socket->assoc->ident.local.addr.ipv4);
         }
-        
+
+
         assert(socket->assoc != NULL);
-        
-        int fragments = SOCKET_GET_DATA_FRAGMENTS(call);
-        for (int index = 0; index < fragments; index++) {
-                ipc_callid_t wcallid;
-                size_t length;
-                
+
+        for (index = 0; index < fragments; index++) {
                 if (!async_data_write_receive(&wcallid, &length)) {
                         fibril_mutex_unlock(&socket->lock);
@@ -347 +342 @@
                         goto out;
                 }
-                
+
                 if (length > UDP_FRAGMENT_SIZE)
                         length = UDP_FRAGMENT_SIZE;
-                
-                uint8_t buffer[UDP_FRAGMENT_SIZE];
-                int rc = async_data_write_finalize(wcallid, buffer, length);
+
+                rc = async_data_write_finalize(wcallid, buffer, length);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
@@ -358 +352 @@
                         goto out;
                 }
-                
-                udp_error_t urc =
-                    udp_uc_send(socket->assoc, fsock_ptr, buffer, length, 0);
-                
+
+                urc = udp_uc_send(socket->assoc, fsockp, buffer, length, 0);
+
                 switch (urc) {
                 case UDP_EOK:
                         rc = EOK;
                         break;
-                case UDP_ENORES:
-                        rc = ENOMEM;
-                        break;
-                case UDP_EUNSPEC:
-                        rc = EINVAL;
-                        break;
-                case UDP_ENOROUTE:
-                        rc = EIO;
-                        break;
+/*              case TCP_ENOTEXIST:
+                        rc = ENOTCONN;
+                        break;
+                case TCP_ECLOSING:
+                        rc = ENOTCONN;
+                        break;
+                case TCP_ERESET:
+                        rc = ECONNABORTED;
+                        break;*/
                 default:
                         assert(false);
                 }
-                
+
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
@@ -385 +378 @@
                 }
         }
-        
-        ipc_call_t answer;
         
         IPC_SET_ARG1(answer, 0);
@@ -535 +526 @@
 static void udp_sock_close(udp_client_t *client, ipc_callid_t callid, ipc_call_t call)
 {
+        int socket_id;
+        socket_core_t *sock_core;
+        udp_sockdata_t *socket;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()");
-        int socket_id = SOCKET_GET_SOCKET_ID(call);
-        
-        socket_core_t *sock_core =
-            socket_cores_find(&client->sockets, socket_id);
+        socket_id = SOCKET_GET_SOCKET_ID(call);
+
+        sock_core = socket_cores_find(&client->sockets, socket_id);
         if (sock_core == NULL) {
                 async_answer_0(callid, ENOTSOCK);
                 return;
         }
-        
-        udp_sockdata_t *socket =
-            (udp_sockdata_t *) sock_core->specific_data;
+
+        socket = (udp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-        
-        int rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
+
+        rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             udp_free_sock_data);
         if (rc != EOK) {
@@ -556 +550 @@
                 return;
         }
-        
+
         fibril_mutex_unlock(&socket->lock);
         async_answer_0(callid, EOK);
@@ -589 +583 @@
                             &sock->recv_buffer_lock);
                 }
-                
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] call udp_uc_receive()");
                 urc = udp_uc_receive(sock->assoc, sock->recv_buffer,
                     UDP_FRAGMENT_SIZE, &rcvd, &xflags, &sock->recv_fsock);
                 sock->recv_error = urc;
-                
+
                 udp_sock_notify_data(sock->sock_core);
-                
+
                 if (urc != UDP_EOK) {
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
@@ -602 +596 @@
                         break;
                 }
-                
+
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv");
-                
+
                 sock->recv_buffer_used = rcvd;
                 fibril_mutex_unlock(&sock->recv_buffer_lock);

uspace/srv/net/udp/ucall.c

@@ -68 +68 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
-        
+
         udp_assoc_set_local(assoc, lsock);
-        return UDP_EOK;
-}
-
-udp_error_t udp_uc_set_local_port(udp_assoc_t *assoc, uint16_t lport)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %" PRIu16 ")", assoc, lport);
-        
-        udp_assoc_set_local_port(assoc, lport);
         return UDP_EOK;
 }

uspace/srv/net/udp/ucall.h

@@ -42 +42 @@
 extern udp_error_t udp_uc_set_foreign(udp_assoc_t *, udp_sock_t *);
 extern udp_error_t udp_uc_set_local(udp_assoc_t *, udp_sock_t *);
-extern udp_error_t udp_uc_set_local_port(udp_assoc_t *, uint16_t);
 extern udp_error_t udp_uc_send(udp_assoc_t *, udp_sock_t *, void *, size_t,
     xflags_t);

uspace/srv/net/udp/udp_type.h

@@ -66 +66 @@
 };
 
-enum udp_port {
+enum tcp_port {
         UDP_PORT_ANY = 0
 };