WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/ Rev HEAD and /trunk/uspace Rev 2728

Ignore whitespace Rev HEAD → Rev 2728

/trunk/uspace/srv/loader/arch/mips32eb
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/trunk/uspace/srv/net/modules.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/il_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_oc.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/arp/arp.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_client.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/il/ip/ip_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/netif_standalone.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/netif_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/netif/netif_nil_bundle.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/netif_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/netif/netif_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/netif.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/ne2000.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/dp8390.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/dp8390_drv.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/ne2000.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/dp8390.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/dp8390_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/local.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/dp8390/dp8390_port.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/lo/lo.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/netif/lo/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/netif/netif.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/self_test.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/self_test.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/tcp.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/tcp_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/tcp_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/tcp_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tcp/tcp.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tl_common.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/udp.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/udp_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/udp_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/udp_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/udp/udp.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_common.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_api.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/icmp/icmp_client.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tl_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/tl/tl_common.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/inet.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/app/parse.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/print_error.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/nettest1/nettest1.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/nettest1/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/nettest2/nettest2.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/nettest2/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/print_error.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/parse.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/ping/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/ping/ping.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/echo/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/app/echo/echo.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/nil_module.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/nil/nil_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/nil/nildummy/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/nildummy/nildummy.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/nildummy/nildummy.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/nildummy/nildummy_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/nil_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/eth/eth.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/eth/eth.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/eth/eth_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/eth/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/nil/eth/eth_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/checksum.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/int_map.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/dynamic_fifo.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/measured_strings.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/char_map.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/module_map.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/measured_strings.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/generic_field.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/packet/packet_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_server.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_header.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_client.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_client.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/packet/packet_server.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/module_map.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/dynamic_fifo.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/structures/char_map.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/structures/generic_char_map.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/icmp_api.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/il_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/netif_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/ip_codes.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/icmp_client.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/ip_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/socket.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/in6.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/netdb.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/hardware.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/socket_errno.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/ethernet_lsap.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/byteorder.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/tl_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/inet.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/device.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/icmp_common.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/nil_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/checksum.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/arp_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/include/tcp_codes.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/socket_codes.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/icmp_codes.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/net_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/ip_client.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/in.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/icmp_interface.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/include/ip_protocols.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/net/net_remote.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/net/net_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/net/net.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/net/start/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/net/start/netstart.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:mergeinfo

/trunk/uspace/srv/net/net/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/documentation.txt
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/socket/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/socket/socket_core.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/socket/socket_messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/socket/socket_core.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/modules.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/trunk/uspace/srv/net/configuration.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

 /trunk/uspace/srv/fs/tmpfs/tmpfs_ops.c
 ,406 → 45,310
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <dirent.h>
 #include <assert.h>
 #include <sys/types.h>
-#include <adt/hash_table.h>
+#include <libadt/hash_table.h>
 #include <as.h>
-#include <libfs.h>
 #define min(a, b)       ((a) < (b) ? (a) : (b))
 #define max(a, b)       ((a) > (b) ? (a) : (b))
-#define NODES_BUCKETS   256
+#define PLB_GET_CHAR(i)     (tmpfs_reg.plb_ro[(i) % PLB_SIZE])
-/** All root nodes have index 0. */
-#define TMPFS_SOME_ROOT     0
-/** Global counter for assigning node indices. Shared by all instances. */
-fs_index_t tmpfs_next_index = 1;
+#define DENTRIES_BUCKETS    256
 /*
- * Implementation of the libfs interface.
+ * Hash table of all directory entries.
  */
+hash_table_t dentries;
-/* Forward declarations of static functions. */
-static fs_node_t *tmpfs_match(fs_node_t *, const char *);
-static fs_node_t *tmpfs_node_get(dev_handle_t, fs_index_t);
-static void tmpfs_node_put(fs_node_t *);
-static fs_node_t *tmpfs_create_node(dev_handle_t, int);
-static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *);
-static int tmpfs_unlink_node(fs_node_t *, fs_node_t *, const char *);
-static int tmpfs_destroy_node(fs_node_t *);
-/* Implementation of helper functions. */
-static fs_index_t tmpfs_index_get(fs_node_t *fn)
+static hash_index_t dentries_hash(unsigned long *key)
 {
-    return TMPFS_NODE(fn)->index;
+    return *key % DENTRIES_BUCKETS;
 }
-static size_t tmpfs_size_get(fs_node_t *fn)
+static int dentries_compare(unsigned long *key, hash_count_t keys,
+    link_t *item)
 {
-    return TMPFS_NODE(fn)->size;
+    tmpfs_dentry_t *dentry = hash_table_get_instance(item, tmpfs_dentry_t,
+        dh_link);
+    return dentry->index == *key;
 }
-static unsigned tmpfs_lnkcnt_get(fs_node_t *fn)
+static void dentries_remove_callback(link_t *item)
 {
-    return TMPFS_NODE(fn)->lnkcnt;
 }
-static bool tmpfs_has_children(fs_node_t *fn)
-{
-    return !list_empty(&TMPFS_NODE(fn)->cs_head);
-}
-static fs_node_t *tmpfs_root_get(dev_handle_t dev_handle)
-{
-    return tmpfs_node_get(dev_handle, TMPFS_SOME_ROOT);
-}
-static char tmpfs_plb_get_char(unsigned pos)
-{
-    return tmpfs_reg.plb_ro[pos % PLB_SIZE];
-}
-static bool tmpfs_is_directory(fs_node_t *fn)
-{
-    return TMPFS_NODE(fn)->type == TMPFS_DIRECTORY;
-}
-static bool tmpfs_is_file(fs_node_t *fn)
-{
-    return TMPFS_NODE(fn)->type == TMPFS_FILE;
-}
-/** libfs operations */
-libfs_ops_t tmpfs_libfs_ops = {
-    .match = tmpfs_match,
-    .node_get = tmpfs_node_get,
-    .node_put = tmpfs_node_put,
-    .create = tmpfs_create_node,
-    .destroy = tmpfs_destroy_node,
-    .link = tmpfs_link_node,
-    .unlink = tmpfs_unlink_node,
-    .index_get = tmpfs_index_get,
-    .size_get = tmpfs_size_get,
-    .lnkcnt_get = tmpfs_lnkcnt_get,
-    .has_children = tmpfs_has_children,
-    .root_get = tmpfs_root_get,
-    .plb_get_char = tmpfs_plb_get_char,
-    .is_directory = tmpfs_is_directory,
-    .is_file = tmpfs_is_file
+/** TMPFS dentries hash table operations. */
+hash_table_operations_t dentries_ops = {
+    .hash = dentries_hash,
+    .compare = dentries_compare,
+    .remove_callback = dentries_remove_callback
 };
-/** Hash table of all TMPFS nodes. */
-hash_table_t nodes;
+unsigned tmpfs_next_index = 1;
-#define NODES_KEY_INDEX 0
-#define NODES_KEY_DEV   1
-/* Implementation of hash table interface for the nodes hash table. */
-static hash_index_t nodes_hash(unsigned long key[])
+static void tmpfs_dentry_initialize(tmpfs_dentry_t *dentry)
 {
-    return key[NODES_KEY_INDEX] % NODES_BUCKETS;
+    dentry->index = 0;
+    dentry->parent = NULL;
+    dentry->sibling = NULL;
+    dentry->child = NULL;
+    dentry->name = NULL;
+    dentry->type = TMPFS_NONE;
+    dentry->size = 0;
+    dentry->data = NULL;
+    link_initialize(&dentry->dh_link);
 }
-static int nodes_compare(unsigned long key[], hash_count_t keys, link_t *item)
-{
-    tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
-        nh_link);
-    return (nodep->index == key[NODES_KEY_INDEX] &&
-        nodep->dev_handle == key[NODES_KEY_DEV]);
-}
+/*
+ * For now, we don't distinguish between different dev_handles/instances. All
+ * requests resolve to the only instance, rooted in the following variable.
+ */
+static tmpfs_dentry_t *root;
-static void nodes_remove_callback(link_t *item)
+static bool tmpfs_init(void)
 {
-}
+    if (!hash_table_create(&dentries, DENTRIES_BUCKETS, 1, &dentries_ops))
+        return false;
-/** TMPFS nodes hash table operations. */
-hash_table_operations_t nodes_ops = {
-    .hash = nodes_hash,
-    .compare = nodes_compare,
-    .remove_callback = nodes_remove_callback
-};
+    root = (tmpfs_dentry_t *) malloc(sizeof(tmpfs_dentry_t));
+    if (!root)
+        return false;
+    tmpfs_dentry_initialize(root);
+    root->index = tmpfs_next_index++;
+    root->name = "";
+    root->type = TMPFS_DIRECTORY;
+    hash_table_insert(&dentries, &root->index, &root->dh_link);
-static void tmpfs_node_initialize(tmpfs_node_t *nodep)
-{
-    nodep->bp = NULL;
-    nodep->index = 0;
-    nodep->dev_handle = 0;
-    nodep->type = TMPFS_NONE;
-    nodep->lnkcnt = 0;
-    nodep->size = 0;
-    nodep->data = NULL;
-    link_initialize(&nodep->nh_link);
-    list_initialize(&nodep->cs_head);
-}
-static void tmpfs_dentry_initialize(tmpfs_dentry_t *dentryp)
-{
-    link_initialize(&dentryp->link);
-    dentryp->name = NULL;
-    dentryp->node = NULL;
-}
-bool tmpfs_init(void)
-{
-    if (!hash_table_create(&nodes, NODES_BUCKETS, 2, &nodes_ops))
-        return false;
     return true;
 }
-static bool tmpfs_instance_init(dev_handle_t dev_handle)
+/** Compare one component of path to a directory entry.
+ *
+ * @param dentry    Directory entry to compare the path component with.
+ * @param component Array of characters holding component name.
+ *
+ * @return      True on match, false otherwise.
+ */
+static bool match_component(tmpfs_dentry_t *dentry, const char *component)
 {
-    fs_node_t *rfn;
-    rfn = tmpfs_create_node(dev_handle, L_DIRECTORY);
-    if (!rfn)
-        return false;
-    TMPFS_NODE(rfn)->lnkcnt = 0;    /* FS root is not linked */
-    return true;
+    return !strcmp(dentry->name, component);
 }
-fs_node_t *tmpfs_match(fs_node_t *pfn, const char *component)
+static unsigned long create_node(tmpfs_dentry_t *dentry,
+    const char *component, int lflag)
 {
-    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
-    link_t *lnk;
+    assert(dentry->type == TMPFS_DIRECTORY);
+    assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
-    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
-        lnk = lnk->next) {
-        tmpfs_dentry_t *dentryp = list_get_instance(lnk, tmpfs_dentry_t,
-            link);
-        if (!str_cmp(dentryp->name, component))
-            return FS_NODE(dentryp->node);
+    tmpfs_dentry_t *node = malloc(sizeof(tmpfs_dentry_t));
+    if (!node)
+        return 0;
+    size_t len = strlen(component);
+    char *name = malloc(len + 1);
+    if (!name) {
+        free(node);
+        return 0;
     }
+    strcpy(name, component);
-    return NULL;
-}
+    tmpfs_dentry_initialize(node);
+    node->index = tmpfs_next_index++;
+    node->name = name;
+    node->parent = dentry;
+    if (lflag & L_DIRECTORY)
+        node->type = TMPFS_DIRECTORY;
+    else
+        node->type = TMPFS_FILE;
-fs_node_t *tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index)
-{
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = index,
-        [NODES_KEY_DEV] = dev_handle
-    };
-    link_t *lnk = hash_table_find(&nodes, key);
-    if (!lnk)
-        return NULL;
-    return FS_NODE(hash_table_get_instance(lnk, tmpfs_node_t, nh_link));
-}
+    /* Insert the new node into the namespace. */
+    if (dentry->child) {
+        tmpfs_dentry_t *tmp = dentry->child;
+        while (tmp->sibling)
+            tmp = tmp->sibling;
+        tmp->sibling = node;
+    } else {
+        dentry->child = node;
+    }
-void tmpfs_node_put(fs_node_t *fn)
-{
-    /* nothing to do */
+    /* Insert the new node into the dentry hash table. */
+    hash_table_insert(&dentries, &node->index, &node->dh_link);
+    return node->index;
 }
-fs_node_t *tmpfs_create_node(dev_handle_t dev_handle, int lflag)
+static int destroy_component(tmpfs_dentry_t *dentry)
 {
-    assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
-    tmpfs_node_t *nodep = malloc(sizeof(tmpfs_node_t));
-    if (!nodep)
-        return NULL;
-    tmpfs_node_initialize(nodep);
-    nodep->bp = malloc(sizeof(fs_node_t));
-    if (!nodep->bp) {
-        free(nodep);
-        return NULL;
-    }
-    fs_node_initialize(nodep->bp);
-    nodep->bp->data = nodep;    /* link the FS and TMPFS nodes */
-    if (!tmpfs_root_get(dev_handle))
-        nodep->index = TMPFS_SOME_ROOT;
-    else
-        nodep->index = tmpfs_next_index++;
-    nodep->dev_handle = dev_handle;
-    if (lflag & L_DIRECTORY)
-        nodep->type = TMPFS_DIRECTORY;
-    else
-        nodep->type = TMPFS_FILE;
-    /* Insert the new node into the nodes hash table. */
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = nodep->index,
-        [NODES_KEY_DEV] = nodep->dev_handle
-    };
-    hash_table_insert(&nodes, key, &nodep->nh_link);
-    return FS_NODE(nodep);
+    return EPERM;
 }
-int tmpfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
+void tmpfs_lookup(ipc_callid_t rid, ipc_call_t *request)
 {
-    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
-    tmpfs_node_t *childp = TMPFS_NODE(cfn);
-    tmpfs_dentry_t *dentryp;
-    link_t *lnk;
+    unsigned next = IPC_GET_ARG1(*request);
+    unsigned last = IPC_GET_ARG2(*request);
+    int dev_handle = IPC_GET_ARG3(*request);
+    int lflag = IPC_GET_ARG4(*request);
-    assert(parentp->type == TMPFS_DIRECTORY);
+    if (last < next)
+        last += PLB_SIZE;
-    /* Check for duplicit entries. */
-    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
-        lnk = lnk->next) {
-        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
-        if (!str_cmp(dentryp->name, nm))
-            return EEXIST;
+    /*
+     * Initialize TMPFS.
+     */
+    if (!root && !tmpfs_init()) {
+        ipc_answer_0(rid, ENOMEM);
+        return;
     }
-    /* Allocate and initialize the dentry. */
-    dentryp = malloc(sizeof(tmpfs_dentry_t));
-    if (!dentryp)
-        return ENOMEM;
-    tmpfs_dentry_initialize(dentryp);
+    tmpfs_dentry_t *dtmp = root->child;
+    tmpfs_dentry_t *dcur = root;
-    /* Populate and link the new dentry. */
-    size_t size = str_size(nm);
-    dentryp->name = malloc(size + 1);
-    if (!dentryp->name) {
-        free(dentryp);
-        return ENOMEM;
-    }
-    str_cpy(dentryp->name, size + 1, nm);
-    dentryp->node = childp;
-    childp->lnkcnt++;
-    list_append(&dentryp->link, &parentp->cs_head);
-    return EOK;
-}
-int tmpfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
-{
-    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
-    tmpfs_node_t *childp = NULL;
-    tmpfs_dentry_t *dentryp;
-    link_t *lnk;
-    if (!parentp)
-        return EBUSY;
+    if (PLB_GET_CHAR(next) == '/')
+        next++;     /* eat slash */
-    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
-        lnk = lnk->next) {
-        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
-        if (!str_cmp(dentryp->name, nm)) {
-            childp = dentryp->node;
-            assert(FS_NODE(childp) == cfn);
-            break;
-        }
-    }
+    char component[NAME_MAX + 1];
+    int len = 0;
+    while (dtmp && next <= last) {
-    if (!childp)
-        return ENOENT;
-    if ((childp->lnkcnt == 1) && !list_empty(&childp->cs_head))
-        return ENOTEMPTY;
+        /* collect the component */
+        if (PLB_GET_CHAR(next) != '/') {
+            if (len + 1 == NAME_MAX) {
+                /* comopnent length overflow */
+                ipc_answer_0(rid, ENAMETOOLONG);
+                return;
+            }
+            component[len++] = PLB_GET_CHAR(next);
+            next++; /* process next character */
+            if (next <= last)
+                continue;
+        }
-    list_remove(&dentryp->link);
-    free(dentryp);
-    childp->lnkcnt--;
+        assert(len);
+        component[len] = '\0';
+        next++;     /* eat slash */
+        len = 0;
-    return EOK;
-}
+        /* match the component */
+        while (dtmp && !match_component(dtmp, component))
+            dtmp = dtmp->sibling;
-int tmpfs_destroy_node(fs_node_t *fn)
-{
-    tmpfs_node_t *nodep = TMPFS_NODE(fn);
-    assert(!nodep->lnkcnt);
-    assert(list_empty(&nodep->cs_head));
+        /* handle miss: match amongst siblings */
+        if (!dtmp) {
+            if ((next > last) && (lflag & L_CREATE)) {
+                /* no components left and L_CREATE specified */
+                if (dcur->type != TMPFS_DIRECTORY) {
+                    ipc_answer_0(rid, ENOTDIR);
+                    return;
+                }
+                unsigned long index = create_node(dcur,
+                    component, lflag);
+                if (index > 0) {
+                    ipc_answer_4(rid, EOK,
+                        tmpfs_reg.fs_handle, dev_handle,
+                        index, 0);
+                } else {
+                    ipc_answer_0(rid, ENOSPC);
+                }
+                return;
+            }
+            ipc_answer_0(rid, ENOENT);
+            return;
+        }
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = nodep->index,
-        [NODES_KEY_DEV] = nodep->dev_handle
-    };
-    hash_table_remove(&nodes, key, 2);
+        /* descend one level */
+        dcur = dtmp;
+        dtmp = dtmp->child;
+    }
-    if (nodep->type == TMPFS_FILE)
-        free(nodep->data);
-    free(nodep->bp);
-    free(nodep);
-    return EOK;
-}
+    /* handle miss: excessive components */
+    if (!dtmp && next <= last) {
+        if (lflag & L_CREATE) {
+            if (dcur->type != TMPFS_DIRECTORY) {
+                ipc_answer_0(rid, ENOTDIR);
+                return;
+            }
-void tmpfs_mounted(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+            /* collect next component */
+            while (next <= last) {
+                if (PLB_GET_CHAR(next) == '/') {
+                    /* more than one component */
+                    ipc_answer_0(rid, ENOENT);
+                    return;
+                }
+                if (len + 1 == NAME_MAX) {
+                    /* component length overflow */
+                    ipc_answer_0(rid, ENAMETOOLONG);
+                    return;
+                }
+                component[len++] = PLB_GET_CHAR(next);
+                next++; /* process next character */
+            }
+            assert(len);
+            component[len] = '\0';
+            len = 0;
+            unsigned long index;
+            index = create_node(dcur, component, lflag);
+            if (index) {
+                ipc_answer_4(rid, EOK, tmpfs_reg.fs_handle,
+                    dev_handle, index, 0);
+            } else {
+                ipc_answer_0(rid, ENOSPC);
+            }
+            return;
+        }
+        ipc_answer_0(rid, ENOENT);
+        return;
+    }
-    /* accept the mount options */
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
+    /* handle hit */
+    if (lflag & L_DESTROY) {
+        int res = destroy_component(dcur);
+        ipc_answer_0(rid, res);
         return;
     }
-    char *opts = malloc(size + 1);
-    if (!opts) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
+    if ((lflag & (L_CREATE | L_EXCLUSIVE)) == (L_CREATE | L_EXCLUSIVE)) {
+        ipc_answer_0(rid, EEXIST);
         return;
     }
-    ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
-    if (retval != EOK) {
-        ipc_answer_0(rid, retval);
-        free(opts);
+    if ((lflag & L_FILE) && (dcur->type != TMPFS_FILE)) {
+        ipc_answer_0(rid, EISDIR);
         return;
     }
-    opts[size] = '\0';
-    /* Initialize TMPFS instance. */
-    if (!tmpfs_instance_init(dev_handle)) {
-        ipc_answer_0(rid, ENOMEM);
+    if ((lflag & L_DIRECTORY) && (dcur->type != TMPFS_DIRECTORY)) {
+        ipc_answer_0(rid, ENOTDIR);
         return;
     }
-    tmpfs_node_t *rootp = TMPFS_NODE(tmpfs_root_get(dev_handle));
-    if (str_cmp(opts, "restore") == 0) {
-        if (tmpfs_restore(dev_handle))
-            ipc_answer_3(rid, EOK, rootp->index, rootp->size,
-                rootp->lnkcnt);
-        else
-            ipc_answer_0(rid, ELIMIT);
-    } else {
-        ipc_answer_3(rid, EOK, rootp->index, rootp->size,
-            rootp->lnkcnt);
-    }
+    ipc_answer_4(rid, EOK, tmpfs_reg.fs_handle, dev_handle, dcur->index,
+        dcur->size);
 }
-void tmpfs_mount(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_mount(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
-}
-void tmpfs_lookup(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_lookup(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
-}
 void tmpfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = (off_t)IPC_GET_ARG3(*request);
+    int dev_handle = IPC_GET_ARG1(*request);
+    unsigned long index = IPC_GET_ARG2(*request);
+    off_t pos = IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective TMPFS node.
+     * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = index,
-        [NODES_KEY_DEV] = dev_handle,
-    };
-    hlp = hash_table_find(&nodes, key);
+    hlp = hash_table_find(&dentries, &index);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
-        nh_link);
+    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
+        dh_link);
     /*
      * Receive the read request.
      */
     ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_read_receive(&callid, &size)) {
+    size_t len;
+    if (!ipc_data_read_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,16 → 355,15
     }
     size_t bytes;
-    if (nodep->type == TMPFS_FILE) {
-        bytes = max(0, min(nodep->size - pos, size));
-        (void) ipc_data_read_finalize(callid, nodep->data + pos,
+    if (dentry->type == TMPFS_FILE) {
+        bytes = max(0, min(dentry->size - pos, len));
+        (void) ipc_data_read_finalize(callid, dentry->data + pos,
             bytes);
     } else {
-        tmpfs_dentry_t *dentryp;
-        link_t *lnk;
         int i;
+        tmpfs_dentry_t *cur = dentry->child;
-        assert(nodep->type == TMPFS_DIRECTORY);
+        assert(dentry->type == TMPFS_DIRECTORY);
         /*
          * Yes, we really use O(n) algorithm here.
 ,21 → 370,18
          * If it bothers someone, it could be fixed by introducing a
          * hash table.
          */
-        for (i = 0, lnk = nodep->cs_head.next;
-            i < pos && lnk != &nodep->cs_head;
-            i++, lnk = lnk->next)
+        for (i = 0, cur = dentry->child; i < pos && cur; i++,
+            cur = cur->sibling)
             ;
-        if (lnk == &nodep->cs_head) {
+        if (!cur) {
             ipc_answer_0(callid, ENOENT);
             ipc_answer_1(rid, ENOENT, 0);
             return;
         }
-        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
-        (void) ipc_data_read_finalize(callid, dentryp->name,
-            str_size(dentryp->name) + 1);
+        (void) ipc_data_read_finalize(callid, cur->name,
+            strlen(cur->name) + 1);
         bytes = 1;
     }
 ,32 → 393,28
 void tmpfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = (off_t)IPC_GET_ARG3(*request);
+    int dev_handle = IPC_GET_ARG1(*request);
+    unsigned long index = IPC_GET_ARG2(*request);
+    off_t pos = IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective TMPFS node.
+     * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = index,
-        [NODES_KEY_DEV] = dev_handle
-    };
-    hlp = hash_table_find(&nodes, key);
+    hlp = hash_table_find(&dentries, &index);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
-        nh_link);
+    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
+        dh_link);
     /*
      * Receive the write request.
      */
     ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_write_receive(&callid, &size)) {
+    size_t len;
+    if (!ipc_data_write_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,13 → 423,13
     /*
      * Check whether the file needs to grow.
      */
-    if (pos + size <= nodep->size) {
+    if (pos + len <= dentry->size) {
         /* The file size is not changing. */
-        (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
-        ipc_answer_2(rid, EOK, size, nodep->size);
+        (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
+        ipc_answer_2(rid, EOK, len, dentry->size);
         return;
     }
-    size_t delta = (pos + size) - nodep->size;
+    size_t delta = (pos + len) - dentry->size;
     /*
      * At this point, we are deliberately extremely straightforward and
      * simply realloc the contents of the file on every write that grows the
 ,104 → 437,57
      * our heap allocator can save us and just grow the block whenever
      * possible.
      */
-    void *newdata = realloc(nodep->data, nodep->size + delta);
+    void *newdata = realloc(dentry->data, dentry->size + delta);
     if (!newdata) {
         ipc_answer_0(callid, ENOMEM);
-        ipc_answer_2(rid, EOK, 0, nodep->size);
+        ipc_answer_2(rid, EOK, 0, dentry->size);
         return;
     }
     /* Clear any newly allocated memory in order to emulate gaps. */
-    memset(newdata + nodep->size, 0, delta);
-    nodep->size += delta;
-    nodep->data = newdata;
-    (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
-    ipc_answer_2(rid, EOK, size, nodep->size);
+    memset(newdata + dentry->size, 0, delta);
+    dentry->size += delta;
+    dentry->data = newdata;
+    (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
+    ipc_answer_2(rid, EOK, len, dentry->size);
 }
 void tmpfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 {
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    size_t size = (off_t)IPC_GET_ARG3(*request);
+    int dev_handle = IPC_GET_ARG1(*request);
+    unsigned long index = IPC_GET_ARG2(*request);
+    size_t size = IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective TMPFS node.
+     * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = index,
-        [NODES_KEY_DEV] = dev_handle
-    };
-    hlp = hash_table_find(&nodes, key);
+    hlp = hash_table_find(&dentries, &index);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
-        nh_link);
+    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
+        dh_link);
-    if (size == nodep->size) {
+    if (size == dentry->size) {
         ipc_answer_0(rid, EOK);
         return;
     }
-    void *newdata = realloc(nodep->data, size);
+    void *newdata = realloc(dentry->data, size);
     if (!newdata) {
         ipc_answer_0(rid, ENOMEM);
         return;
     }
-    if (size > nodep->size) {
-        size_t delta = size - nodep->size;
-        memset(newdata + nodep->size, 0, delta);
+    if (size > dentry->size) {
+        size_t delta = size - dentry->size;
+        memset(newdata + dentry->size, 0, delta);
     }
-    nodep->size = size;
-    nodep->data = newdata;
+    dentry->size = size;
+    dentry->data = newdata;
     ipc_answer_0(rid, EOK);
 }
-void tmpfs_close(ipc_callid_t rid, ipc_call_t *request)
-{
-    ipc_answer_0(rid, EOK);
-}
-void tmpfs_destroy(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    int rc;
-    link_t *hlp;
-    unsigned long key[] = {
-        [NODES_KEY_INDEX] = index,
-        [NODES_KEY_DEV] = dev_handle
-    };
-    hlp = hash_table_find(&nodes, key);
-    if (!hlp) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
-        nh_link);
-    rc = tmpfs_destroy_node(FS_NODE(nodep));
-    ipc_answer_0(rid, rc);
-}
-void tmpfs_open_node(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_open_node(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
-}
-void tmpfs_stat(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_stat(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
-}
-void tmpfs_sync(ipc_callid_t rid, ipc_call_t *request)
-{
-    /* Dummy implementation */
-    ipc_answer_0(rid, EOK);
-}
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/fs/tmpfs/tmpfs.c
 ,11 → 50,24
 #include <libfs.h>
 #include "../../vfs/vfs.h"
-#define NAME "tmpfs"
 vfs_info_t tmpfs_vfs_info = {
     .name = "tmpfs",
+    .ops = {
+        [IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_OPEN)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_CLOSE)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_READ)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_WRITE)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_TRUNCATE)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_RENAME)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_OPENDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_READDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_CLOSEDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_UNLINK)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_NULL,
+    }
 };
 fs_reg_t tmpfs_reg;
 ,41 → 109,15
         callid = async_get_call(&call);
         switch  (IPC_GET_METHOD(call)) {
-        case IPC_M_PHONE_HUNGUP:
-            return;
-        case VFS_OUT_MOUNTED:
-            tmpfs_mounted(callid, &call);
-            break;
-        case VFS_OUT_MOUNT:
-            tmpfs_mount(callid, &call);
-            break;
-        case VFS_OUT_LOOKUP:
+        case VFS_LOOKUP:
             tmpfs_lookup(callid, &call);
             break;
-        case VFS_OUT_READ:
+        case VFS_READ:
             tmpfs_read(callid, &call);
             break;
-        case VFS_OUT_WRITE:
+        case VFS_WRITE:
             tmpfs_write(callid, &call);
             break;
-        case VFS_OUT_TRUNCATE:
-            tmpfs_truncate(callid, &call);
-            break;
-        case VFS_OUT_CLOSE:
-            tmpfs_close(callid, &call);
-            break;
-        case VFS_OUT_DESTROY:
-            tmpfs_destroy(callid, &call);
-            break;
-        case VFS_OUT_OPEN_NODE:
-            tmpfs_open_node(callid, &call);
-            break;
-        case VFS_OUT_STAT:
-            tmpfs_stat(callid, &call);
-            break;
-        case VFS_OUT_SYNC:
-            tmpfs_sync(callid, &call);
-            break;
         default:
             ipc_answer_0(callid, ENOTSUP);
             break;
 ,27 → 127,27
 int main(int argc, char **argv)
 {
-    printf(NAME ": HelenOS TMPFS file system server\n");
+    int vfs_phone;
-    if (!tmpfs_init()) {
-        printf(NAME ": failed to initialize TMPFS\n");
-        return -1;
-    }
+    printf("TMPFS: HelenOS TMPFS file system server.\n");
-    int vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
-    if (vfs_phone < EOK) {
-        printf(NAME ": Unable to connect to VFS\n");
-        return -1;
+    vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    while (vfs_phone < EOK) {
+        usleep(10000);
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
     }
-    int rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
+    int rc;
+    rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
         tmpfs_connection);
     if (rc != EOK) {
-        printf(NAME ": Failed to register file system (%d)\n", rc);
+        printf("Failed to register the TMPFS file system (%d)\n", rc);
         return rc;
     }
+    dprintf("TMPFS filesystem registered, fs_handle=%d.\n",
+        tmpfs_reg.fs_handle);
-    printf(NAME ": Accepting connections\n");
     async_manager();
     /* not reached */
     return 0;

 /trunk/uspace/srv/fs/tmpfs/tmpfs.h
 ,62 → 38,33
 #include <atomic.h>
 #include <sys/types.h>
 #include <bool.h>
-#include <adt/hash_table.h>
+#include <libadt/hash_table.h>
-#ifndef dprintf
 #define dprintf(...)    printf(__VA_ARGS__)
-#endif
-#define TMPFS_NODE(node)    ((node) ? (tmpfs_node_t *)(node)->data : NULL)
-#define FS_NODE(node)       ((node) ? (node)->bp : NULL)
-typedef enum {
-    TMPFS_NONE,
-    TMPFS_FILE,
-    TMPFS_DIRECTORY
-} tmpfs_dentry_type_t;
-/* forward declaration */
-struct tmpfs_node;
 typedef struct tmpfs_dentry {
-    link_t link;        /**< Linkage for the list of siblings. */
-    struct tmpfs_node *node;/**< Back pointer to TMPFS node. */
-    char *name;     /**< Name of dentry. */
-} tmpfs_dentry_t;
-typedef struct tmpfs_node {
-    fs_node_t *bp;      /**< Back pointer to the FS node. */
-    fs_index_t index;   /**< TMPFS node index. */
-    dev_handle_t dev_handle;/**< Device handle. */
-    link_t nh_link;     /**< Nodes hash table link. */
-    tmpfs_dentry_type_t type;
-    unsigned lnkcnt;    /**< Link count. */
+    unsigned long index;    /**< TMPFS node index. */
+    link_t dh_link;     /**< Dentries hash table link. */
+    struct tmpfs_dentry *parent;
+    struct tmpfs_dentry *sibling;
+    struct tmpfs_dentry *child;
+    char *name;
+    enum {
+        TMPFS_NONE,
+        TMPFS_FILE,
+        TMPFS_DIRECTORY
+    } type;
     size_t size;        /**< File size if type is TMPFS_FILE. */
     void *data;     /**< File content's if type is TMPFS_FILE. */
-    link_t cs_head;     /**< Head of child's siblings list. */
-} tmpfs_node_t;
+} tmpfs_dentry_t;
 extern fs_reg_t tmpfs_reg;
-extern libfs_ops_t tmpfs_libfs_ops;
-extern bool tmpfs_init(void);
-extern void tmpfs_mounted(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_mount(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_read(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_write(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_truncate(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_stat(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_close(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_destroy(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_open_node(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_sync(ipc_callid_t, ipc_call_t *);
-extern bool tmpfs_restore(dev_handle_t);
 #endif
 /**

 /trunk/uspace/srv/fs/tmpfs/Makefile
 ,17 → 31,12
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
-LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
+CFLAGS += -I $(LIBFS_PREFIX)
-LIBS = \
-    $(LIBFS_PREFIX)/libfs.a \
-    $(LIBBLOCK_PREFIX)/libblock.a \
-    $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBC_PREFIX)/libc.a $(LIBFS_PREFIX)/libfs.a
 ## Sources
 #
 ,31 → 44,28
 OUTPUT = tmpfs
 SOURCES = \
     tmpfs.c \
-    tmpfs_ops.c \
-    tmpfs_dump.c
+    tmpfs_ops.c
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/fs/fat/fat.c
 ,6 → 49,21
 vfs_info_t fat_vfs_info = {
     .name = "fat",
+    .ops = {
+        [IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_OPEN)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_CLOSE)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_READ)] = VFS_OP_DEFINED,
+        [IPC_METHOD_TO_VFS_OP(VFS_WRITE)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_TRUNCATE)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_RENAME)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_OPENDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_READDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_CLOSEDIR)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_UNLINK)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_NULL,
+        [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_NULL,
+    }
 };
 fs_reg_t fat_reg;
 ,41 → 104,9
         callid = async_get_call(&call);
         switch  (IPC_GET_METHOD(call)) {
-        case IPC_M_PHONE_HUNGUP:
-            return;
-        case VFS_OUT_MOUNTED:
-            fat_mounted(callid, &call);
-            break;
-        case VFS_OUT_MOUNT:
-            fat_mount(callid, &call);
-            break;
-        case VFS_OUT_LOOKUP:
+        case VFS_LOOKUP:
             fat_lookup(callid, &call);
             break;
-        case VFS_OUT_READ:
-            fat_read(callid, &call);
-            break;
-        case VFS_OUT_WRITE:
-            fat_write(callid, &call);
-            break;
-        case VFS_OUT_TRUNCATE:
-            fat_truncate(callid, &call);
-            break;
-        case VFS_OUT_STAT:
-            fat_stat(callid, &call);
-            break;
-        case VFS_OUT_CLOSE:
-            fat_close(callid, &call);
-            break;
-        case VFS_OUT_DESTROY:
-            fat_destroy(callid, &call);
-            break;
-        case VFS_OUT_OPEN_NODE:
-            fat_open_node(callid, &call);
-            break;
-        case VFS_OUT_SYNC:
-            fat_sync(callid, &call);
-            break;
         default:
             ipc_answer_0(callid, ENOTSUP);
             break;
 ,24 → 117,20
 int main(int argc, char **argv)
 {
     int vfs_phone;
-    int rc;
-    printf("fat: HelenOS FAT file system server.\n");
+    printf("FAT: HelenOS FAT file system server.\n");
-    rc = fat_idx_init();
-    if (rc != EOK)
-        goto err;
-    vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
-    if (vfs_phone < EOK) {
-        printf("fat: failed to connect to VFS\n");
-        return -1;
+    vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    while (vfs_phone < EOK) {
+        usleep(10000);
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
     }
+    int rc;
     rc = fs_register(vfs_phone, &fat_reg, &fat_vfs_info, fat_connection);
     if (rc != EOK) {
-        fat_idx_fini();
-        goto err;
+        printf("Failed to register the FAT file system (%d)\n", rc);
+        return rc;
     }
     dprintf("FAT filesystem registered, fs_handle=%d.\n",
 ,10 → 139,6
     async_manager();
     /* not reached */
     return 0;
-err:
-    printf("Failed to register the FAT file system (%d)\n", rc);
-    return rc;
 }
 /**

 /trunk/uspace/srv/fs/fat/fat.h
 ,5 → 1,5
 /*
- * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2007 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,41 → 33,31
 #ifndef FAT_FAT_H_
 #define FAT_FAT_H_
-#include "fat_fat.h"
 #include <ipc/ipc.h>
-#include <fibril_sync.h>
 #include <libfs.h>
 #include <atomic.h>
 #include <sys/types.h>
 #include <bool.h>
-#include "../../vfs/vfs.h"
-#ifndef dprintf
 #define dprintf(...)    printf(__VA_ARGS__)
-#endif
-#define min(a, b)       ((a) < (b) ? (a) : (b))
-#define BS_BLOCK        0
-#define BS_SIZE         512
-typedef struct fat_bs {
+typedef struct {
     uint8_t     ji[3];      /**< Jump instruction. */
     uint8_t     oem_name[8];
     /* BIOS Parameter Block */
     uint16_t    bps;        /**< Bytes per sector. */
     uint8_t     spc;        /**< Sectors per cluster. */
-    uint16_t    rscnt;      /**< Reserved sector count. */
+    uint16_t    rsc;        /**< Reserved sector count. */
     uint8_t     fatcnt;     /**< Number of FATs. */
     uint16_t    root_ent_max;   /**< Maximum number of root directory
                          entries. */
-    uint16_t    totsec16;   /**< Total sectors. 16-bit version. */
+    uint16_t    totsec;     /**< Total sectors. */
     uint8_t     mdesc;      /**< Media descriptor. */
     uint16_t    sec_per_fat;    /**< Sectors per FAT12/FAT16. */
     uint16_t    sec_per_track;  /**< Sectors per track. */
     uint16_t    headcnt;    /**< Number of heads. */
     uint32_t    hidden_sec; /**< Hidden sectors. */
-    uint32_t    totsec32;   /**< Total sectors. 32-bit version. */
+    uint32_t    total_sec;  /**< Total sectors. */
     union {
         struct {
 ,7 → 101,7
             /** Serial number. */
             uint32_t    id;
             /** Volume label. */
-            uint8_t     label[11];
+            uint8_t     label;
             /** FAT type. */
             uint8_t     type[8];
             /** Boot code. */
 ,110 → 112,32
     };
 } __attribute__ ((packed)) fat_bs_t;
-typedef enum {
-    FAT_INVALID,
-    FAT_DIRECTORY,
-    FAT_FILE
-} fat_node_type_t;
-struct fat_node;
-/** FAT index structure.
- *
- * This structure exists to help us to overcome certain limitations of the FAT
- * file system design.  The problem with FAT is that it is hard to find
- * an entity which could represent a VFS index.  There are two candidates:
- *
- * a) number of the node's first cluster
- * b) the pair of the parent directory's first cluster and the dentry index
- *    within the parent directory
- *
- * We need VFS indices to be:
- * A) unique
- * B) stable in time, at least until the next mount
- *
- * Unfortunately a) does not meet the A) criterion because zero-length files
- * will have the first cluster field cleared.  And b) does not meet the B)
- * criterion because unlink() and rename() will both free up the original
- * dentry, which contains all the essential info about the file.
- *
- * Therefore, a completely opaque indices are used and the FAT server maintains
- * a mapping between them and otherwise nice b) variant.  On rename(), the VFS
- * index stays unaltered, while the internal FAT "physical tree address"
- * changes.  The unlink case is also handled this way thanks to an in-core node
- * pointer embedded in the index structure.
- */
 typedef struct {
-    /** Used indices (position) hash table link. */
-    link_t      uph_link;
-    /** Used indices (index) hash table link. */
-    link_t      uih_link;
+    uint8_t     name[8];
+    uint8_t     ext[3];
+    uint8_t     attr;
+    uint8_t     reserved;
+    uint8_t     ctime_fine;
+    uint16_t    ctime;
+    uint16_t    cdate;
+    uint16_t    adate;
+    union {
+        uint16_t    eaidx;      /* FAT12/FAT16 */
+        uint16_t    firstc_hi;  /* FAT32 */
+    };
+    uint16_t    mtime;
+    uint16_t    mdate;
+    union {
+        uint16_t    firstc;     /* FAT12/FAT16 */
+        uint16_t    firstc_lo;  /* FAT32 */
+    };
+    uint32_t    size;
+} __attribute__ ((packed)) fat_dentry_t;
-    fibril_mutex_t  lock;
-    dev_handle_t    dev_handle;
-    fs_index_t  index;
-    /**
-     * Parent node's first cluster.
-     * Zero is used if this node is not linked, in which case nodep must
-     * contain a pointer to the in-core node structure.
-     * One is used when the parent is the root directory.
-     */
-    fat_cluster_t   pfc;
-    /** Directory entry index within the parent node. */
-    unsigned    pdi;
-    /** Pointer to in-core node instance. */
-    struct fat_node *nodep;
-} fat_idx_t;
-/** FAT in-core node. */
-typedef struct fat_node {
-    /** Back pointer to the FS node. */
-    fs_node_t       *bp;
-    fibril_mutex_t      lock;
-    fat_node_type_t     type;
-    fat_idx_t       *idx;
-    /**
-     *  Node's first cluster.
-     *  Zero is used for zero-length nodes.
-     *  One is used to mark root directory.
-     */
-    fat_cluster_t       firstc;
-    /** FAT in-core node free list link. */
-    link_t          ffn_link;
-    size_t          size;
-    unsigned        lnkcnt;
-    unsigned        refcnt;
-    bool            dirty;
-} fat_node_t;
 extern fs_reg_t fat_reg;
-extern void fat_mounted(ipc_callid_t, ipc_call_t *);
-extern void fat_mount(ipc_callid_t, ipc_call_t *);
 extern void fat_lookup(ipc_callid_t, ipc_call_t *);
-extern void fat_read(ipc_callid_t, ipc_call_t *);
-extern void fat_write(ipc_callid_t, ipc_call_t *);
-extern void fat_truncate(ipc_callid_t, ipc_call_t *);
-extern void fat_stat(ipc_callid_t, ipc_call_t *);
-extern void fat_close(ipc_callid_t, ipc_call_t *);
-extern void fat_destroy(ipc_callid_t, ipc_call_t *);
-extern void fat_open_node(ipc_callid_t, ipc_call_t *);
-extern void fat_stat(ipc_callid_t, ipc_call_t *);
-extern void fat_sync(ipc_callid_t, ipc_call_t *);
-extern fat_idx_t *fat_idx_get_new(dev_handle_t);
-extern fat_idx_t *fat_idx_get_by_pos(dev_handle_t, fat_cluster_t, unsigned);
-extern fat_idx_t *fat_idx_get_by_index(dev_handle_t, fs_index_t);
-extern void fat_idx_destroy(fat_idx_t *);
-extern void fat_idx_hashin(fat_idx_t *);
-extern void fat_idx_hashout(fat_idx_t *);
-extern int fat_idx_init(void);
-extern void fat_idx_fini(void);
-extern int fat_idx_init_by_dev_handle(dev_handle_t);
-extern void fat_idx_fini_by_dev_handle(dev_handle_t);
 #endif
 /**

 /trunk/uspace/srv/fs/fat/fat_ops.c
 ,5 → 1,5
 /*
- * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2007 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,1183 → 36,107
  */
 #include "fat.h"
-#include "fat_dentry.h"
-#include "fat_fat.h"
 #include "../../vfs/vfs.h"
-#include <libfs.h>
-#include <libblock.h>
 #include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <ipc/devmap.h>
 #include <async.h>
 #include <errno.h>
-#include <string.h>
-#include <byteorder.h>
-#include <adt/hash_table.h>
-#include <adt/list.h>
-#include <assert.h>
-#include <fibril_sync.h>
-#include <sys/mman.h>
-#include <align.h>
-#define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
-#define FS_NODE(node)   ((node) ? (node)->bp : NULL)
+#define PLB_GET_CHAR(i)     (fat_reg.plb_ro[(i) % PLB_SIZE])
-/** Mutex protecting the list of cached free FAT nodes. */
-static FIBRIL_MUTEX_INITIALIZE(ffn_mutex);
+#define FAT_NAME_LEN        8
+#define FAT_EXT_LEN     3
-/** List of cached free FAT nodes. */
-static LIST_INITIALIZE(ffn_head);
+#define FAT_PAD         ' '
-static void fat_node_initialize(fat_node_t *node)
-{
-    fibril_mutex_initialize(&node->lock);
-    node->bp = NULL;
-    node->idx = NULL;
-    node->type = 0;
-    link_initialize(&node->ffn_link);
-    node->size = 0;
-    node->lnkcnt = 0;
-    node->refcnt = 0;
-    node->dirty = false;
-}
+#define FAT_DENTRY_UNUSED   0x00
+#define FAT_DENTRY_E5_ESC   0x05
+#define FAT_DENTRY_DOT      0x2e
+#define FAT_DENTRY_ERASED   0xe5
-static void fat_node_sync(fat_node_t *node)
-{
-    block_t *b;
-    fat_bs_t *bs;
-    fat_dentry_t *d;
-    uint16_t bps;
-    unsigned dps;
-    assert(node->dirty);
-    bs = block_bb_get(node->idx->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    dps = bps / sizeof(fat_dentry_t);
-    /* Read the block that contains the dentry of interest. */
-    b = _fat_block_get(bs, node->idx->dev_handle, node->idx->pfc,
-        (node->idx->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE);
-    d = ((fat_dentry_t *)b->data) + (node->idx->pdi % dps);
-    d->firstc = host2uint16_t_le(node->firstc);
-    if (node->type == FAT_FILE) {
-        d->size = host2uint32_t_le(node->size);
-    } else if (node->type == FAT_DIRECTORY) {
-        d->attr = FAT_ATTR_SUBDIR;
-    }
-    /* TODO: update other fields? (e.g time fields) */
-    b->dirty = true;        /* need to sync block */
-    block_put(b);
-}
-static fat_node_t *fat_node_get_new(void)
-{
-    fs_node_t *fn;
-    fat_node_t *nodep;
-    fibril_mutex_lock(&ffn_mutex);
-    if (!list_empty(&ffn_head)) {
-        /* Try to use a cached free node structure. */
-        fat_idx_t *idxp_tmp;
-        nodep = list_get_instance(ffn_head.next, fat_node_t, ffn_link);
-        if (!fibril_mutex_trylock(&nodep->lock))
-            goto skip_cache;
-        idxp_tmp = nodep->idx;
-        if (!fibril_mutex_trylock(&idxp_tmp->lock)) {
-            fibril_mutex_unlock(&nodep->lock);
-            goto skip_cache;
-        }
-        list_remove(&nodep->ffn_link);
-        fibril_mutex_unlock(&ffn_mutex);
-        if (nodep->dirty)
-            fat_node_sync(nodep);
-        idxp_tmp->nodep = NULL;
-        fibril_mutex_unlock(&nodep->lock);
-        fibril_mutex_unlock(&idxp_tmp->lock);
-        fn = FS_NODE(nodep);
-    } else {
-skip_cache:
-        /* Try to allocate a new node structure. */
-        fibril_mutex_unlock(&ffn_mutex);
-        fn = (fs_node_t *)malloc(sizeof(fs_node_t));
-        if (!fn)
-            return NULL;
-        nodep = (fat_node_t *)malloc(sizeof(fat_node_t));
-        if (!nodep) {
-            free(fn);
-            return NULL;
-        }
-    }
-    fat_node_initialize(nodep);
-    fs_node_initialize(fn);
-    fn->data = nodep;
-    nodep->bp = fn;
-    return nodep;
-}
-/** Internal version of fat_node_get().
+/** Compare one component of path to a directory entry.
  *
- * @param idxp      Locked index structure.
+ * @param dentry    Directory entry to compare the path component with.
+ * @param start     Index into PLB where the path component starts.
+ * @param last      Index of the last character of the path in PLB.
+ *
+ * @return      Zero on failure or delta such that (index + delta) %
+ *          PLB_SIZE points to a new path component in PLB.
  */
-static fat_node_t *fat_node_get_core(fat_idx_t *idxp)
+static unsigned match_path_component(fat_dentry_t *dentry, unsigned start,
+    unsigned last)
 {
-    block_t *b;
-    fat_bs_t *bs;
-    fat_dentry_t *d;
-    fat_node_t *nodep = NULL;
-    unsigned bps;
-    unsigned spc;
-    unsigned dps;
+    unsigned cur;   /* current position in PLB */
+    int pos;    /* current position in dentry->name or dentry->ext */
+    bool name_processed = false;
+    bool dot_processed = false;
+    bool ext_processed = false;
-    if (idxp->nodep) {
-        /*
-         * We are lucky.
-         * The node is already instantiated in memory.
-         */
-        fibril_mutex_lock(&idxp->nodep->lock);
-        if (!idxp->nodep->refcnt++)
-            list_remove(&idxp->nodep->ffn_link);
-        fibril_mutex_unlock(&idxp->nodep->lock);
-        return idxp->nodep;
-    }
-    /*
-     * We must instantiate the node from the file system.
-     */
-    assert(idxp->pfc);
-    nodep = fat_node_get_new();
-    if (!nodep)
-        return NULL;
-    bs = block_bb_get(idxp->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    spc = bs->spc;
-    dps = bps / sizeof(fat_dentry_t);
-    /* Read the block that contains the dentry of interest. */
-    b = _fat_block_get(bs, idxp->dev_handle, idxp->pfc,
-        (idxp->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE);
-    assert(b);
-    d = ((fat_dentry_t *)b->data) + (idxp->pdi % dps);
-    if (d->attr & FAT_ATTR_SUBDIR) {
-        /*
-         * The only directory which does not have this bit set is the
-         * root directory itself. The root directory node is handled
-         * and initialized elsewhere.
-         */
-        nodep->type = FAT_DIRECTORY;
-        /*
-         * Unfortunately, the 'size' field of the FAT dentry is not
-         * defined for the directory entry type. We must determine the
-         * size of the directory by walking the FAT.
-         */
-        nodep->size = bps * spc * fat_clusters_get(bs, idxp->dev_handle,
-            uint16_t_le2host(d->firstc));
-    } else {
-        nodep->type = FAT_FILE;
-        nodep->size = uint32_t_le2host(d->size);
-    }
-    nodep->firstc = uint16_t_le2host(d->firstc);
-    nodep->lnkcnt = 1;
-    nodep->refcnt = 1;
-    block_put(b);
-    /* Link the idx structure with the node structure. */
-    nodep->idx = idxp;
-    idxp->nodep = nodep;
-    return nodep;
-}
-/*
- * Forward declarations of FAT libfs operations.
- */
-static fs_node_t *fat_node_get(dev_handle_t, fs_index_t);
-static void fat_node_put(fs_node_t *);
-static fs_node_t *fat_create_node(dev_handle_t, int);
-static int fat_destroy_node(fs_node_t *);
-static int fat_link(fs_node_t *, fs_node_t *, const char *);
-static int fat_unlink(fs_node_t *, fs_node_t *, const char *);
-static fs_node_t *fat_match(fs_node_t *, const char *);
-static fs_index_t fat_index_get(fs_node_t *);
-static size_t fat_size_get(fs_node_t *);
-static unsigned fat_lnkcnt_get(fs_node_t *);
-static bool fat_has_children(fs_node_t *);
-static fs_node_t *fat_root_get(dev_handle_t);
-static char fat_plb_get_char(unsigned);
-static bool fat_is_directory(fs_node_t *);
-static bool fat_is_file(fs_node_t *node);
-/*
- * FAT libfs operations.
- */
-/** Instantiate a FAT in-core node. */
-fs_node_t *fat_node_get(dev_handle_t dev_handle, fs_index_t index)
-{
-    fat_node_t *nodep;
-    fat_idx_t *idxp;
-    idxp = fat_idx_get_by_index(dev_handle, index);
-    if (!idxp)
-        return NULL;
-    /* idxp->lock held */
-    nodep = fat_node_get_core(idxp);
-    fibril_mutex_unlock(&idxp->lock);
-    return FS_NODE(nodep);
-}
-void fat_node_put(fs_node_t *fn)
-{
-    fat_node_t *nodep = FAT_NODE(fn);
-    bool destroy = false;
-    fibril_mutex_lock(&nodep->lock);
-    if (!--nodep->refcnt) {
-        if (nodep->idx) {
-            fibril_mutex_lock(&ffn_mutex);
-            list_append(&nodep->ffn_link, &ffn_head);
-            fibril_mutex_unlock(&ffn_mutex);
-        } else {
-            /*
-             * The node does not have any index structure associated
-             * with itself. This can only mean that we are releasing
-             * the node after a failed attempt to allocate the index
-             * structure for it.
-             */
-            destroy = true;
+    if (last < start)
+        last += PLB_SIZE;
+    for (pos = 0, cur = start; (cur <= last) && (PLB_GET_CHAR(cur) != '/');
+        pos++, cur++) {
+        if (!name_processed) {
+            if ((pos == FAT_NAME_LEN - 1) ||
+                (dentry->name[pos + 1] == FAT_PAD)) {
+                    /* this is the last character in name */
+                name_processed = true;
+            }
+            if (dentry->name[0] == FAT_PAD) {
+                /* name is empty */
+                name_processed = true;
+            } else if ((pos == 0) && (dentry->name[pos] ==
+                FAT_DENTRY_E5_ESC)) {
+                if (PLB_GET_CHAR(cur) == 0xe5)
+                    continue;
+                else
+                    return 0;   /* character mismatch */
+            } else {
+                if (PLB_GET_CHAR(cur) == dentry->name[pos])
+                    continue;
+                else
+                    return 0;   /* character mismatch */
+            }
         }
-    }
-    fibril_mutex_unlock(&nodep->lock);
-    if (destroy) {
-        free(nodep->bp);
-        free(nodep);
-    }
-}
-fs_node_t *fat_create_node(dev_handle_t dev_handle, int flags)
-{
-    fat_idx_t *idxp;
-    fat_node_t *nodep;
-    fat_bs_t *bs;
-    fat_cluster_t mcl, lcl;
-    uint16_t bps;
-    int rc;
-    bs = block_bb_get(dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    if (flags & L_DIRECTORY) {
-        /* allocate a cluster */
-        rc = fat_alloc_clusters(bs, dev_handle, 1, &mcl, &lcl);
-        if (rc != EOK)
-            return NULL;
-    }
-    nodep = fat_node_get_new();
-    if (!nodep) {
-        fat_free_clusters(bs, dev_handle, mcl);
-        return NULL;
-    }
-    idxp = fat_idx_get_new(dev_handle);
-    if (!idxp) {
-        fat_free_clusters(bs, dev_handle, mcl);
-        fat_node_put(FS_NODE(nodep));
-        return NULL;
-    }
-    /* idxp->lock held */
-    if (flags & L_DIRECTORY) {
-        int i;
-        block_t *b;
-        /*
-         * Populate the new cluster with unused dentries.
-         */
-        for (i = 0; i < bs->spc; i++) {
-            b = _fat_block_get(bs, dev_handle, mcl, i,
-                BLOCK_FLAGS_NOREAD);
-            /* mark all dentries as never-used */
-            memset(b->data, 0, bps);
-            b->dirty = false;
-            block_put(b);
+        if (!dot_processed) {
+            dot_processed = true;
+            pos = -1;
+            if (PLB_GET_CHAR(cur) != '.')
+                return 0;
+            continue;
         }
-        nodep->type = FAT_DIRECTORY;
-        nodep->firstc = mcl;
-        nodep->size = bps * bs->spc;
-    } else {
-        nodep->type = FAT_FILE;
-        nodep->firstc = FAT_CLST_RES0;
-        nodep->size = 0;
-    }
-    nodep->lnkcnt = 0;  /* not linked anywhere */
-    nodep->refcnt = 1;
-    nodep->dirty = true;
-    nodep->idx = idxp;
-    idxp->nodep = nodep;
-    fibril_mutex_unlock(&idxp->lock);
-    return FS_NODE(nodep);
-}
-int fat_destroy_node(fs_node_t *fn)
-{
-    fat_node_t *nodep = FAT_NODE(fn);
-    fat_bs_t *bs;
-    /*
-     * The node is not reachable from the file system. This means that the
-     * link count should be zero and that the index structure cannot be
-     * found in the position hash. Obviously, we don't need to lock the node
-     * nor its index structure.
-     */
-    assert(nodep->lnkcnt == 0);
-    /*
-     * The node may not have any children.
-     */
-    assert(fat_has_children(fn) == false);
-    bs = block_bb_get(nodep->idx->dev_handle);
-    if (nodep->firstc != FAT_CLST_RES0) {
-        assert(nodep->size);
-        /* Free all clusters allocated to the node. */
-        fat_free_clusters(bs, nodep->idx->dev_handle, nodep->firstc);
-    }
-    fat_idx_destroy(nodep->idx);
-    free(nodep->bp);
-    free(nodep);
-    return EOK;
-}
-int fat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
-{
-    fat_node_t *parentp = FAT_NODE(pfn);
-    fat_node_t *childp = FAT_NODE(cfn);
-    fat_dentry_t *d;
-    fat_bs_t *bs;
-    block_t *b;
-    unsigned i, j;
-    uint16_t bps;
-    unsigned dps;
-    unsigned blocks;
-    fat_cluster_t mcl, lcl;
-    int rc;
-    fibril_mutex_lock(&childp->lock);
-    if (childp->lnkcnt == 1) {
-        /*
-         * On FAT, we don't support multiple hard links.
-         */
-        fibril_mutex_unlock(&childp->lock);
-        return EMLINK;
-    }
-    assert(childp->lnkcnt == 0);
-    fibril_mutex_unlock(&childp->lock);
-    if (!fat_dentry_name_verify(name)) {
-        /*
-         * Attempt to create unsupported name.
-         */
-        return ENOTSUP;
-    }
-    /*
-     * Get us an unused parent node's dentry or grow the parent and allocate
-     * a new one.
-     */
-    fibril_mutex_lock(&parentp->idx->lock);
-    bs = block_bb_get(parentp->idx->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    dps = bps / sizeof(fat_dentry_t);
-    blocks = parentp->size / bps;
-    for (i = 0; i < blocks; i++) {
-        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NONE);
-        for (j = 0; j < dps; j++) {
-            d = ((fat_dentry_t *)b->data) + j;
-            switch (fat_classify_dentry(d)) {
-            case FAT_DENTRY_SKIP:
-            case FAT_DENTRY_VALID:
-                /* skipping used and meta entries */
-                continue;
-            case FAT_DENTRY_FREE:
-            case FAT_DENTRY_LAST:
-                /* found an empty slot */
-                goto hit;
+        if (!ext_processed) {
+            if ((pos == FAT_EXT_LEN - 1) ||
+                (dentry->ext[pos + 1] == FAT_PAD)) {
+                /* this is the last character in ext */
+                ext_processed = true;
             }
-        }
-        block_put(b);
-    }
-    j = 0;
-    /*
-     * We need to grow the parent in order to create a new unused dentry.
-     */
-    if (parentp->idx->pfc == FAT_CLST_ROOT) {
-        /* Can't grow the root directory. */
-        fibril_mutex_unlock(&parentp->idx->lock);
-        return ENOSPC;
-    }
-    rc = fat_alloc_clusters(bs, parentp->idx->dev_handle, 1, &mcl, &lcl);
-    if (rc != EOK) {
-        fibril_mutex_unlock(&parentp->idx->lock);
-        return rc;
-    }
-    fat_append_clusters(bs, parentp, mcl);
-    b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NOREAD);
-    d = (fat_dentry_t *)b->data;
-    /*
-     * Clear all dentries in the block except for the first one (the first
-     * dentry will be cleared in the next step).
-     */
-    memset(d + 1, 0, bps - sizeof(fat_dentry_t));
-hit:
-    /*
-     * At this point we only establish the link between the parent and the
-     * child.  The dentry, except of the name and the extension, will remain
-     * uninitialized until the corresponding node is synced. Thus the valid
-     * dentry data is kept in the child node structure.
-     */
-    memset(d, 0, sizeof(fat_dentry_t));
-    fat_dentry_name_set(d, name);
-    b->dirty = true;        /* need to sync block */
-    block_put(b);
-    fibril_mutex_unlock(&parentp->idx->lock);
-    fibril_mutex_lock(&childp->idx->lock);
-    /*
-     * If possible, create the Sub-directory Identifier Entry and the
-     * Sub-directory Parent Pointer Entry (i.e. "." and ".."). These entries
-     * are not mandatory according to Standard ECMA-107 and HelenOS VFS does
-     * not use them anyway, so this is rather a sign of our good will.
-     */
-    b = fat_block_get(bs, childp, 0, BLOCK_FLAGS_NONE);
-    d = (fat_dentry_t *)b->data;
-    if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-        str_cmp(d->name, FAT_NAME_DOT) == 0) {
-        memset(d, 0, sizeof(fat_dentry_t));
-        str_cpy(d->name, 8, FAT_NAME_DOT);
-        str_cpy(d->ext, 3, FAT_EXT_PAD);
-        d->attr = FAT_ATTR_SUBDIR;
-        d->firstc = host2uint16_t_le(childp->firstc);
-        /* TODO: initialize also the date/time members. */
-    }
-    d++;
-    if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-        str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
-        memset(d, 0, sizeof(fat_dentry_t));
-        str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
-        str_cpy(d->ext, 3, FAT_EXT_PAD);
-        d->attr = FAT_ATTR_SUBDIR;
-        d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
-            host2uint16_t_le(FAT_CLST_RES0) :
-            host2uint16_t_le(parentp->firstc);
-        /* TODO: initialize also the date/time members. */
-    }
-    b->dirty = true;        /* need to sync block */
-    block_put(b);
-    childp->idx->pfc = parentp->firstc;
-    childp->idx->pdi = i * dps + j;
-    fibril_mutex_unlock(&childp->idx->lock);
-    fibril_mutex_lock(&childp->lock);
-    childp->lnkcnt = 1;
-    childp->dirty = true;       /* need to sync node */
-    fibril_mutex_unlock(&childp->lock);
-    /*
-     * Hash in the index structure into the position hash.
-     */
-    fat_idx_hashin(childp->idx);
-    return EOK;
-}
-int fat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
-{
-    fat_node_t *parentp = FAT_NODE(pfn);
-    fat_node_t *childp = FAT_NODE(cfn);
-    fat_bs_t *bs;
-    fat_dentry_t *d;
-    uint16_t bps;
-    block_t *b;
-    if (!parentp)
-        return EBUSY;
-    if (fat_has_children(cfn))
-        return ENOTEMPTY;
-    fibril_mutex_lock(&parentp->lock);
-    fibril_mutex_lock(&childp->lock);
-    assert(childp->lnkcnt == 1);
-    fibril_mutex_lock(&childp->idx->lock);
-    bs = block_bb_get(childp->idx->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    b = _fat_block_get(bs, childp->idx->dev_handle, childp->idx->pfc,
-        (childp->idx->pdi * sizeof(fat_dentry_t)) / bps,
-        BLOCK_FLAGS_NONE);
-    d = (fat_dentry_t *)b->data +
-        (childp->idx->pdi % (bps / sizeof(fat_dentry_t)));
-    /* mark the dentry as not-currently-used */
-    d->name[0] = FAT_DENTRY_ERASED;
-    b->dirty = true;        /* need to sync block */
-    block_put(b);
-    /* remove the index structure from the position hash */
-    fat_idx_hashout(childp->idx);
-    /* clear position information */
-    childp->idx->pfc = FAT_CLST_RES0;
-    childp->idx->pdi = 0;
-    fibril_mutex_unlock(&childp->idx->lock);
-    childp->lnkcnt = 0;
-    childp->dirty = true;
-    fibril_mutex_unlock(&childp->lock);
-    fibril_mutex_unlock(&parentp->lock);
-    return EOK;
-}
-fs_node_t *fat_match(fs_node_t *pfn, const char *component)
-{
-    fat_bs_t *bs;
-    fat_node_t *parentp = FAT_NODE(pfn);
-    char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1];
-    unsigned i, j;
-    unsigned bps;       /* bytes per sector */
-    unsigned dps;       /* dentries per sector */
-    unsigned blocks;
-    fat_dentry_t *d;
-    block_t *b;
-    fibril_mutex_lock(&parentp->idx->lock);
-    bs = block_bb_get(parentp->idx->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    dps = bps / sizeof(fat_dentry_t);
-    blocks = parentp->size / bps;
-    for (i = 0; i < blocks; i++) {
-        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NONE);
-        for (j = 0; j < dps; j++) {
-            d = ((fat_dentry_t *)b->data) + j;
-            switch (fat_classify_dentry(d)) {
-            case FAT_DENTRY_SKIP:
-            case FAT_DENTRY_FREE:
+            if (dentry->ext[0] == FAT_PAD) {
+                /* ext is empty; the match will fail */
+                ext_processed = true;
+            } else if (PLB_GET_CHAR(cur) == dentry->ext[pos]) {
                 continue;
-            case FAT_DENTRY_LAST:
-                block_put(b);
-                fibril_mutex_unlock(&parentp->idx->lock);
-                return NULL;
-            default:
-            case FAT_DENTRY_VALID:
-                fat_dentry_name_get(d, name);
-                break;
+            } else {
+                /* character mismatch */
+                return 0;
             }
-            if (fat_dentry_namecmp(name, component) == 0) {
-                /* hit */
-                fat_node_t *nodep;
-                /*
-                 * Assume tree hierarchy for locking.  We
-                 * already have the parent and now we are going
-                 * to lock the child.  Never lock in the oposite
-                 * order.
-                 */
-                fat_idx_t *idx = fat_idx_get_by_pos(
-                    parentp->idx->dev_handle, parentp->firstc,
-                    i * dps + j);
-                fibril_mutex_unlock(&parentp->idx->lock);
-                if (!idx) {
-                    /*
-                     * Can happen if memory is low or if we
-                     * run out of 32-bit indices.
-                     */
-                    block_put(b);
-                    return NULL;
-                }
-                nodep = fat_node_get_core(idx);
-                fibril_mutex_unlock(&idx->lock);
-                block_put(b);
-                return FS_NODE(nodep);
-            }
         }
-        block_put(b);
+        return 0;   /* extra characters in the component */
     }
-    fibril_mutex_unlock(&parentp->idx->lock);
-    return NULL;
-}
-fs_index_t fat_index_get(fs_node_t *fn)
-{
-    return FAT_NODE(fn)->idx->index;
-}
-size_t fat_size_get(fs_node_t *fn)
-{
-    return FAT_NODE(fn)->size;
-}
-unsigned fat_lnkcnt_get(fs_node_t *fn)
-{
-    return FAT_NODE(fn)->lnkcnt;
-}
-bool fat_has_children(fs_node_t *fn)
-{
-    fat_bs_t *bs;
-    fat_node_t *nodep = FAT_NODE(fn);
-    unsigned bps;
-    unsigned dps;
-    unsigned blocks;
-    block_t *b;
-    unsigned i, j;
-    if (nodep->type != FAT_DIRECTORY)
-        return false;
-    fibril_mutex_lock(&nodep->idx->lock);
-    bs = block_bb_get(nodep->idx->dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    dps = bps / sizeof(fat_dentry_t);
-    blocks = nodep->size / bps;
-    for (i = 0; i < blocks; i++) {
-        fat_dentry_t *d;
-        b = fat_block_get(bs, nodep, i, BLOCK_FLAGS_NONE);
-        for (j = 0; j < dps; j++) {
-            d = ((fat_dentry_t *)b->data) + j;
-            switch (fat_classify_dentry(d)) {
-            case FAT_DENTRY_SKIP:
-            case FAT_DENTRY_FREE:
-                continue;
-            case FAT_DENTRY_LAST:
-                block_put(b);
-                fibril_mutex_unlock(&nodep->idx->lock);
-                return false;
-            default:
-            case FAT_DENTRY_VALID:
-                block_put(b);
-                fibril_mutex_unlock(&nodep->idx->lock);
-                return true;
-            }
-            block_put(b);
-            fibril_mutex_unlock(&nodep->idx->lock);
-            return true;
-        }
-        block_put(b);
-    }
-    fibril_mutex_unlock(&nodep->idx->lock);
-    return false;
-}
-fs_node_t *fat_root_get(dev_handle_t dev_handle)
-{
-    return fat_node_get(dev_handle, 0);
-}
-char fat_plb_get_char(unsigned pos)
-{
-    return fat_reg.plb_ro[pos % PLB_SIZE];
-}
-bool fat_is_directory(fs_node_t *fn)
-{
-    return FAT_NODE(fn)->type == FAT_DIRECTORY;
-}
-bool fat_is_file(fs_node_t *fn)
-{
-    return FAT_NODE(fn)->type == FAT_FILE;
-}
-/** libfs operations */
-libfs_ops_t fat_libfs_ops = {
-    .match = fat_match,
-    .node_get = fat_node_get,
-    .node_put = fat_node_put,
-    .create = fat_create_node,
-    .destroy = fat_destroy_node,
-    .link = fat_link,
-    .unlink = fat_unlink,
-    .index_get = fat_index_get,
-    .size_get = fat_size_get,
-    .lnkcnt_get = fat_lnkcnt_get,
-    .has_children = fat_has_children,
-    .root_get = fat_root_get,
-    .plb_get_char = fat_plb_get_char,
-    .is_directory = fat_is_directory,
-    .is_file = fat_is_file
-};
-/*
- * VFS operations.
- */
-void fat_mounted(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-    enum cache_mode cmode;
-    fat_bs_t *bs;
-    uint16_t bps;
-    uint16_t rde;
-    int rc;
-    /* accept the mount options */
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *opts = malloc(size + 1);
-    if (!opts) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
-    if (retval != EOK) {
-        ipc_answer_0(rid, retval);
-        free(opts);
-        return;
-    }
-    opts[size] = '\0';
-    /* Check for option enabling write through. */
-    if (str_cmp(opts, "wtcache") == 0)
-        cmode = CACHE_MODE_WT;
+    if (ext_processed || (name_processed && dentry->ext[0] == FAT_PAD))
+        return cur - start;
     else
-        cmode = CACHE_MODE_WB;
-    /* initialize libblock */
-    rc = block_init(dev_handle, BS_SIZE);
-    if (rc != EOK) {
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    /* prepare the boot block */
-    rc = block_bb_read(dev_handle, BS_BLOCK * BS_SIZE, BS_SIZE);
-    if (rc != EOK) {
-        block_fini(dev_handle);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    /* get the buffer with the boot sector */
-    bs = block_bb_get(dev_handle);
-    /* Read the number of root directory entries. */
-    bps = uint16_t_le2host(bs->bps);
-    rde = uint16_t_le2host(bs->root_ent_max);
-    if (bps != BS_SIZE) {
-        block_fini(dev_handle);
-        ipc_answer_0(rid, ENOTSUP);
-        return;
-    }
-    /* Initialize the block cache */
-    rc = block_cache_init(dev_handle, bps, 0 /* XXX */, cmode);
-    if (rc != EOK) {
-        block_fini(dev_handle);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    rc = fat_idx_init_by_dev_handle(dev_handle);
-    if (rc != EOK) {
-        block_fini(dev_handle);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    /* Initialize the root node. */
-    fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t));
-    if (!rfn) {
-        block_fini(dev_handle);
-        fat_idx_fini_by_dev_handle(dev_handle);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    fs_node_initialize(rfn);
-    fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));
-    if (!rootp) {
-        free(rfn);
-        block_fini(dev_handle);
-        fat_idx_fini_by_dev_handle(dev_handle);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    fat_node_initialize(rootp);
-    fat_idx_t *ridxp = fat_idx_get_by_pos(dev_handle, FAT_CLST_ROOTPAR, 0);
-    if (!ridxp) {
-        free(rfn);
-        free(rootp);
-        block_fini(dev_handle);
-        fat_idx_fini_by_dev_handle(dev_handle);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    assert(ridxp->index == 0);
-    /* ridxp->lock held */
-    rootp->type = FAT_DIRECTORY;
-    rootp->firstc = FAT_CLST_ROOT;
-    rootp->refcnt = 1;
-    rootp->lnkcnt = 0;  /* FS root is not linked */
-    rootp->size = rde * sizeof(fat_dentry_t);
-    rootp->idx = ridxp;
-    ridxp->nodep = rootp;
-    rootp->bp = rfn;
-    rfn->data = rootp;
-    fibril_mutex_unlock(&ridxp->lock);
-    ipc_answer_3(rid, EOK, ridxp->index, rootp->size, rootp->lnkcnt);
+        return 0;
 }
-void fat_mount(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_mount(&fat_libfs_ops, fat_reg.fs_handle, rid, request);
-}
 void fat_lookup(ipc_callid_t rid, ipc_call_t *request)
 {
-    libfs_lookup(&fat_libfs_ops, fat_reg.fs_handle, rid, request);
-}
+    int first = IPC_GET_ARG1(*request);
+    int second = IPC_GET_ARG2(*request);
+    int dev_handle = IPC_GET_ARG3(*request);
-void fat_read(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = (off_t)IPC_GET_ARG3(*request);
-    fs_node_t *fn = fat_node_get(dev_handle, index);
-    fat_node_t *nodep;
-    fat_bs_t *bs;
-    uint16_t bps;
-    size_t bytes;
-    block_t *b;
-    if (!fn) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    nodep = FAT_NODE(fn);
-    ipc_callid_t callid;
-    size_t len;
-    if (!ipc_data_read_receive(&callid, &len)) {
-        fat_node_put(fn);
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    bs = block_bb_get(dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    if (nodep->type == FAT_FILE) {
-        /*
-         * Our strategy for regular file reads is to read one block at
-         * most and make use of the possibility to return less data than
-         * requested. This keeps the code very simple.
-         */
-        if (pos >= nodep->size) {
-            /* reading beyond the EOF */
-            bytes = 0;
-            (void) ipc_data_read_finalize(callid, NULL, 0);
-        } else {
-            bytes = min(len, bps - pos % bps);
-            bytes = min(bytes, nodep->size - pos);
-            b = fat_block_get(bs, nodep, pos / bps,
-                BLOCK_FLAGS_NONE);
-            (void) ipc_data_read_finalize(callid, b->data + pos % bps,
-                bytes);
-            block_put(b);
-        }
-    } else {
-        unsigned bnum;
-        off_t spos = pos;
-        char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1];
-        fat_dentry_t *d;
-        assert(nodep->type == FAT_DIRECTORY);
-        assert(nodep->size % bps == 0);
-        assert(bps % sizeof(fat_dentry_t) == 0);
-        /*
-         * Our strategy for readdir() is to use the position pointer as
-         * an index into the array of all dentries. On entry, it points
-         * to the first unread dentry. If we skip any dentries, we bump
-         * the position pointer accordingly.
-         */
-        bnum = (pos * sizeof(fat_dentry_t)) / bps;
-        while (bnum < nodep->size / bps) {
-            off_t o;
-            b = fat_block_get(bs, nodep, bnum, BLOCK_FLAGS_NONE);
-            for (o = pos % (bps / sizeof(fat_dentry_t));
-                o < bps / sizeof(fat_dentry_t);
-                o++, pos++) {
-                d = ((fat_dentry_t *)b->data) + o;
-                switch (fat_classify_dentry(d)) {
-                case FAT_DENTRY_SKIP:
-                case FAT_DENTRY_FREE:
-                    continue;
-                case FAT_DENTRY_LAST:
-                    block_put(b);
-                    goto miss;
-                default:
-                case FAT_DENTRY_VALID:
-                    fat_dentry_name_get(d, name);
-                    block_put(b);
-                    goto hit;
-                }
-            }
-            block_put(b);
-            bnum++;
-        }
-miss:
-        fat_node_put(fn);
-        ipc_answer_0(callid, ENOENT);
-        ipc_answer_1(rid, ENOENT, 0);
-        return;
-hit:
-        (void) ipc_data_read_finalize(callid, name, str_size(name) + 1);
-        bytes = (pos - spos) + 1;
-    }
-    fat_node_put(fn);
-    ipc_answer_1(rid, EOK, (ipcarg_t)bytes);
-}
-void fat_write(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = (off_t)IPC_GET_ARG3(*request);
-    fs_node_t *fn = fat_node_get(dev_handle, index);
-    fat_node_t *nodep;
-    fat_bs_t *bs;
-    size_t bytes;
-    block_t *b;
-    uint16_t bps;
-    unsigned spc;
-    unsigned bpc;       /* bytes per cluster */
-    off_t boundary;
-    int flags = BLOCK_FLAGS_NONE;
-    if (!fn) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    nodep = FAT_NODE(fn);
-    ipc_callid_t callid;
-    size_t len;
-    if (!ipc_data_write_receive(&callid, &len)) {
-        fat_node_put(fn);
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    bs = block_bb_get(dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    spc = bs->spc;
-    bpc = bps * spc;
-    /*
-     * In all scenarios, we will attempt to write out only one block worth
-     * of data at maximum. There might be some more efficient approaches,
-     * but this one greatly simplifies fat_write(). Note that we can afford
-     * to do this because the client must be ready to handle the return
-     * value signalizing a smaller number of bytes written.
-     */
-    bytes = min(len, bps - pos % bps);
-    if (bytes == bps)
-        flags |= BLOCK_FLAGS_NOREAD;
-    boundary = ROUND_UP(nodep->size, bpc);
-    if (pos < boundary) {
-        /*
-         * This is the easier case - we are either overwriting already
-         * existing contents or writing behind the EOF, but still within
-         * the limits of the last cluster. The node size may grow to the
-         * next block size boundary.
-         */
-        fat_fill_gap(bs, nodep, FAT_CLST_RES0, pos);
-        b = fat_block_get(bs, nodep, pos / bps, flags);
-        (void) ipc_data_write_finalize(callid, b->data + pos % bps,
-            bytes);
-        b->dirty = true;        /* need to sync block */
-        block_put(b);
-        if (pos + bytes > nodep->size) {
-            nodep->size = pos + bytes;
-            nodep->dirty = true;    /* need to sync node */
-        }
-        ipc_answer_2(rid, EOK, bytes, nodep->size);
-        fat_node_put(fn);
-        return;
-    } else {
-        /*
-         * This is the more difficult case. We must allocate new
-         * clusters for the node and zero them out.
-         */
-        int status;
-        unsigned nclsts;
-        fat_cluster_t mcl, lcl;
-        nclsts = (ROUND_UP(pos + bytes, bpc) - boundary) / bpc;
-        /* create an independent chain of nclsts clusters in all FATs */
-        status = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl);
-        if (status != EOK) {
-            /* could not allocate a chain of nclsts clusters */
-            fat_node_put(fn);
-            ipc_answer_0(callid, status);
-            ipc_answer_0(rid, status);
-            return;
-        }
-        /* zero fill any gaps */
-        fat_fill_gap(bs, nodep, mcl, pos);
-        b = _fat_block_get(bs, dev_handle, lcl, (pos / bps) % spc,
-            flags);
-        (void) ipc_data_write_finalize(callid, b->data + pos % bps,
-            bytes);
-        b->dirty = true;        /* need to sync block */
-        block_put(b);
-        /*
-         * Append the cluster chain starting in mcl to the end of the
-         * node's cluster chain.
-         */
-        fat_append_clusters(bs, nodep, mcl);
-        nodep->size = pos + bytes;
-        nodep->dirty = true;        /* need to sync node */
-        ipc_answer_2(rid, EOK, bytes, nodep->size);
-        fat_node_put(fn);
-        return;
-    }
 }
-void fat_truncate(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    size_t size = (off_t)IPC_GET_ARG3(*request);
-    fs_node_t *fn = fat_node_get(dev_handle, index);
-    fat_node_t *nodep;
-    fat_bs_t *bs;
-    uint16_t bps;
-    uint8_t spc;
-    unsigned bpc;   /* bytes per cluster */
-    int rc;
-    if (!fn) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    nodep = FAT_NODE(fn);
-    bs = block_bb_get(dev_handle);
-    bps = uint16_t_le2host(bs->bps);
-    spc = bs->spc;
-    bpc = bps * spc;
-    if (nodep->size == size) {
-        rc = EOK;
-    } else if (nodep->size < size) {
-        /*
-         * The standard says we have the freedom to grow the node.
-         * For now, we simply return an error.
-         */
-        rc = EINVAL;
-    } else if (ROUND_UP(nodep->size, bpc) == ROUND_UP(size, bpc)) {
-        /*
-         * The node will be shrunk, but no clusters will be deallocated.
-         */
-        nodep->size = size;
-        nodep->dirty = true;        /* need to sync node */
-        rc = EOK;
-    } else {
-        /*
-         * The node will be shrunk, clusters will be deallocated.
-         */
-        if (size == 0) {
-            fat_chop_clusters(bs, nodep, FAT_CLST_RES0);
-        } else {
-            fat_cluster_t lastc;
-            (void) fat_cluster_walk(bs, dev_handle, nodep->firstc,
-                &lastc, (size - 1) / bpc);
-            fat_chop_clusters(bs, nodep, lastc);
-        }
-        nodep->size = size;
-        nodep->dirty = true;        /* need to sync node */
-        rc = EOK;
-    }
-    fat_node_put(fn);
-    ipc_answer_0(rid, rc);
-    return;
-}
-void fat_close(ipc_callid_t rid, ipc_call_t *request)
-{
-    ipc_answer_0(rid, EOK);
-}
-void fat_destroy(ipc_callid_t rid, ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    int rc;
-    fs_node_t *fn = fat_node_get(dev_handle, index);
-    if (!fn) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    rc = fat_destroy_node(fn);
-    ipc_answer_0(rid, rc);
-}
-void fat_open_node(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_open_node(&fat_libfs_ops, fat_reg.fs_handle, rid, request);
-}
-void fat_stat(ipc_callid_t rid, ipc_call_t *request)
-{
-    libfs_stat(&fat_libfs_ops, fat_reg.fs_handle, rid, request);
-}
-void fat_sync(ipc_callid_t rid, ipc_call_t *request)
-{
-    /* Dummy implementation */
-    ipc_answer_0(rid, EOK);
-}
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/fs/fat/Makefile
 ,17 → 31,12
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
-LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
+CFLAGS += -I $(LIBFS_PREFIX)
-LIBS = \
-    $(LIBFS_PREFIX)/libfs.a \
-    $(LIBBLOCK_PREFIX)/libblock.a \
-    $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBC_PREFIX)/libc.a $(LIBFS_PREFIX)/libfs.a
 ## Sources
 #
 ,33 → 44,28
 OUTPUT = fat
 SOURCES = \
     fat.c \
-    fat_ops.c \
-    fat_idx.c \
-    fat_dentry.c \
-    fat_fat.c
+    fat_ops.c
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/vfs/vfs_ops.c
 ,14 → 28,13
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file vfs_ops.c
- * @brief Operations that VFS offers to its clients.
+ * @file    vfs_ops.c
+ * @brief   Operations that VFS offers to its clients.
  */
-#include "vfs.h"
 #include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 ,389 → 42,234
 #include <stdlib.h>
 #include <string.h>
 #include <bool.h>
-#include <fibril_sync.h>
-#include <adt/list.h>
+#include <futex.h>
+#include <rwlock.h>
+#include <libadt/list.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <vfs/canonify.h>
+#include <atomic.h>
+#include "vfs.h"
-/* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, size_t);
 /**
  * This rwlock prevents the race between a triplet-to-VFS-node resolution and a
  * concurrent VFS operation which modifies the file system namespace.
  */
-FIBRIL_RWLOCK_INITIALIZE(namespace_rwlock);
+RWLOCK_INITIALIZE(namespace_rwlock);
-vfs_pair_t rootfs = {
+atomic_t rootfs_futex = FUTEX_INITIALIZER;
+vfs_triplet_t rootfs = {
     .fs_handle = 0,
-    .dev_handle = 0
+    .dev_handle = 0,
+    .index = 0,
 };
-static void vfs_mount_internal(ipc_callid_t rid, dev_handle_t dev_handle,
-    fs_handle_t fs_handle, char *mp, char *opts)
+static int lookup_root(int fs_handle, int dev_handle, vfs_lookup_res_t *result)
 {
-    vfs_lookup_res_t mp_res;
-    vfs_lookup_res_t mr_res;
-    vfs_node_t *mp_node = NULL;
-    vfs_node_t *mr_node;
-    fs_index_t rindex;
-    size_t rsize;
-    unsigned rlnkcnt;
-    ipcarg_t rc;
-    int phone;
-    aid_t msg;
-    ipc_call_t answer;
-    /* Resolve the path to the mountpoint. */
-    fibril_rwlock_write_lock(&namespace_rwlock);
-    if (rootfs.fs_handle) {
-        /* We already have the root FS. */
-        if (str_cmp(mp, "/") == 0) {
-            /* Trying to mount root FS over root FS */
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, EBUSY);
-            return;
-        }
-        rc = vfs_lookup_internal(mp, L_DIRECTORY, &mp_res, NULL);
-        if (rc != EOK) {
-            /* The lookup failed for some reason. */
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, rc);
-            return;
-        }
-        mp_node = vfs_node_get(&mp_res);
-        if (!mp_node) {
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, ENOMEM);
-            return;
-        }
-        /*
-         * Now we hold a reference to mp_node.
-         * It will be dropped upon the corresponding VFS_IN_UNMOUNT.
-         * This prevents the mount point from being deleted.
-         */
-    } else {
-        /* We still don't have the root file system mounted. */
-        if (str_cmp(mp, "/") == 0) {
-            /*
-             * For this simple, but important case,
-             * we are almost done.
-             */
-            /* Tell the mountee that it is being mounted. */
-            phone = vfs_grab_phone(fs_handle);
-            msg = async_send_1(phone, VFS_OUT_MOUNTED,
-                (ipcarg_t) dev_handle, &answer);
-            /* send the mount options */
-            rc = ipc_data_write_start(phone, (void *)opts,
-                str_size(opts));
-            if (rc != EOK) {
-                async_wait_for(msg, NULL);
-                vfs_release_phone(phone);
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-                ipc_answer_0(rid, rc);
-                return;
-            }
-            async_wait_for(msg, &rc);
-            vfs_release_phone(phone);
-            if (rc != EOK) {
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-                ipc_answer_0(rid, rc);
-                return;
-            }
+    vfs_pair_t altroot = {
+        .fs_handle = fs_handle,
+        .dev_handle = dev_handle,
+    };
-            rindex = (fs_index_t) IPC_GET_ARG1(answer);
-            rsize = (size_t) IPC_GET_ARG2(answer);
-            rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
-            mr_res.triplet.fs_handle = fs_handle;
-            mr_res.triplet.dev_handle = dev_handle;
-            mr_res.triplet.index = rindex;
-            mr_res.size = rsize;
-            mr_res.lnkcnt = rlnkcnt;
-            mr_res.type = VFS_NODE_DIRECTORY;
-            rootfs.fs_handle = fs_handle;
-            rootfs.dev_handle = dev_handle;
-            /* Add reference to the mounted root. */
-            mr_node = vfs_node_get(&mr_res);
-            assert(mr_node);
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, rc);
-            return;
-        } else {
-            /*
-             * We can't resolve this without the root filesystem
-             * being mounted first.
-             */
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, ENOENT);
-            return;
-        }
-    }
-    /*
-     * At this point, we have all necessary pieces: file system and device
-     * handles, and we know the mount point VFS node.
-     */
-    int mountee_phone = vfs_grab_phone(fs_handle);
-    assert(mountee_phone >= 0);
-    phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-    msg = async_send_4(phone, VFS_OUT_MOUNT,
-        (ipcarg_t) mp_res.triplet.dev_handle,
-        (ipcarg_t) mp_res.triplet.index,
-        (ipcarg_t) fs_handle,
-        (ipcarg_t) dev_handle, &answer);
-    /* send connection */
-    rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
-    if (rc != EOK) {
-        async_wait_for(msg, NULL);
-        vfs_release_phone(mountee_phone);
-        vfs_release_phone(phone);
-        /* Mount failed, drop reference to mp_node. */
-        if (mp_node)
-            vfs_node_put(mp_node);
-        ipc_answer_0(rid, rc);
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        return;
-    }
-    vfs_release_phone(mountee_phone);
-    /* send the mount options */
-    rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
-    if (rc != EOK) {
-        async_wait_for(msg, NULL);
-        vfs_release_phone(phone);
-        /* Mount failed, drop reference to mp_node. */
-        if (mp_node)
-            vfs_node_put(mp_node);
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    async_wait_for(msg, &rc);
-    vfs_release_phone(phone);
-    if (rc == EOK) {
-        rindex = (fs_index_t) IPC_GET_ARG1(answer);
-        rsize = (size_t) IPC_GET_ARG2(answer);
-        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
-        mr_res.triplet.fs_handle = fs_handle;
-        mr_res.triplet.dev_handle = dev_handle;
-        mr_res.triplet.index = rindex;
-        mr_res.size = rsize;
-        mr_res.lnkcnt = rlnkcnt;
-        mr_res.type = VFS_NODE_DIRECTORY;
-        /* Add reference to the mounted root. */
-        mr_node = vfs_node_get(&mr_res);
-        assert(mr_node);
-    } else {
-        /* Mount failed, drop reference to mp_node. */
-        if (mp_node)
-            vfs_node_put(mp_node);
-    }
-    ipc_answer_0(rid, rc);
-    fibril_rwlock_write_unlock(&namespace_rwlock);
+    return vfs_lookup_internal("/", strlen("/"), L_DIRECTORY, result,
+        &altroot);
 }
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
 {
+    int dev_handle;
+    vfs_node_t *mp_node = NULL;
     /*
      * We expect the library to do the device-name to device-handle
      * translation for us, thus the device handle will arrive as ARG1
      * in the request.
      */
-    dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+    dev_handle = IPC_GET_ARG1(*request);
     /*
-     * Mount flags are passed as ARG2.
-     */
-    unsigned int flags = (unsigned int) IPC_GET_ARG2(*request);
-    /*
-     * For now, don't make use of ARG3, but it can be used to
+     * For now, don't make use of ARG2 and ARG3, but they can be used to
      * carry mount options in the future.
      */
-    /* We want the client to send us the mount point. */
     ipc_callid_t callid;
     size_t size;
+    /*
+     * Now, we expect the client to send us data with the name of the file
+     * system.
+     */
     if (!ipc_data_write_receive(&callid, &size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
-    /* Check whether size is reasonable wrt. the mount point. */
-    if ((size < 1) || (size > MAX_PATH_LEN)) {
+    /*
+     * Don't receive more than is necessary for storing a full file system
+     * name.
+     */
+    if (size < 1 || size > FS_NAME_MAXLEN) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
+    /* Deliver the file system name. */
+    char fs_name[FS_NAME_MAXLEN + 1];
+    (void) ipc_data_write_finalize(callid, fs_name, size);
+    fs_name[size] = '\0';
-    /* Allocate buffer for the mount point data being received. */
-    char *mp = malloc(size + 1);
-    if (!mp) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
+    /*
+     * Check if we know a file system with the same name as is in fs_name.
+     * This will also give us its file system handle.
+     */
+    int fs_handle = fs_name_to_handle(fs_name, true);
+    if (!fs_handle) {
+        ipc_answer_0(rid, ENOENT);
         return;
     }
-    /* Deliver the mount point. */
-    ipcarg_t retval = ipc_data_write_finalize(callid, mp, size);
-    if (retval != EOK) {
-        ipc_answer_0(rid, retval);
-        free(mp);
-        return;
-    }
-    mp[size] = '\0';
-    /* Now we expect to receive the mount options. */
+    /* Now, we want the client to send us the mount point. */
     if (!ipc_data_write_receive(&callid, &size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
-        free(mp);
         return;
     }
-    /* Check the offered options size. */
-    if (size > MAX_MNTOPTS_LEN) {
+    /* Check whether size is reasonable wrt. the mount point. */
+    if (size < 1 || size > MAX_PATH_LEN) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
-        free(mp);
         return;
     }
-    /* Allocate buffer for the mount options. */
-    char *opts = (char *) malloc(size + 1);
-    if (!opts) {
+    /* Allocate buffer for the mount point data being received. */
+    uint8_t *buf;
+    buf = malloc(size);
+    if (!buf) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
-        free(mp);
         return;
     }
-    /* Deliver the mount options. */
-    retval = ipc_data_write_finalize(callid, opts, size);
-    if (retval != EOK) {
-        ipc_answer_0(rid, retval);
-        free(mp);
-        free(opts);
-        return;
-    }
-    opts[size] = '\0';
+    /* Deliver the mount point. */
+    (void) ipc_data_write_finalize(callid, buf, size);
     /*
-     * Now, we expect the client to send us data with the name of the file
-     * system.
+     * Lookup the root node of the filesystem being mounted.
+     * In this case, we don't need to take the namespace_futex as the root
+     * node cannot be removed. However, we do take a reference to it so
+     * that we can track how many times it has been mounted.
      */
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        free(mp);
-        free(opts);
+    int rc;
+    vfs_lookup_res_t mr_res;
+    rc = lookup_root(fs_handle, dev_handle, &mr_res);
+    if (rc != EOK) {
+        free(buf);
+        ipc_answer_0(rid, rc);
         return;
     }
-    /*
-     * Don't receive more than is necessary for storing a full file system
-     * name.
-     */
-    if ((size < 1) || (size > FS_NAME_MAXLEN)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        free(mp);
-        free(opts);
-        return;
-    }
-    /*
-     * Allocate buffer for file system name.
-     */
-    char *fs_name = (char *) malloc(size + 1);
-    if (fs_name == NULL) {
-        ipc_answer_0(callid, ENOMEM);
+    vfs_node_t *mr_node = vfs_node_get(&mr_res);
+    if (!mr_node) {
+        free(buf);
         ipc_answer_0(rid, ENOMEM);
-        free(mp);
-        free(opts);
         return;
     }
+    /* Finally, we need to resolve the path to the mountpoint. */
+    vfs_lookup_res_t mp_res;
+    futex_down(&rootfs_futex);
+    if (rootfs.fs_handle) {
+        /* We already have the root FS. */
+        rwlock_write_lock(&namespace_rwlock);
+        rc = vfs_lookup_internal(buf, size, L_DIRECTORY, &mp_res,
+            NULL);
+        if (rc != EOK) {
+            /* The lookup failed for some reason. */
+            rwlock_write_unlock(&namespace_rwlock);
+            futex_up(&rootfs_futex);
+            vfs_node_put(mr_node);  /* failed -> drop reference */
+            free(buf);
+            ipc_answer_0(rid, rc);
+            return;
+        }
+        mp_node = vfs_node_get(&mp_res);
+        if (!mp_node) {
+            rwlock_write_unlock(&namespace_rwlock);
+            futex_up(&rootfs_futex);
+            vfs_node_put(mr_node);  /* failed -> drop reference */
+            free(buf);
+            ipc_answer_0(rid, ENOMEM);
+            return;
+        }
+        /*
+         * Now we hold a reference to mp_node.
+         * It will be dropped upon the corresponding VFS_UNMOUNT.
+         * This prevents the mount point from being deleted.
+         */
+        rwlock_write_unlock(&namespace_rwlock);
+    } else {
+        /* We still don't have the root file system mounted. */
+        if ((size == 1) && (buf[0] == '/')) {
+            /* For this simple, but important case, we are done. */
+            rootfs = mr_res.triplet;
+            futex_up(&rootfs_futex);
+            free(buf);
+            ipc_answer_0(rid, EOK);
+            return;
+        } else {
+            /*
+             * We can't resolve this without the root filesystem
+             * being mounted first.
+             */
+            futex_up(&rootfs_futex);
+            free(buf);
+            vfs_node_put(mr_node);  /* failed -> drop reference */
+            ipc_answer_0(rid, ENOENT);
+            return;
+        }
+    }
+    futex_up(&rootfs_futex);
-    /* Deliver the file system name. */
-    retval = ipc_data_write_finalize(callid, fs_name, size);
-    if (retval != EOK) {
-        ipc_answer_0(rid, retval);
-        free(mp);
-        free(opts);
-        free(fs_name);
-        return;
-    }
-    fs_name[size] = '\0';
+    free(buf);  /* The buffer is not needed anymore. */
     /*
-     * Wait for IPC_M_PING so that we can return an error if we don't know
-     * fs_name.
+     * At this point, we have all necessary pieces: file system and device
+     * handles, and we know the mount point VFS node and also the root node
+     * of the file system being mounted.
      */
-    ipc_call_t data;
-    callid = async_get_call(&data);
-    if (IPC_GET_METHOD(data) != IPC_M_PING) {
-        ipc_answer_0(callid, ENOTSUP);
-        ipc_answer_0(rid, ENOTSUP);
-        free(mp);
-        free(opts);
-        free(fs_name);
-        return;
-    }
-    /*
-     * Check if we know a file system with the same name as is in fs_name.
-     * This will also give us its file system handle.
-     */
-    fibril_mutex_lock(&fs_head_lock);
-    fs_handle_t fs_handle;
-recheck:
-    fs_handle = fs_name_to_handle(fs_name, false);
-    if (!fs_handle) {
-        if (flags & IPC_FLAG_BLOCKING) {
-            fibril_condvar_wait(&fs_head_cv, &fs_head_lock);
-            goto recheck;
-        }
-        fibril_mutex_unlock(&fs_head_lock);
-        ipc_answer_0(callid, ENOENT);
-        ipc_answer_0(rid, ENOENT);
-        free(mp);
-        free(fs_name);
-        free(opts);
-        return;
+    int phone = vfs_grab_phone(mp_res.triplet.fs_handle);
+    /* Later we can use ARG3 to pass mode/flags. */
+    aid_t req1 = async_send_3(phone, VFS_MOUNT,
+        (ipcarg_t) mp_res.triplet.dev_handle,
+        (ipcarg_t) mp_res.triplet.index, 0, NULL);
+    /* The second call uses the same method. */
+    aid_t req2 = async_send_3(phone, VFS_MOUNT,
+        (ipcarg_t) mr_res.triplet.fs_handle,
+        (ipcarg_t) mr_res.triplet.dev_handle,
+        (ipcarg_t) mr_res.triplet.index, NULL);
+    vfs_release_phone(phone);
+    ipcarg_t rc1;
+    ipcarg_t rc2;
+    async_wait_for(req1, &rc1);
+    async_wait_for(req2, &rc2);
+    if ((rc1 != EOK) || (rc2 != EOK)) {
+        /* Mount failed, drop references to mr_node and mp_node. */
+        vfs_node_put(mr_node);
+        if (mp_node)
+            vfs_node_put(mp_node);
     }
-    fibril_mutex_unlock(&fs_head_lock);
-    /* Acknowledge that we know fs_name. */
-    ipc_answer_0(callid, EOK);
-    /* Do the mount */
-    vfs_mount_internal(rid, dev_handle, fs_handle, mp, opts);
-    free(mp);
-    free(fs_name);
-    free(opts);
+    if (rc2 == EOK)
+        ipc_answer_0(rid, rc1);
+    else if (rc1 == EOK)
+        ipc_answer_0(rid, rc2);
+    else
+        ipc_answer_0(rid, rc1);
 }
 void vfs_open(ipc_callid_t rid, ipc_call_t *request)
 ,11 → 278,11
         ipc_answer_0(rid, ENOMEM);
         return;
     }
     /*
      * The POSIX interface is open(path, oflag, mode).
-     * We can receive oflags and mode along with the VFS_IN_OPEN call;
-     * the path will need to arrive in another call.
+     * We can receive oflags and mode along with the VFS_OPEN call; the path
+     * will need to arrive in another call.
      *
      * We also receive one private, non-POSIX set of flags called lflag
      * used to pass information to vfs_lookup_internal().
 ,39 → 292,33
     int mode = IPC_GET_ARG3(*request);
     size_t len;
-    /* Ignore mode for now. */
-    (void) mode;
-    /*
-     * Make sure that we are called with exactly one of L_FILE and
-     * L_DIRECTORY. Make sure that the user does not pass L_OPEN.
-     */
-    if (((lflag & (L_FILE | L_DIRECTORY)) == 0) ||
-        ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) ||
-        ((lflag & L_OPEN) != 0)) {
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
     if (oflag & O_CREAT)
         lflag |= L_CREATE;
     if (oflag & O_EXCL)
         lflag |= L_EXCLUSIVE;
     ipc_callid_t callid;
     if (!ipc_data_write_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
+    /*
+     * Now we are on the verge of accepting the path.
+     *
+     * There is one optimization we could do in the future: copy the path
+     * directly into the PLB using some kind of a callback.
+     */
+    char *path = malloc(len);
-    char *path = malloc(len + 1);
     if (!path) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
     int rc;
     if ((rc = ipc_data_write_finalize(callid, path, len))) {
         ipc_answer_0(rid, rc);
 ,7 → 325,6
         free(path);
         return;
     }
-    path[len] = '\0';
     /*
      * Avoid the race condition in which the file can be deleted before we
 ,49 → 332,32
      * triplet.
      */
     if (lflag & L_CREATE)
-        fibril_rwlock_write_lock(&namespace_rwlock);
+        rwlock_write_lock(&namespace_rwlock);
     else
-        fibril_rwlock_read_lock(&namespace_rwlock);
+        rwlock_read_lock(&namespace_rwlock);
     /* The path is now populated and we can call vfs_lookup_internal(). */
     vfs_lookup_res_t lr;
-    rc = vfs_lookup_internal(path, lflag | L_OPEN, &lr, NULL);
-    if (rc != EOK) {
+    rc = vfs_lookup_internal(path, len, lflag, &lr, NULL);
+    if (rc) {
         if (lflag & L_CREATE)
-            fibril_rwlock_write_unlock(&namespace_rwlock);
+            rwlock_write_unlock(&namespace_rwlock);
         else
-            fibril_rwlock_read_unlock(&namespace_rwlock);
+            rwlock_read_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         free(path);
         return;
     }
-    /* Path is no longer needed. */
+    /** Path is no longer needed. */
     free(path);
     vfs_node_t *node = vfs_node_get(&lr);
     if (lflag & L_CREATE)
-        fibril_rwlock_write_unlock(&namespace_rwlock);
+        rwlock_write_unlock(&namespace_rwlock);
     else
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-    /* Truncate the file if requested and if necessary. */
-    if (oflag & O_TRUNC) {
-        fibril_rwlock_write_lock(&node->contents_rwlock);
-        if (node->size) {
-            rc = vfs_truncate_internal(node->fs_handle,
-                node->dev_handle, node->index, 0);
-            if (rc) {
-                fibril_rwlock_write_unlock(&node->contents_rwlock);
-                vfs_node_put(node);
-                ipc_answer_0(rid, rc);
-                return;
-            }
-            node->size = 0;
-        }
-        fibril_rwlock_write_unlock(&node->contents_rwlock);
-    }
+        rwlock_read_unlock(&namespace_rwlock);
     /*
      * Get ourselves a file descriptor and the corresponding vfs_file_t
      * structure.
 ,173 → 370,23
     }
     vfs_file_t *file = vfs_file_get(fd);
     file->node = node;
-    if (oflag & O_APPEND)
+    if (oflag & O_APPEND)
         file->append = true;
     /*
      * The following increase in reference count is for the fact that the
      * file is being opened and that a file structure is pointing to it.
      * It is necessary so that the file will not disappear when
      * vfs_node_put() is called. The reference will be dropped by the
-     * respective VFS_IN_CLOSE.
+     * respective VFS_CLOSE.
      */
     vfs_node_addref(node);
     vfs_node_put(node);
-    /* Success! Return the new file descriptor to the client. */
-    ipc_answer_1(rid, EOK, fd);
-}
-void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
-{
-    // FIXME: check for sanity of the supplied fs, dev and index
-    if (!vfs_files_init()) {
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    /*
-     * The interface is open_node(fs, dev, index, oflag).
-     */
-    vfs_lookup_res_t lr;
-    lr.triplet.fs_handle = IPC_GET_ARG1(*request);
-    lr.triplet.dev_handle = IPC_GET_ARG2(*request);
-    lr.triplet.index = IPC_GET_ARG3(*request);
-    int oflag = IPC_GET_ARG4(*request);
-    fibril_rwlock_read_lock(&namespace_rwlock);
-    int rc = vfs_open_node_internal(&lr);
-    if (rc != EOK) {
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    vfs_node_t *node = vfs_node_get(&lr);
-    fibril_rwlock_read_unlock(&namespace_rwlock);
-    /* Truncate the file if requested and if necessary. */
-    if (oflag & O_TRUNC) {
-        fibril_rwlock_write_lock(&node->contents_rwlock);
-        if (node->size) {
-            rc = vfs_truncate_internal(node->fs_handle,
-                node->dev_handle, node->index, 0);
-            if (rc) {
-                fibril_rwlock_write_unlock(&node->contents_rwlock);
-                vfs_node_put(node);
-                ipc_answer_0(rid, rc);
-                return;
-            }
-            node->size = 0;
-        }
-        fibril_rwlock_write_unlock(&node->contents_rwlock);
-    }
-    /*
-     * Get ourselves a file descriptor and the corresponding vfs_file_t
-     * structure.
-     */
-    int fd = vfs_fd_alloc();
-    if (fd < 0) {
-        vfs_node_put(node);
-        ipc_answer_0(rid, fd);
-        return;
-    }
-    vfs_file_t *file = vfs_file_get(fd);
-    file->node = node;
-    if (oflag & O_APPEND)
-        file->append = true;
-    /*
-     * The following increase in reference count is for the fact that the
-     * file is being opened and that a file structure is pointing to it.
-     * It is necessary so that the file will not disappear when
-     * vfs_node_put() is called. The reference will be dropped by the
-     * respective VFS_IN_CLOSE.
-     */
-    vfs_node_addref(node);
-    vfs_node_put(node);
     /* Success! Return the new file descriptor to the client. */
     ipc_answer_1(rid, EOK, fd);
 }
-void vfs_sync(ipc_callid_t rid, ipc_call_t *request)
-{
-    int fd = IPC_GET_ARG1(*request);
-    /* Lookup the file structure corresponding to the file descriptor. */
-    vfs_file_t *file = vfs_file_get(fd);
-    if (!file) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    /*
-     * Lock the open file structure so that no other thread can manipulate
-     * the same open file at a time.
-     */
-    fibril_mutex_lock(&file->lock);
-    int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    /* Make a VFS_OUT_SYMC request at the destination FS server. */
-    aid_t msg;
-    ipc_call_t answer;
-    msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->dev_handle,
-        file->node->index, &answer);
-    /* Wait for reply from the FS server. */
-    ipcarg_t rc;
-    async_wait_for(msg, &rc);
-    vfs_release_phone(fs_phone);
-    fibril_mutex_unlock(&file->lock);
-    ipc_answer_0(rid, rc);
-}
-void vfs_close(ipc_callid_t rid, ipc_call_t *request)
-{
-    int fd = IPC_GET_ARG1(*request);
-    /* Lookup the file structure corresponding to the file descriptor. */
-    vfs_file_t *file = vfs_file_get(fd);
-    if (!file) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    /*
-     * Lock the open file structure so that no other thread can manipulate
-     * the same open file at a time.
-     */
-    fibril_mutex_lock(&file->lock);
-    int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    /* Make a VFS_OUT_CLOSE request at the destination FS server. */
-    aid_t msg;
-    ipc_call_t answer;
-    msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->dev_handle,
-        file->node->index, &answer);
-    /* Wait for reply from the FS server. */
-    ipcarg_t rc;
-    async_wait_for(msg, &rc);
-    vfs_release_phone(fs_phone);
-    fibril_mutex_unlock(&file->lock);
-    int retval = IPC_GET_ARG1(answer);
-    if (retval != EOK)
-        ipc_answer_0(rid, retval);
-    retval = vfs_fd_free(fd);
-    ipc_answer_0(rid, retval);
-}
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {
 ,7 → 401,7
      */
     int fd = IPC_GET_ARG1(*request);
     /* Lookup the file structure corresponding to the file descriptor. */
     vfs_file_t *file = vfs_file_get(fd);
     if (!file) {
 ,7 → 408,7
         ipc_answer_0(rid, ENOENT);
         return;
     }
     /*
      * Now we need to receive a call with client's
      * IPC_M_DATA_READ/IPC_M_DATA_WRITE request.
 ,12 → 424,12
         ipc_answer_0(rid, EINVAL);
         return;
     }
     /*
      * Lock the open file structure so that no other thread can manipulate
      * the same open file at a time.
      */
-    fibril_mutex_lock(&file->lock);
+    futex_down(&file->lock);
     /*
      * Lock the file's node so that no other client can read/write to it at
 ,19 → 436,10
      * the same time.
      */
     if (read)
-        fibril_rwlock_read_lock(&file->node->contents_rwlock);
+        rwlock_read_lock(&file->node->contents_rwlock);
     else
-        fibril_rwlock_write_lock(&file->node->contents_rwlock);
+        rwlock_write_lock(&file->node->contents_rwlock);
-    if (file->node->type == VFS_NODE_DIRECTORY) {
-        /*
-         * Make sure that no one is modifying the namespace
-         * while we are in readdir().
-         */
-        assert(read);
-        fibril_rwlock_read_lock(&namespace_rwlock);
-    }
     int fs_phone = vfs_grab_phone(file->node->fs_handle);
     /* Make a VFS_READ/VFS_WRITE request at the destination FS server. */
 ,7 → 447,7
     ipc_call_t answer;
     if (!read && file->append)
         file->pos = file->node->size;
-    msg = async_send_3(fs_phone, read ? VFS_OUT_READ : VFS_OUT_WRITE,
+    msg = async_send_3(fs_phone, IPC_GET_METHOD(*request),
         file->node->dev_handle, file->node->index, file->pos, &answer);
     /*
 ,32 → 458,28
      */
     ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+    vfs_release_phone(fs_phone);
     /* Wait for reply from the FS server. */
     ipcarg_t rc;
     async_wait_for(msg, &rc);
-    vfs_release_phone(fs_phone);
     size_t bytes = IPC_GET_ARG1(answer);
-    if (file->node->type == VFS_NODE_DIRECTORY)
-        fibril_rwlock_read_unlock(&namespace_rwlock);
     /* Unlock the VFS node. */
     if (read)
-        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+        rwlock_read_unlock(&file->node->contents_rwlock);
     else {
         /* Update the cached version of node's size. */
         if (rc == EOK)
             file->node->size = IPC_GET_ARG2(answer);
-        fibril_rwlock_write_unlock(&file->node->contents_rwlock);
+        rwlock_write_unlock(&file->node->contents_rwlock);
     }
     /* Update the position pointer and unlock the open file. */
     if (rc == EOK)
         file->pos += bytes;
-    fibril_mutex_unlock(&file->lock);
+    futex_up(&file->lock);
     /*
      * FS server's reply is the final result of the whole operation we
      * return to the client.
 ,85 → 512,47
     }
     off_t newpos;
-    fibril_mutex_lock(&file->lock);
+    futex_down(&file->lock);
     if (whence == SEEK_SET) {
         file->pos = off;
-        fibril_mutex_unlock(&file->lock);
+        futex_up(&file->lock);
         ipc_answer_1(rid, EOK, off);
         return;
     }
     if (whence == SEEK_CUR) {
         if (file->pos + off < file->pos) {
-            fibril_mutex_unlock(&file->lock);
+            futex_up(&file->lock);
             ipc_answer_0(rid, EOVERFLOW);
             return;
         }
         file->pos += off;
         newpos = file->pos;
-        fibril_mutex_unlock(&file->lock);
+        futex_up(&file->lock);
         ipc_answer_1(rid, EOK, newpos);
         return;
     }
     if (whence == SEEK_END) {
-        fibril_rwlock_read_lock(&file->node->contents_rwlock);
+        rwlock_read_lock(&file->node->contents_rwlock);
         size_t size = file->node->size;
-        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+        rwlock_read_unlock(&file->node->contents_rwlock);
         if (size + off < size) {
-            fibril_mutex_unlock(&file->lock);
+            futex_up(&file->lock);
             ipc_answer_0(rid, EOVERFLOW);
             return;
         }
         newpos = size + off;
-        fibril_mutex_unlock(&file->lock);
+        futex_up(&file->lock);
         ipc_answer_1(rid, EOK, newpos);
         return;
     }
-    fibril_mutex_unlock(&file->lock);
+    futex_up(&file->lock);
     ipc_answer_0(rid, EINVAL);
 }
-int
-vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
-    fs_index_t index, size_t size)
-{
-    ipcarg_t rc;
-    int fs_phone;
-    fs_phone = vfs_grab_phone(fs_handle);
-    rc = async_req_3_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t)dev_handle,
-        (ipcarg_t)index, (ipcarg_t)size);
-    vfs_release_phone(fs_phone);
-    return (int)rc;
-}
 void vfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 {
     int fd = IPC_GET_ARG1(*request);
     size_t size = IPC_GET_ARG2(*request);
-    int rc;
-    vfs_file_t *file = vfs_file_get(fd);
-    if (!file) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    fibril_mutex_lock(&file->lock);
-    fibril_rwlock_write_lock(&file->node->contents_rwlock);
-    rc = vfs_truncate_internal(file->node->fs_handle,
-        file->node->dev_handle, file->node->index, size);
-    if (rc == EOK)
-        file->node->size = size;
-    fibril_rwlock_write_unlock(&file->node->contents_rwlock);
-    fibril_mutex_unlock(&file->lock);
-    ipc_answer_0(rid, (ipcarg_t)rc);
-}
-void vfs_fstat(ipc_callid_t rid, ipc_call_t *request)
-{
-    int fd = IPC_GET_ARG1(*request);
-    size_t size = IPC_GET_ARG2(*request);
     ipcarg_t rc;
     vfs_file_t *file = vfs_file_get(fd);
 ,32 → 560,27
         ipc_answer_0(rid, ENOENT);
         return;
     }
+    futex_down(&file->lock);
-    ipc_callid_t callid;
-    if (!ipc_data_read_receive(&callid, NULL)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    fibril_mutex_lock(&file->lock);
+    rwlock_write_lock(&file->node->contents_rwlock);
     int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    aid_t msg;
-    msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->dev_handle,
-        file->node->index, true, NULL);
-    ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-    async_wait_for(msg, &rc);
+    rc = async_req_3_0(fs_phone, VFS_TRUNCATE,
+        (ipcarg_t)file->node->dev_handle, (ipcarg_t)file->node->index,
+        (ipcarg_t)size);
     vfs_release_phone(fs_phone);
+    if (rc == EOK)
+        file->node->size = size;
+    rwlock_write_unlock(&file->node->contents_rwlock);
-    fibril_mutex_unlock(&file->lock);
+    futex_up(&file->lock);
     ipc_answer_0(rid, rc);
 }
-void vfs_stat(ipc_callid_t rid, ipc_call_t *request)
+void vfs_mkdir(ipc_callid_t rid, ipc_call_t *request)
 {
+    int mode = IPC_GET_ARG1(*request);
     size_t len;
     ipc_callid_t callid;
     if (!ipc_data_write_receive(&callid, &len)) {
 ,80 → 588,21
         ipc_answer_0(rid, EINVAL);
         return;
     }
-    char *path = malloc(len + 1);
-    if (!path) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    int rc;
-    if ((rc = ipc_data_write_finalize(callid, path, len))) {
-        ipc_answer_0(rid, rc);
-        free(path);
-        return;
-    }
-    path[len] = '\0';
-    if (!ipc_data_read_receive(&callid, NULL)) {
-        free(path);
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    vfs_lookup_res_t lr;
-    fibril_rwlock_read_lock(&namespace_rwlock);
-    rc = vfs_lookup_internal(path, L_NONE, &lr, NULL);
-    free(path);
-    if (rc != EOK) {
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-        ipc_answer_0(callid, rc);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    vfs_node_t *node = vfs_node_get(&lr);
-    if (!node) {
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    fibril_rwlock_read_unlock(&namespace_rwlock);
-    int fs_phone = vfs_grab_phone(node->fs_handle);
-    aid_t msg;
-    msg = async_send_3(fs_phone, VFS_OUT_STAT, node->dev_handle,
-        node->index, false, NULL);
-    ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+    /*
+     * Now we are on the verge of accepting the path.
+     *
+     * There is one optimization we could do in the future: copy the path
+     * directly into the PLB using some kind of a callback.
+     */
+    char *path = malloc(len);
-    ipcarg_t rv;
-    async_wait_for(msg, &rv);
-    vfs_release_phone(fs_phone);
-    ipc_answer_0(rid, rv);
-    vfs_node_put(node);
-}
-void vfs_mkdir(ipc_callid_t rid, ipc_call_t *request)
-{
-    int mode = IPC_GET_ARG1(*request);
-    size_t len;
-    ipc_callid_t callid;
-    if (!ipc_data_write_receive(&callid, &len)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *path = malloc(len + 1);
     if (!path) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
     int rc;
     if ((rc = ipc_data_write_finalize(callid, path, len))) {
         ipc_answer_0(rid, rc);
 ,262 → 609,15
         free(path);
         return;
     }
-    path[len] = '\0';
-    /* Ignore mode for now. */
-    (void) mode;
-    fibril_rwlock_write_lock(&namespace_rwlock);
+    rwlock_write_lock(&namespace_rwlock);
     int lflag = L_DIRECTORY | L_CREATE | L_EXCLUSIVE;
-    rc = vfs_lookup_internal(path, lflag, NULL, NULL);
-    fibril_rwlock_write_unlock(&namespace_rwlock);
+    rc = vfs_lookup_internal(path, len, lflag, NULL, NULL);
+    rwlock_write_unlock(&namespace_rwlock);
     free(path);
     ipc_answer_0(rid, rc);
 }
-void vfs_unlink(ipc_callid_t rid, ipc_call_t *request)
-{
-    int lflag = IPC_GET_ARG1(*request);
-    size_t len;
-    ipc_callid_t callid;
-    if (!ipc_data_write_receive(&callid, &len)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *path = malloc(len + 1);
-    if (!path) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    int rc;
-    if ((rc = ipc_data_write_finalize(callid, path, len))) {
-        ipc_answer_0(rid, rc);
-        free(path);
-        return;
-    }
-    path[len] = '\0';
-    fibril_rwlock_write_lock(&namespace_rwlock);
-    lflag &= L_DIRECTORY;   /* sanitize lflag */
-    vfs_lookup_res_t lr;
-    rc = vfs_lookup_internal(path, lflag | L_UNLINK, &lr, NULL);
-    free(path);
-    if (rc != EOK) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    /*
-     * The name has already been unlinked by vfs_lookup_internal().
-     * We have to get and put the VFS node to ensure that it is
-     * VFS_OUT_DESTROY'ed after the last reference to it is dropped.
-     */
-    vfs_node_t *node = vfs_node_get(&lr);
-    fibril_mutex_lock(&nodes_mutex);
-    node->lnkcnt--;
-    fibril_mutex_unlock(&nodes_mutex);
-    fibril_rwlock_write_unlock(&namespace_rwlock);
-    vfs_node_put(node);
-    ipc_answer_0(rid, EOK);
-}
-void vfs_rename(ipc_callid_t rid, ipc_call_t *request)
-{
-    size_t olen, nlen;
-    ipc_callid_t callid;
-    int rc;
-    /* Retrieve the old path. */
-    if (!ipc_data_write_receive(&callid, &olen)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *old = malloc(olen + 1);
-    if (!old) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    if ((rc = ipc_data_write_finalize(callid, old, olen))) {
-        ipc_answer_0(rid, rc);
-        free(old);
-        return;
-    }
-    old[olen] = '\0';
-    /* Retrieve the new path. */
-    if (!ipc_data_write_receive(&callid, &nlen)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        free(old);
-        return;
-    }
-    char *new = malloc(nlen + 1);
-    if (!new) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        free(old);
-        return;
-    }
-    if ((rc = ipc_data_write_finalize(callid, new, nlen))) {
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    new[nlen] = '\0';
-    char *oldc = canonify(old, &olen);
-    char *newc = canonify(new, &nlen);
-    if (!oldc || !newc) {
-        ipc_answer_0(rid, EINVAL);
-        free(old);
-        free(new);
-        return;
-    }
-    oldc[olen] = '\0';
-    newc[nlen] = '\0';
-    if ((!str_lcmp(newc, oldc, str_length(oldc))) &&
-        ((newc[str_length(oldc)] == '/') ||
-        (str_length(oldc) == 1) ||
-        (str_length(oldc) == str_length(newc)))) {
-            /*
-         * oldc is a prefix of newc and either
-         * - newc continues with a / where oldc ends, or
-         * - oldc was / itself, or
-         * - oldc and newc are equal.
-         */
-        ipc_answer_0(rid, EINVAL);
-        free(old);
-        free(new);
-        return;
-    }
-    vfs_lookup_res_t old_lr;
-    vfs_lookup_res_t new_lr;
-    vfs_lookup_res_t new_par_lr;
-    fibril_rwlock_write_lock(&namespace_rwlock);
-    /* Lookup the node belonging to the old file name. */
-    rc = vfs_lookup_internal(oldc, L_NONE, &old_lr, NULL);
-    if (rc != EOK) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    vfs_node_t *old_node = vfs_node_get(&old_lr);
-    if (!old_node) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, ENOMEM);
-        free(old);
-        free(new);
-        return;
-    }
-    /* Determine the path to the parent of the node with the new name. */
-    char *parentc = str_dup(newc);
-    if (!parentc) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    char *lastsl = str_rchr(parentc + 1, '/');
-    if (lastsl)
-        *lastsl = '\0';
-    else
-        parentc[1] = '\0';
-    /* Lookup parent of the new file name. */
-    rc = vfs_lookup_internal(parentc, L_NONE, &new_par_lr, NULL);
-    free(parentc);  /* not needed anymore */
-    if (rc != EOK) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    /* Check whether linking to the same file system instance. */
-    if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
-        (old_node->dev_handle != new_par_lr.triplet.dev_handle)) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, EXDEV);   /* different file systems */
-        free(old);
-        free(new);
-        return;
-    }
-    /* Destroy the old link for the new name. */
-    vfs_node_t *new_node = NULL;
-    rc = vfs_lookup_internal(newc, L_UNLINK, &new_lr, NULL);
-    switch (rc) {
-    case ENOENT:
-        /* simply not in our way */
-        break;
-    case EOK:
-        new_node = vfs_node_get(&new_lr);
-        if (!new_node) {
-            fibril_rwlock_write_unlock(&namespace_rwlock);
-            ipc_answer_0(rid, ENOMEM);
-            free(old);
-            free(new);
-            return;
-        }
-        fibril_mutex_lock(&nodes_mutex);
-        new_node->lnkcnt--;
-        fibril_mutex_unlock(&nodes_mutex);
-        break;
-    default:
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        ipc_answer_0(rid, ENOTEMPTY);
-        free(old);
-        free(new);
-        return;
-    }
-    /* Create the new link for the new name. */
-    rc = vfs_lookup_internal(newc, L_LINK, NULL, NULL, old_node->index);
-    if (rc != EOK) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        if (new_node)
-            vfs_node_put(new_node);
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    fibril_mutex_lock(&nodes_mutex);
-    old_node->lnkcnt++;
-    fibril_mutex_unlock(&nodes_mutex);
-    /* Destroy the link for the old name. */
-    rc = vfs_lookup_internal(oldc, L_UNLINK, NULL, NULL);
-    if (rc != EOK) {
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        vfs_node_put(old_node);
-        if (new_node)
-            vfs_node_put(new_node);
-        ipc_answer_0(rid, rc);
-        free(old);
-        free(new);
-        return;
-    }
-    fibril_mutex_lock(&nodes_mutex);
-    old_node->lnkcnt--;
-    fibril_mutex_unlock(&nodes_mutex);
-    fibril_rwlock_write_unlock(&namespace_rwlock);
-    vfs_node_put(old_node);
-    if (new_node)
-        vfs_node_put(new_node);
-    free(old);
-    free(new);
-    ipc_answer_0(rid, EOK);
-}
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/vfs/vfs.h
 ,32 → 28,88
 /** @addtogroup fs
  * @{
- */
+ */
 #ifndef VFS_VFS_H_
 #define VFS_VFS_H_
 #include <ipc/ipc.h>
-#include <adt/list.h>
-#include <fibril_sync.h>
+#include <libadt/list.h>
+#include <atomic.h>
+#include <rwlock.h>
 #include <sys/types.h>
-#include <devmap.h>
 #include <bool.h>
-#include <ipc/vfs.h>
-// FIXME: according to CONFIG_DEBUG
-// #define dprintf(...)  printf(__VA_ARGS__)
+#define dprintf(...)    printf(__VA_ARGS__)
-#define dprintf(...)
+#define VFS_FIRST   IPC_FIRST_USER_METHOD
+#define IPC_METHOD_TO_VFS_OP(m) ((m) - VFS_FIRST)
+typedef enum {
+    VFS_OPEN = VFS_FIRST,
+    VFS_CLOSE,
+    VFS_READ,
+    VFS_WRITE,
+    VFS_TRUNCATE,
+    VFS_RENAME,
+    VFS_OPENDIR,
+    VFS_READDIR,
+    VFS_CLOSEDIR,
+    VFS_MKDIR,
+    VFS_UNLINK,
+    VFS_MOUNT,
+    VFS_UNMOUNT,
+    VFS_LAST_CMN,   /* keep this the last member of this enum */
+} vfs_request_cmn_t;
+typedef enum {
+    VFS_LOOKUP = VFS_LAST_CMN,
+    VFS_LAST_CLNT,  /* keep this the last member of this enum */
+} vfs_request_clnt_t;
+typedef enum {
+    VFS_REGISTER = VFS_LAST_CMN,
+    VFS_SEEK,
+    VFS_LAST_SRV,   /* keep this the last member of this enum */
+} vfs_request_srv_t;
 /**
+ * An instance of this structure is associated with a particular FS operation.
+ * It tells VFS if the FS supports the operation or maybe if a default one
+ * should be used.
+ */
+typedef enum {
+    VFS_OP_NULL = 0,
+    VFS_OP_DEFAULT,
+    VFS_OP_DEFINED
+} vfs_op_t;
+#define FS_NAME_MAXLEN  20
+/**
+ * A structure like this is passed to VFS by each individual FS upon its
+ * registration. It assosiates a human-readable identifier with each
+ * registered FS. More importantly, through this structure, the FS announces
+ * what operations it supports.
+ */
+typedef struct {
+    /** Unique identifier of the fs. */
+    char name[FS_NAME_MAXLEN + 1];
+    /** Operations. */
+    vfs_op_t ops[VFS_LAST_CLNT - VFS_FIRST];
+} vfs_info_t;
+/**
  * A structure like this will be allocated for each registered file system.
  */
 typedef struct {
     link_t fs_link;
     vfs_info_t vfs_info;
-    fs_handle_t fs_handle;
-    fibril_mutex_t phone_lock;
+    int fs_handle;
+    atomic_t phone_futex;   /**< Phone serializing futex. */
     ipcarg_t phone;
 } fs_info_t;
 ,9 → 116,9
 /**
  * VFS_PAIR uniquely represents a file system instance.
  */
-#define VFS_PAIR \
-    fs_handle_t fs_handle; \
-    dev_handle_t dev_handle;
+#define VFS_PAIR    \
+    int fs_handle;  \
+    int dev_handle;
 /**
  * VFS_TRIPLET uniquely identifies a file system node (e.g. directory, file) but
 ,9 → 127,9
  * @note    fs_handle, dev_handle and index are meant to be returned in one
  *      IPC reply.
  */
-#define VFS_TRIPLET \
-    VFS_PAIR; \
-    fs_index_t index;
+#define VFS_TRIPLET \
+    VFS_PAIR;   \
+    uint64_t index;
 typedef struct {
     VFS_PAIR;
 ,17 → 139,40
     VFS_TRIPLET;
 } vfs_triplet_t;
-typedef enum vfs_node_type {
-    VFS_NODE_UNKNOWN,
-    VFS_NODE_FILE,
-    VFS_NODE_DIRECTORY,
-} vfs_node_type_t;
+/*
+ * Lookup flags.
+ */
+/**
+ * Lookup will succeed only if the object is a regular file.  If L_CREATE is
+ * specified, an empty file will be created. This flag is mutually exclusive
+ * with L_DIRECTORY.
+ */
+#define L_FILE      1
+/**
+ * Lookup wil succeed only if the object is a directory. If L_CREATE is
+ * specified, an empty directory will be created. This flag is mutually
+ * exclusive with L_FILE.
+ */
+#define L_DIRECTORY 2
+/**
+ * When used with L_CREATE, L_EXCLUSIVE will cause the lookup to fail if the
+ * object already exists. L_EXCLUSIVE is implied when L_DIRECTORY is used.
+ */
+#define L_EXCLUSIVE 4
+/**
+ * L_CREATE is used for creating both regular files and directories.
+ */
+#define L_CREATE    8
+/**
+ * L_DESTROY is used to remove leaves from the file system namespace. This flag
+ * cannot be passed directly by the client, but will be set by VFS during
+ * VFS_UNLINK.
+ */
+#define L_DESTROY   16
 typedef struct {
     vfs_triplet_t triplet;
-    vfs_node_type_t type;
     size_t size;
-    unsigned lnkcnt;
 } vfs_lookup_res_t;
 /**
 ,26 → 181,14
  */
 typedef struct {
     VFS_TRIPLET;        /**< Identity of the node. */
-    /**
-     * Usage counter.  This includes, but is not limited to, all vfs_file_t
-     * structures that reference this node.
-     */
-    unsigned refcnt;
-    /** Number of names this node has in the file system namespace. */
-    unsigned lnkcnt;
+    unsigned refcnt;    /**< Usage counter. */
     link_t nh_link;     /**< Node hash-table link. */
+    size_t size;        /**< Cached size of the file. */
-    vfs_node_type_t type;   /**< Partial info about the node type. */
-    size_t size;        /**< Cached size if the node is a file. */
     /**
      * Holding this rwlock prevents modifications of the node's contents.
      */
-    fibril_rwlock_t contents_rwlock;
+    rwlock_t contents_rwlock;
 } vfs_node_t;
 /**
 ,7 → 197,7
  */
 typedef struct {
     /** Serializes access to this open file. */
-    fibril_mutex_t lock;
+    futex_t lock;
     vfs_node_t *node;
 ,14 → 211,14
     off_t pos;
 } vfs_file_t;
-extern fibril_mutex_t nodes_mutex;
-extern fibril_condvar_t fs_head_cv;
-extern fibril_mutex_t fs_head_lock;
 extern link_t fs_head;      /**< List of registered file systems. */
-extern vfs_pair_t rootfs;   /**< Root file system. */
+extern vfs_triplet_t rootfs;    /**< Root node of the root file system. */
+#define MAX_PATH_LEN        (64 * 1024)
+#define PLB_SIZE        (2 * MAX_PATH_LEN)
 /** Each instance of this type describes one path lookup in progress. */
 typedef struct {
     link_t  plb_link;   /**< Active PLB entries list link. */
 ,23 → 226,20
     size_t len;     /**< Number of characters in this PLB entry. */
 } plb_entry_t;
-extern fibril_mutex_t plb_mutex;/**< Mutex protecting plb and plb_head. */
+extern atomic_t plb_futex;  /**< Futex protecting plb and plb_head. */
 extern uint8_t *plb;        /**< Path Lookup Buffer */
 extern link_t plb_head;     /**< List of active PLB entries. */
-#define MAX_MNTOPTS_LEN     256
 /** Holding this rwlock prevents changes in file system namespace. */
-extern fibril_rwlock_t namespace_rwlock;
+extern rwlock_t namespace_rwlock;
-extern int vfs_grab_phone(fs_handle_t);
+extern int vfs_grab_phone(int);
 extern void vfs_release_phone(int);
-extern fs_handle_t fs_name_to_handle(char *, bool);
+extern int fs_name_to_handle(char *, bool);
-extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
-    vfs_pair_t *, ...);
-extern int vfs_open_node_internal(vfs_lookup_res_t *);
+extern int vfs_lookup_internal(char *, size_t, int, vfs_lookup_res_t *,
+    vfs_pair_t *);
 extern bool vfs_nodes_init(void);
 extern vfs_node_t *vfs_node_get(vfs_lookup_res_t *);
 ,7 → 250,7
 extern bool vfs_files_init(void);
 extern vfs_file_t *vfs_file_get(int);
 extern int vfs_fd_alloc(void);
-extern int vfs_fd_free(int);
+extern void vfs_fd_free(int);
 extern void vfs_file_addref(vfs_file_t *);
 extern void vfs_file_delref(vfs_file_t *);
 ,19 → 261,11
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
-extern void vfs_open_node(ipc_callid_t, ipc_call_t *);
-extern void vfs_sync(ipc_callid_t, ipc_call_t *);
-extern void vfs_close(ipc_callid_t, ipc_call_t *);
 extern void vfs_read(ipc_callid_t, ipc_call_t *);
 extern void vfs_write(ipc_callid_t, ipc_call_t *);
 extern void vfs_seek(ipc_callid_t, ipc_call_t *);
 extern void vfs_truncate(ipc_callid_t, ipc_call_t *);
-extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
-extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
-extern void vfs_stat(ipc_callid_t, ipc_call_t *);
 extern void vfs_mkdir(ipc_callid_t, ipc_call_t *);
-extern void vfs_unlink(ipc_callid_t, ipc_call_t *);
-extern void vfs_rename(ipc_callid_t, ipc_call_t *);
 #endif

 /trunk/uspace/srv/vfs/vfs.c
 ,11 → 28,11
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file vfs.c
- * @brief VFS service for HelenOS.
+ * @file    vfs.c
+ * @brief   VFS service for HelenOS.
  */
 #include <ipc/ipc.h>
 ,21 → 43,24
 #include <bool.h>
 #include <string.h>
 #include <as.h>
+#include <libadt/list.h>
 #include <atomic.h>
 #include "vfs.h"
-#define NAME "vfs"
+#define dprintf(...)    printf(__VA_ARGS__)
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    bool keep_on_going = true;
+    bool keep_on_going = 1;
+    printf("Connection opened from %p\n", icall->in_phone_hash);
     /*
      * The connection was opened via the IPC_CONNECT_ME_TO call.
      * This call needs to be answered.
      */
     ipc_answer_0(iid, EOK);
     /*
      * Here we enter the main connection fibril loop.
      * The logic behind this loop and the protocol is that we'd like to keep
 ,101 → 72,89
      * connection later.
      */
     while (keep_on_going) {
+        ipc_callid_t callid;
         ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
+        callid = async_get_call(&call);
+        printf("Received call, method=%d\n", IPC_GET_METHOD(call));
-        fs_handle_t fs_handle;
-        int phone;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             keep_on_going = false;
             break;
-        case VFS_IN_REGISTER:
+        case VFS_REGISTER:
             vfs_register(callid, &call);
             keep_on_going = false;
             break;
-        case VFS_IN_MOUNT:
+        case VFS_MOUNT:
             vfs_mount(callid, &call);
             break;
-        case VFS_IN_OPEN:
+        case VFS_OPEN:
             vfs_open(callid, &call);
             break;
-        case VFS_IN_OPEN_NODE:
-            vfs_open_node(callid, &call);
-            break;
-        case VFS_IN_CLOSE:
-            vfs_close(callid, &call);
-            break;
-        case VFS_IN_READ:
+        case VFS_READ:
             vfs_read(callid, &call);
             break;
-        case VFS_IN_WRITE:
+        case VFS_WRITE:
             vfs_write(callid, &call);
             break;
-        case VFS_IN_SEEK:
+        case VFS_SEEK:
             vfs_seek(callid, &call);
             break;
-        case VFS_IN_TRUNCATE:
+        case VFS_TRUNCATE:
             vfs_truncate(callid, &call);
             break;
-        case VFS_IN_FSTAT:
-            vfs_fstat(callid, &call);
-            break;
-        case VFS_IN_STAT:
-            vfs_stat(callid, &call);
-            break;
-        case VFS_IN_MKDIR:
+        case VFS_MKDIR:
             vfs_mkdir(callid, &call);
             break;
-        case VFS_IN_UNLINK:
-            vfs_unlink(callid, &call);
-            break;
-        case VFS_IN_RENAME:
-            vfs_rename(callid, &call);
-            break;
-        case VFS_IN_SYNC:
-            vfs_sync(callid, &call);
-            break;
         default:
             ipc_answer_0(callid, ENOTSUP);
             break;
         }
     }
+    /* TODO: cleanup after the client */
-    /* TODO: cleanup after the client */
 }
 int main(int argc, char **argv)
 {
-    printf(NAME ": HelenOS VFS server\n");
+    ipcarg_t phonead;
+    printf("VFS: HelenOS VFS server\n");
     /*
+     * Initialize the list of registered file systems.
+     */
+    list_initialize(&fs_head);
+    /*
      * Initialize VFS node hash table.
      */
     if (!vfs_nodes_init()) {
-        printf(NAME ": Failed to initialize VFS node hash table\n");
+        printf("Failed to initialize the VFS node hash table.\n");
         return ENOMEM;
     }
     /*
      * Allocate and initialize the Path Lookup Buffer.
      */
+    list_initialize(&plb_head);
     plb = as_get_mappable_page(PLB_SIZE);
     if (!plb) {
-        printf(NAME ": Cannot allocate a mappable piece of address space\n");
+        printf("Cannot allocate a mappable piece of address space\n");
         return ENOMEM;
     }
     if (as_area_create(plb, PLB_SIZE, AS_AREA_READ | AS_AREA_WRITE |
         AS_AREA_CACHEABLE) != plb) {
-        printf(NAME ": Cannot create address space area\n");
+        printf("Cannot create address space area.\n");
         return ENOMEM;
     }
     memset(plb, 0, PLB_SIZE);
     /*
-     * Set a connection handling function/fibril.
+     * Set a connectio handling function/fibril.
      */
     async_set_client_connection(vfs_connection);
 ,13 → 161,11
     /*
      * Register at the naming service.
      */
-    ipcarg_t phonead;
     ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
     /*
      * Start accepting connections.
      */
-    printf(NAME ": Accepting connections\n");
     async_manager();
     return 0;
 }
 ,4 → 172,4
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/vfs/vfs_lookup.c
 ,72 → 28,59
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file vfs_lookup.c
+ * @file    vfs_lookup.c
  * @brief
  */
-#include "vfs.h"
 #include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 #include <string.h>
-#include <stdarg.h>
 #include <bool.h>
-#include <fibril_sync.h>
-#include <adt/list.h>
-#include <vfs/canonify.h>
+#include <futex.h>
+#include <libadt/list.h>
+#include <atomic.h>
+#include "vfs.h"
-#define min(a, b)  ((a) < (b) ? (a) : (b))
+#define min(a, b)   ((a) < (b) ? (a) : (b))
-FIBRIL_MUTEX_INITIALIZE(plb_mutex);
-LIST_INITIALIZE(plb_head);  /**< PLB entry ring buffer. */
+atomic_t plb_futex = FUTEX_INITIALIZER;
+link_t plb_head;    /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;
 /** Perform a path lookup.
  *
- * @param path    Path to be resolved; it must be a NULL-terminated
- *                string.
- * @param lflag   Flags to be used during lookup.
- * @param result  Empty structure where the lookup result will be stored.
- *                Can be NULL.
- * @param altroot If non-empty, will be used instead of rootfs as the root
- *                of the whole VFS tree.
+ * @param path      Path to be resolved; it needn't be an ASCIIZ string.
+ * @param len       Number of path characters pointed by path.
+ * @param lflag     Flags to be used during lookup.
+ * @param result    Empty structure where the lookup result will be stored.
+ *          Can be NULL.
+ * @param altroot   If non-empty, will be used instead of rootfs as the root
+ *          of the whole VFS tree.
  *
- * @return EOK on success or an error code from errno.h.
- *
+ * @return      EOK on success or an error code from errno.h.
  */
-int vfs_lookup_internal(char *path, int lflag, vfs_lookup_res_t *result,
-    vfs_pair_t *altroot, ...)
+int vfs_lookup_internal(char *path, size_t len, int lflag,
+    vfs_lookup_res_t *result, vfs_pair_t *altroot)
 {
     vfs_pair_t *root;
+    if (!len)
+        return EINVAL;
     if (altroot)
         root = altroot;
     else
-        root = &rootfs;
+        root = (vfs_pair_t *) &rootfs;
     if (!root->fs_handle)
         return ENOENT;
-    size_t len;
-    path = canonify(path, &len);
-    if (!path)
-        return EINVAL;
-    fs_index_t index = 0;
-    if (lflag & L_LINK) {
-        va_list ap;
+    futex_down(&plb_futex);
-        va_start(ap, altroot);
-        index = va_arg(ap, fs_index_t);
-        va_end(ap);
-    }
-    fibril_mutex_lock(&plb_mutex);
     plb_entry_t entry;
     link_initialize(&entry.plb_link);
     entry.len = len;
 ,7 → 106,7
             /*
              * The buffer cannot absorb the path.
              */
-            fibril_mutex_unlock(&plb_mutex);
+            futex_up(&plb_futex);
             return ELIMIT;
         }
     } else {
 ,7 → 114,7
             /*
              * The buffer cannot absorb the path.
              */
-            fibril_mutex_unlock(&plb_mutex);
+            futex_up(&plb_futex);
             return ELIMIT;
         }
     }
 ,7 → 133,7
      */
     list_append(&entry.plb_link, &plb_head);
-    fibril_mutex_unlock(&plb_mutex);
+    futex_up(&plb_futex);
     /*
      * Copy the path into PLB.
 ,16 → 146,15
     ipc_call_t answer;
     int phone = vfs_grab_phone(root->fs_handle);
-    aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
+    aid_t req = async_send_4(phone, VFS_LOOKUP, (ipcarg_t) first,
         (ipcarg_t) (first + len - 1) % PLB_SIZE,
-        (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
-        &answer);
+        (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, &answer);
+    vfs_release_phone(phone);
     ipcarg_t rc;
     async_wait_for(req, &rc);
-    vfs_release_phone(phone);
-    fibril_mutex_lock(&plb_mutex);
+    futex_down(&plb_futex);
     list_remove(&entry.plb_link);
     /*
      * Erasing the path from PLB will come handy for debugging purposes.
 ,58 → 161,18
      */
     memset(&plb[first], 0, cnt1);
     memset(plb, 0, cnt2);
-    fibril_mutex_unlock(&plb_mutex);
+    futex_up(&plb_futex);
-    if ((rc == EOK) && (result)) {
-        result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
-        result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG2(answer);
-        result->triplet.index = (fs_index_t) IPC_GET_ARG3(answer);
+    if ((rc == EOK) && result) {
+        result->triplet.fs_handle = (int) IPC_GET_ARG1(answer);
+        result->triplet.dev_handle = (int) IPC_GET_ARG2(answer);
+        result->triplet.index = (int) IPC_GET_ARG3(answer);
         result->size = (size_t) IPC_GET_ARG4(answer);
-        result->lnkcnt = (unsigned) IPC_GET_ARG5(answer);
-        if (lflag & L_FILE)
-            result->type = VFS_NODE_FILE;
-        else if (lflag & L_DIRECTORY)
-            result->type = VFS_NODE_DIRECTORY;
-        else
-            result->type = VFS_NODE_UNKNOWN;
     }
     return rc;
 }
-/** Perform a node open operation.
- *
- * @return EOK on success or an error code from errno.h.
- *
- */
-int vfs_open_node_internal(vfs_lookup_res_t *result)
-{
-    int phone = vfs_grab_phone(result->triplet.fs_handle);
-    ipc_call_t answer;
-    aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-        (ipcarg_t) result->triplet.dev_handle,
-        (ipcarg_t) result->triplet.index, &answer);
-    ipcarg_t rc;
-    async_wait_for(req, &rc);
-    vfs_release_phone(phone);
-    if (rc == EOK) {
-        result->size = (size_t) IPC_GET_ARG1(answer);
-        result->lnkcnt = (unsigned) IPC_GET_ARG2(answer);
-        if (IPC_GET_ARG3(answer) & L_FILE)
-            result->type = VFS_NODE_FILE;
-        else if (IPC_GET_ARG3(answer) & L_DIRECTORY)
-            result->type = VFS_NODE_DIRECTORY;
-        else
-            result->type = VFS_NODE_UNKNOWN;
-    }
-    return rc;
-}
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/vfs/vfs_register.c
 ,10 → 28,10
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file vfs_register.c
+ * @file    vfs_register.c
  * @brief
  */
 ,16 → 45,15
 #include <string.h>
 #include <ctype.h>
 #include <bool.h>
-#include <fibril_sync.h>
-#include <adt/list.h>
+#include <futex.h>
+#include <libadt/list.h>
 #include <as.h>
 #include <assert.h>
 #include <atomic.h>
 #include "vfs.h"
-FIBRIL_CONDVAR_INITIALIZE(fs_head_cv);
-FIBRIL_MUTEX_INITIALIZE(fs_head_lock);
-LIST_INITIALIZE(fs_head);
+atomic_t fs_head_futex = FUTEX_INITIALIZER;
+link_t fs_head;
 atomic_t fs_handle_next = {
     .count = 1
 ,6 → 98,38
         return false;
     }
+    /*
+     * Check if the FS implements mandatory VFS operations.
+     */
+    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] != VFS_OP_DEFINED) {
+        dprintf("Operation VFS_LOOKUP not defined by the client.\n");
+        return false;
+    }
+    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_OPEN)] != VFS_OP_DEFINED) {
+        dprintf("Operation VFS_OPEN not defined by the client.\n");
+        return false;
+    }
+    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_CLOSE)] != VFS_OP_DEFINED) {
+        dprintf("Operation VFS_CLOSE not defined by the client.\n");
+        return false;
+    }
+    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_READ)] != VFS_OP_DEFINED) {
+        dprintf("Operation VFS_READ not defined by the client.\n");
+        return false;
+    }
+    /*
+     * Check if each operation is either not defined, defined or default.
+     */
+    for (i = VFS_FIRST; i < VFS_LAST_CLNT; i++) {
+        if ((info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_NULL) &&
+            (info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_DEFAULT) &&
+            (info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_DEFINED)) {
+            dprintf("Operation info not understood.\n");
+            return false;
+        }
+    }
     return true;
 }
 ,7 → 191,7
         return;
     }
     link_initialize(&fs_info->fs_link);
-    fibril_mutex_initialize(&fs_info->phone_lock);
+    futex_initialize(&fs_info->phone_futex, 1);
     rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
     if (rc != EOK) {
 ,7 → 212,7
         return;
     }
-    fibril_mutex_lock(&fs_head_lock);
+    futex_down(&fs_head_futex);
     /*
      * Check for duplicit registrations.
 ,7 → 222,7
          * We already register a fs like this.
          */
         dprintf("FS is already registered.\n");
-        fibril_mutex_unlock(&fs_head_lock);
+        futex_up(&fs_head_futex);
         free(fs_info);
         ipc_answer_0(callid, EEXISTS);
         ipc_answer_0(rid, EEXISTS);
 ,7 → 234,7
      */
     dprintf("Inserting FS into the list of registered file systems.\n");
     list_append(&fs_info->fs_link, &fs_head);
     /*
      * Now we want the client to send us the IPC_M_CONNECT_TO_ME call so
      * that a callback connection is created and we have a phone through
 ,7 → 244,7
     if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
         dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
         list_remove(&fs_info->fs_link);
-        fibril_mutex_unlock(&fs_head_lock);
+        futex_up(&fs_head_futex);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
 ,7 → 262,7
     if (!ipc_share_in_receive(&callid, &size)) {
         dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
         list_remove(&fs_info->fs_link);
-        fibril_mutex_unlock(&fs_head_lock);
+        futex_up(&fs_head_futex);
         ipc_hangup(fs_info->phone);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
 ,7 → 276,7
     if (size != PLB_SIZE) {
         dprintf("Client suggests wrong size of PFB, size = %d\n", size);
         list_remove(&fs_info->fs_link);
-        fibril_mutex_unlock(&fs_head_lock);
+        futex_up(&fs_head_futex);
         ipc_hangup(fs_info->phone);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
 ,11 → 297,10
      * In reply to the VFS_REGISTER request, we assign the client file
      * system a global file system handle.
      */
-    fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
+    fs_info->fs_handle = (int) atomic_postinc(&fs_handle_next);
     ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
-    fibril_condvar_broadcast(&fs_head_cv);
-    fibril_mutex_unlock(&fs_head_lock);
+    futex_up(&fs_head_futex);
     dprintf("\"%.*s\" filesystem successfully registered, handle=%d.\n",
         FS_NAME_MAXLEN, fs_info->vfs_info.name, fs_info->fs_handle);
 ,70 → 313,98
  * @return      Phone over which a multi-call request can be safely
  *          sent. Return 0 if no phone was found.
  */
-int vfs_grab_phone(fs_handle_t handle)
+int vfs_grab_phone(int handle)
 {
-    int phone;
     /*
-     * For now, we don't try to be very clever and very fast.  We simply
-     * lookup the phone in the fs_head list and duplicate it.  The duplicate
-     * phone will be returned to the client and the client will use it for
-     * communication.  In the future, we should cache the connections so
-     * that they do not have to be reestablished over and over again.
+     * For now, we don't try to be very clever and very fast.
+     * We simply lookup the phone in the fs_head list. We currently don't
+     * open any additional phones (even though that itself would be pretty
+     * straightforward; housekeeping multiple open phones to a FS task would
+     * be more demanding). Instead, we simply take the respective
+     * phone_futex and keep it until vfs_release_phone().
      */
-    fibril_mutex_lock(&fs_head_lock);
+    futex_down(&fs_head_futex);
     link_t *cur;
     fs_info_t *fs;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs = list_get_instance(cur, fs_info_t, fs_link);
         if (fs->fs_handle == handle) {
-            fibril_mutex_unlock(&fs_head_lock);
-            fibril_mutex_lock(&fs->phone_lock);
-            phone = ipc_connect_me_to(fs->phone, 0, 0, 0);
-            fibril_mutex_unlock(&fs->phone_lock);
-            assert(phone > 0);
-            return phone;
+            futex_up(&fs_head_futex);
+            /*
+             * For now, take the futex unconditionally.
+             * Oh yeah, serialization rocks.
+             * It will be up'ed in vfs_release_phone().
+             */
+            futex_down(&fs->phone_futex);
+            /*
+             * Avoid deadlock with other fibrils in the same thread
+             * by disabling fibril preemption.
+             */
+            fibril_inc_sercount();
+            return fs->phone;
         }
     }
-    fibril_mutex_unlock(&fs_head_lock);
+    futex_up(&fs_head_futex);
     return 0;
 }
-/** Tell VFS that the phone is not needed anymore.
+/** Tell VFS that the phone is in use for any request.
  *
  * @param phone     Phone to FS task.
  */
 void vfs_release_phone(int phone)
 {
-    /* TODO: implement connection caching */
-    ipc_hangup(phone);
+    bool found = false;
+    /*
+     * Undo the fibril_inc_sercount() done in vfs_grab_phone().
+     */
+    fibril_dec_sercount();
+    futex_down(&fs_head_futex);
+    link_t *cur;
+    for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
+        fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
+        if (fs->phone == phone) {
+            found = true;
+            futex_up(&fs_head_futex);
+            futex_up(&fs->phone_futex);
+            return;
+        }
+    }
+    futex_up(&fs_head_futex);
+    /*
+     * Not good to get here.
+     */
+    assert(found == true);
 }
 /** Convert file system name to its handle.
  *
  * @param name      File system name.
- * @param lock      If true, the function will lock and unlock the
- *          fs_head_lock.
+ * @param lock      If true, the function will down and up the
+ *          fs_head_futex.
  *
  * @return      File system handle or zero if file system not found.
  */
-fs_handle_t fs_name_to_handle(char *name, bool lock)
+int fs_name_to_handle(char *name, bool lock)
 {
     int handle = 0;
     if (lock)
-        fibril_mutex_lock(&fs_head_lock);
+        futex_down(&fs_head_futex);
     link_t *cur;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-        if (str_cmp(fs->vfs_info.name, name) == 0) {
+        if (strncmp(fs->vfs_info.name, name,
+            sizeof(fs->vfs_info.name)) == 0) {
             handle = fs->fs_handle;
             break;
         }
     }
     if (lock)
-        fibril_mutex_unlock(&fs_head_lock);
+        futex_up(&fs_head_futex);
     return handle;
 }

 /trunk/uspace/srv/vfs/Makefile
 ,7 → 32,6
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,24 → 52,22
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/vfs/vfs_node.c
 ,14 → 38,14
 #include "vfs.h"
 #include <stdlib.h>
 #include <string.h>
-#include <fibril_sync.h>
-#include <adt/hash_table.h>
+#include <atomic.h>
+#include <futex.h>
+#include <rwlock.h>
+#include <libadt/hash_table.h>
 #include <assert.h>
-#include <async.h>
-#include <errno.h>
-/** Mutex protecting the VFS node hash table. */
-FIBRIL_MUTEX_INITIALIZE(nodes_mutex);
+/** Futex protecting the VFS node hash table. */
+atomic_t nodes_futex = FUTEX_INITIALIZER;
 #define NODES_BUCKETS_LOG   8
 #define NODES_BUCKETS       (1 << NODES_BUCKETS_LOG)
 ,9 → 88,9
  */
 void vfs_node_addref(vfs_node_t *node)
 {
-    fibril_mutex_lock(&nodes_mutex);
+    futex_down(&nodes_futex);
     _vfs_node_addref(node);
-    fibril_mutex_unlock(&nodes_mutex);
+    futex_up(&nodes_futex);
 }
 /** Decrement reference count of a VFS node.
 ,15 → 101,8
  */
 void vfs_node_delref(vfs_node_t *node)
 {
-    bool free_vfs_node = false;
-    bool free_fs_node = false;
-    fibril_mutex_lock(&nodes_mutex);
+    futex_down(&nodes_futex);
     if (node->refcnt-- == 1) {
-        /*
-         * We are dropping the last reference to this node.
-         * Remove it from the VFS node hash table.
-         */
         unsigned long key[] = {
             [KEY_FS_HANDLE] = node->fs_handle,
             [KEY_DEV_HANDLE] = node->dev_handle,
 ,26 → 109,8
             [KEY_INDEX] = node->index
         };
         hash_table_remove(&nodes, key, 3);
-        free_vfs_node = true;
-        if (!node->lnkcnt)
-            free_fs_node = true;
     }
-    fibril_mutex_unlock(&nodes_mutex);
-    if (free_fs_node) {
-        /*
-         * The node is not visible in the file system namespace.
-         * Free up its resources.
-         */
-        int phone = vfs_grab_phone(node->fs_handle);
-        ipcarg_t rc;
-        rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-            (ipcarg_t)node->dev_handle, (ipcarg_t)node->index);
-        assert(rc == EOK);
-        vfs_release_phone(phone);
-    }
-    if (free_vfs_node)
-        free(node);
+    futex_up(&nodes_futex);
 }
 /** Find VFS node.
 ,39 → 135,30
     link_t *tmp;
     vfs_node_t *node;
-    fibril_mutex_lock(&nodes_mutex);
+    futex_down(&nodes_futex);
     tmp = hash_table_find(&nodes, key);
     if (!tmp) {
         node = (vfs_node_t *) malloc(sizeof(vfs_node_t));
         if (!node) {
-            fibril_mutex_unlock(&nodes_mutex);
+            futex_up(&nodes_futex);
             return NULL;
         }
         memset(node, 0, sizeof(vfs_node_t));
         node->fs_handle = result->triplet.fs_handle;
-        node->dev_handle = result->triplet.dev_handle;
+        node->dev_handle = result->triplet.fs_handle;
         node->index = result->triplet.index;
         node->size = result->size;
-        node->lnkcnt = result->lnkcnt;
-        node->type = result->type;
         link_initialize(&node->nh_link);
-        fibril_rwlock_initialize(&node->contents_rwlock);
+        rwlock_initialize(&node->contents_rwlock);
         hash_table_insert(&nodes, key, &node->nh_link);
     } else {
-        node = hash_table_get_instance(tmp, vfs_node_t, nh_link);
-        if (node->type == VFS_NODE_UNKNOWN &&
-            result->type != VFS_NODE_UNKNOWN) {
-            /* Upgrade the node type. */
-            node->type = result->type;
-        }
+        node = hash_table_get_instance(tmp, vfs_node_t, nh_link);
     }
     assert(node->size == result->size);
-    assert(node->lnkcnt == result->lnkcnt);
-    assert(node->type == result->type || result->type == VFS_NODE_UNKNOWN);
     _vfs_node_addref(node);
-    fibril_mutex_unlock(&nodes_mutex);
+    futex_up(&nodes_futex);
     return node;
 }
 ,8 → 194,10
 void nodes_remove_callback(link_t *item)
 {
+    vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
+    free(node);
 }
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/vfs/vfs_file.c
 ,8 → 40,6
 #include <string.h>
 #include <assert.h>
 #include <bool.h>
-#include <fibril.h>
-#include <fibril_sync.h>
 #include "vfs.h"
 /**
 ,9 → 55,9
  * first VFS_OPEN operation.
  *
  * This resource being per-connection and, in the first place, per-fibril, we
- * don't need to protect it by a mutex.
+ * don't need to protect it by a futex.
  */
-fibril_local vfs_file_t **files = NULL;
+__thread vfs_file_t **files = NULL;
 /** Initialize the table of open files. */
 bool vfs_files_init(void)
 ,23 → 78,19
  */
 int vfs_fd_alloc(void)
 {
-    if (!vfs_files_init())
-        return ENOMEM;
-    unsigned int i;
+    int i;
     for (i = 0; i < MAX_OPEN_FILES; i++) {
         if (!files[i]) {
             files[i] = (vfs_file_t *) malloc(sizeof(vfs_file_t));
             if (!files[i])
                 return ENOMEM;
             memset(files[i], 0, sizeof(vfs_file_t));
-            fibril_mutex_initialize(&files[i]->lock);
+            futex_initialize(&files[i]->lock, 1);
             vfs_file_addref(files[i]);
-            return (int) i;
+            return i;
         }
     }
     return EMFILE;
 }
 ,22 → 97,13
 /** Release file descriptor.
  *
  * @param fd        File descriptor being released.
- *
- * @return      EOK on success or EBADF if fd is an invalid file
- *          descriptor.
  */
-int vfs_fd_free(int fd)
+void vfs_fd_free(int fd)
 {
-    if (!vfs_files_init())
-        return ENOMEM;
-    if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
-        return EBADF;
+    assert(fd < MAX_OPEN_FILES);
+    assert(files[fd] != NULL);
     vfs_file_delref(files[fd]);
     files[fd] = NULL;
-    return EOK;
 }
 /** Increment reference count of VFS file structure.
 ,7 → 130,7
 {
     if (file->refcnt-- == 1) {
         /*
-         * Lost the last reference to a file, need to drop our reference
+         * Lost last reference to a file, need to drop our reference
          * to the underlying VFS node.
          */
         vfs_node_delref(file->node);
 ,15 → 146,11
  */
 vfs_file_t *vfs_file_get(int fd)
 {
-    if (!vfs_files_init())
-        return NULL;
-    if ((fd >= 0) && (fd < MAX_OPEN_FILES))
+    if (fd < MAX_OPEN_FILES)
         return files[fd];
     return NULL;
 }
 /**
  * @}
- */
+ */

/trunk/uspace/srv/console/gfx/cons_kernel.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/anim_1.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/anim_2.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/anim_3.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/cons_has_data.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/anim_4.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/cons_selected.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/nameic.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/helenos.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/gfx/cons_idle.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /trunk/uspace/srv/console/console.c
 ,7 → 27,7
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
 ,388 → 35,326
 #include <libc.h>
 #include <fb.h>
 #include <ipc/ipc.h>
-#include <kbd.h>
-#include <io/keycode.h>
+#include <keys.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
 #include <errno.h>
-#include <keybuffer.h>
-#include <ipc/console.h>
+#include <key_buffer.h>
+#include <console.h>
 #include <unistd.h>
 #include <async.h>
-#include <adt/fifo.h>
+#include <libadt/fifo.h>
+#include <screenbuffer.h>
 #include <sys/mman.h>
-#include <stdio.h>
-#include <string.h>
-#include <sysinfo.h>
-#include <event.h>
-#include <devmap.h>
-#include <fibril_sync.h>
-#include "console.h"
 #include "gcons.h"
-#include "screenbuffer.h"
-#define NAME  "console"
+#define MAX_KEYREQUESTS_BUFFERED 32
-#define MAX_DEVICE_NAME  32
+#define NAME "CONSOLE"
-/** Phone to the keyboard driver. */
-static int kbd_phone;
+/** Index of currently used virtual console.
+ */
+int active_console = 0;
-/** Information about framebuffer */
+/** Information about framebuffer
+ */
 struct {
-    int phone;      /**< Framebuffer phone */
-    ipcarg_t cols;  /**< Framebuffer columns */
-    ipcarg_t rows;  /**< Framebuffer rows */
-    int color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
+    int phone;      /**< Framebuffer phone */
+    ipcarg_t rows;      /**< Framebuffer rows */
+    ipcarg_t cols;      /**< Framebuffer columns */
 } fb_info;
 typedef struct {
-    size_t index;             /**< Console index */
-    size_t refcount;          /**< Connection reference count */
-    dev_handle_t dev_handle;  /**< Device handle */
-    keybuffer_t keybuffer;    /**< Buffer for incoming keys. */
-    screenbuffer_t scr;       /**< Screenbuffer for saving screen
-                                   contents and related settings. */
-} console_t;
+    keybuffer_t keybuffer;      /**< Buffer for incoming keys. */
+    /** Buffer for unsatisfied request for keys. */
+    FIFO_CREATE_STATIC(keyrequests, ipc_callid_t,
+        MAX_KEYREQUESTS_BUFFERED);
+    int keyrequest_counter;     /**< Number of requests in buffer. */
+    int client_phone;       /**< Phone to connected client. */
+    int used;           /**< 1 if this virtual console is
+                     * connected to some client.*/
+    screenbuffer_t screenbuffer;    /**< Screenbuffer for saving screen
+                     * contents and related settings. */
+} connection_t;
-/** Array of data for virtual consoles */
-static console_t consoles[CONSOLE_COUNT];
+static connection_t connections[CONSOLE_COUNT]; /**< Array of data for virtual
+                         * consoles */
+static keyfield_t *interbuffer = NULL;      /**< Pointer to memory shared
+                         * with framebufer used for
+                         * faster virtual console
+                         * switching */
-static console_t *active_console = &consoles[0];
-static console_t *prev_console = &consoles[0];
-static console_t *kernel_console = &consoles[KERNEL_CONSOLE];
+static int kernel_pixmap = -1;  /**< Number of fb pixmap, where kernel
+                 * console is stored */
-/** Pointer to memory shared with framebufer used for
-    faster virtual console switching */
-static keyfield_t *interbuffer = NULL;
-/** Information on row-span yet unsent to FB driver. */
-struct {
-    size_t col;  /**< Leftmost column of the span. */
-    size_t row;  /**< Row where the span lies. */
-    size_t cnt;  /**< Width of the span. */
-} fb_pending;
-static FIBRIL_MUTEX_INITIALIZE(input_mutex);
-static FIBRIL_CONDVAR_INITIALIZE(input_cv);
-static void curs_visibility(bool visible)
+/** Find unused virtual console.
+ *
+ */
+static int find_free_connection(void)
 {
-    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, visible);
+    int i;
+    for (i = 0; i < CONSOLE_COUNT; i++) {
+        if (!connections[i].used)
+            return i;
+    }
+    return -1;
 }
-static void curs_hide_sync(void)
+static void clrscr(void)
 {
-    ipc_call_sync_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false);
-}
-static void curs_goto(size_t x, size_t y)
-{
-    async_msg_2(fb_info.phone, FB_CURSOR_GOTO, x, y);
-}
-static void screen_clear(void)
-{
     async_msg_0(fb_info.phone, FB_CLEAR);
 }
-static void screen_yield(void)
+static void curs_visibility(int v)
 {
-    ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_YIELD);
+    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, v);
 }
-static void screen_reclaim(void)
+static void curs_goto(int row, int col)
 {
-    ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_RECLAIM);
+    async_msg_2(fb_info.phone, FB_CURSOR_GOTO, row, col);
 }
-static void kbd_yield(void)
+static void set_style(style_t *style)
 {
-    ipc_call_sync_0_0(kbd_phone, KBD_YIELD);
+    async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color,
+        style->bg_color);
 }
-static void kbd_reclaim(void)
+static void set_style_col(int fgcolor, int bgcolor)
 {
-    ipc_call_sync_0_0(kbd_phone, KBD_RECLAIM);
+    async_msg_2(fb_info.phone, FB_SET_STYLE, fgcolor, bgcolor);
 }
-static void set_style(int style)
+static void prtchr(char c, int row, int col)
 {
-    async_msg_1(fb_info.phone, FB_SET_STYLE, style);
+    async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
 }
-static void set_color(int fgcolor, int bgcolor, int flags)
-{
-    async_msg_3(fb_info.phone, FB_SET_COLOR, fgcolor, bgcolor, flags);
-}
-static void set_rgb_color(int fgcolor, int bgcolor)
-{
-    async_msg_2(fb_info.phone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
-}
-static void set_attrs(attrs_t *attrs)
-{
-    switch (attrs->t) {
-    case at_style:
-        set_style(attrs->a.s.style);
-        break;
-    case at_idx:
-        set_color(attrs->a.i.fg_color, attrs->a.i.bg_color,
-            attrs->a.i.flags);
-        break;
-    case at_rgb:
-        set_rgb_color(attrs->a.r.fg_color, attrs->a.r.bg_color);
-        break;
-    }
-}
-static int ccap_fb_to_con(int ccap_fb, int *ccap_con)
-{
-    switch (ccap_fb) {
-    case FB_CCAP_NONE: *ccap_con = CONSOLE_CCAP_NONE; break;
-    case FB_CCAP_STYLE: *ccap_con = CONSOLE_CCAP_STYLE; break;
-    case FB_CCAP_INDEXED: *ccap_con = CONSOLE_CCAP_INDEXED; break;
-    case FB_CCAP_RGB: *ccap_con = CONSOLE_CCAP_RGB; break;
-    default: return EINVAL;
-    }
-    return EOK;
-}
-/** Send an area of screenbuffer to the FB driver. */
-static void fb_update_area(console_t *cons, ipcarg_t x0, ipcarg_t y0, ipcarg_t width, ipcarg_t height)
-{
-    if (interbuffer) {
-        ipcarg_t x;
-        ipcarg_t y;
-        for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-                interbuffer[y * width + x] =
-                    *get_field_at(&cons->scr, x0 + x, y0 + y);
-            }
-        }
-        async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
-            x0, y0, width, height);
-    }
-}
-/** Flush pending cells to FB. */
-static void fb_pending_flush(void)
-{
-    if (fb_pending.cnt > 0) {
-        fb_update_area(active_console, fb_pending.col,
-            fb_pending.row, fb_pending.cnt, 1);
-        fb_pending.cnt = 0;
-    }
-}
-/** Mark a character cell as changed.
+/** Check key and process special keys.
  *
- * This adds the cell to the pending rowspan if possible. Otherwise
- * the old span is flushed first.
  *
  */
-static void cell_mark_changed(size_t col, size_t row)
+static void write_char(int console, char key)
 {
-    if (fb_pending.cnt != 0) {
-        if ((col != fb_pending.col + fb_pending.cnt)
-            || (row != fb_pending.row)) {
-            fb_pending_flush();
-        }
-    }
+    screenbuffer_t *scr = &(connections[console].screenbuffer);
-    if (fb_pending.cnt == 0) {
-        fb_pending.col = col;
-        fb_pending.row = row;
-    }
-    fb_pending.cnt++;
-}
-/** Print a character to the active VC with buffering. */
-static void fb_putchar(wchar_t c, ipcarg_t col, ipcarg_t row)
-{
-    async_msg_3(fb_info.phone, FB_PUTCHAR, c, col, row);
-}
-/** Process a character from the client (TTY emulation). */
-static void write_char(console_t *cons, wchar_t ch)
-{
-    bool flush_cursor = false;
-    switch (ch) {
+    switch (key) {
     case '\n':
-        fb_pending_flush();
-        flush_cursor = true;
-        cons->scr.position_y++;
-        cons->scr.position_x = 0;
+        scr->position_y++;
+        scr->position_x = 0;
         break;
     case '\r':
         break;
     case '\t':
-        cons->scr.position_x += 8;
-        cons->scr.position_x -= cons->scr.position_x % 8;
+        scr->position_x += 8;
+        scr->position_x -= scr->position_x % 8;
         break;
     case '\b':
-        if (cons->scr.position_x == 0)
+        if (scr->position_x == 0)
             break;
-        cons->scr.position_x--;
-        if (cons == active_console)
-            cell_mark_changed(cons->scr.position_x, cons->scr.position_y);
-        screenbuffer_putchar(&cons->scr, ' ');
+        scr->position_x--;
+        if (console == active_console)
+            prtchr(' ', scr->position_y, scr->position_x);
+        screenbuffer_putchar(scr, ' ');
         break;
-    default:
-        if (cons == active_console)
-            cell_mark_changed(cons->scr.position_x, cons->scr.position_y);
-        screenbuffer_putchar(&cons->scr, ch);
-        cons->scr.position_x++;
+    default:
+        if (console == active_console)
+            prtchr(key, scr->position_y, scr->position_x);
+        screenbuffer_putchar(scr, key);
+        scr->position_x++;
     }
-    if (cons->scr.position_x >= cons->scr.size_x) {
-        flush_cursor = true;
-        cons->scr.position_y++;
-    }
+    scr->position_y += (scr->position_x >= scr->size_x);
-    if (cons->scr.position_y >= cons->scr.size_y) {
-        fb_pending_flush();
-        cons->scr.position_y = cons->scr.size_y - 1;
-        screenbuffer_clear_line(&cons->scr, cons->scr.top_line);
-        cons->scr.top_line = (cons->scr.top_line + 1) % cons->scr.size_y;
-        if (cons == active_console)
+    if (scr->position_y >= scr->size_y) {
+        scr->position_y = scr->size_y - 1;
+        screenbuffer_clear_line(scr, scr->top_line);
+        scr->top_line = (scr->top_line + 1) % scr->size_y;
+        if (console == active_console)
             async_msg_1(fb_info.phone, FB_SCROLL, 1);
     }
+    scr->position_x = scr->position_x % scr->size_x;
+    if (console == active_console)
+        curs_goto(scr->position_y, scr->position_x);
+}
-    if (cons == active_console && flush_cursor)
-        curs_goto(cons->scr.position_x, cons->scr.position_y);
-    cons->scr.position_x = cons->scr.position_x % cons->scr.size_x;
+/** Save current screen to pixmap, draw old pixmap
+ *
+ * @param oldpixmap Old pixmap
+ * @return ID of pixmap of current screen
+ */
+static int switch_screens(int oldpixmap)
+{
+    int newpmap;
+    /* Save screen */
+    newpmap = async_req_0_0(fb_info.phone, FB_VP2PIXMAP);
+    if (newpmap < 0)
+        return -1;
+    if (oldpixmap != -1) {
+        /* Show old screen */
+        async_msg_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
+        /* Drop old pixmap */
+        async_msg_1(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
+    }
+    return newpmap;
 }
 /** Switch to new console */
-static void change_console(console_t *cons)
+static void change_console(int newcons)
 {
-    if (cons == active_console)
+    connection_t *conn;
+    static int console_pixmap = -1;
+    int i, j, rc;
+    keyfield_t *field;
+    style_t *style;
+    if (newcons == active_console)
         return;
-    fb_pending_flush();
-    if (cons == kernel_console) {
+    if (newcons == KERNEL_CONSOLE) {
+        if (active_console == KERNEL_CONSOLE)
+            return;
+        active_console = KERNEL_CONSOLE;
+        curs_visibility(0);
         async_serialize_start();
-        curs_hide_sync();
-        gcons_in_kernel();
-        screen_yield();
-        kbd_yield();
+        if (kernel_pixmap == -1) {
+            /* store/restore unsupported */
+            set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
+            clrscr();
+        } else {
+            gcons_in_kernel();
+            console_pixmap = switch_screens(kernel_pixmap);
+            kernel_pixmap = -1;
+        }
         async_serialize_end();
-        if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
-            prev_console = active_console;
-            active_console = kernel_console;
-        } else
-            cons = active_console;
+        __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+        return;
+    }
+    async_serialize_start();
+    if (console_pixmap != -1) {
+        kernel_pixmap = switch_screens(console_pixmap);
+        console_pixmap = -1;
     }
+    active_console = newcons;
+    gcons_change_console(newcons);
+    conn = &connections[active_console];
+    set_style(&conn->screenbuffer.style);
+    curs_visibility(0);
+    if (interbuffer) {
+        for (i = 0; i < conn->screenbuffer.size_x; i++)
+            for (j = 0; j < conn->screenbuffer.size_y; j++) {
+                unsigned int size_x;
+                size_x = conn->screenbuffer.size_x;
+                interbuffer[i + j * size_x] =
+                    *get_field_at(&conn->screenbuffer, i, j);
+            }
+        /* This call can preempt, but we are already at the end */
+        rc = async_req_0_0(fb_info.phone, FB_DRAW_TEXT_DATA);
+    }
-    if (cons != kernel_console) {
-        size_t x;
-        size_t y;
-        int rc = 0;
-        async_serialize_start();
-        if (active_console == kernel_console) {
-            screen_reclaim();
-            kbd_reclaim();
-            gcons_redraw_console();
-        }
-        active_console = cons;
-        gcons_change_console(cons->index);
-        set_attrs(&cons->scr.attrs);
-        curs_visibility(false);
-        if (interbuffer) {
-            for (y = 0; y < cons->scr.size_y; y++) {
-                for (x = 0; x < cons->scr.size_x; x++) {
-                    interbuffer[y * cons->scr.size_x + x] =
-                        *get_field_at(&cons->scr, x, y);
-                }
+    if ((!interbuffer) || (rc != 0)) {
+        set_style(&conn->screenbuffer.style);
+        clrscr();
+        style = &conn->screenbuffer.style;
+        for (j = 0; j < conn->screenbuffer.size_y; j++)
+            for (i = 0; i < conn->screenbuffer.size_x; i++) {
+                field = get_field_at(&conn->screenbuffer, i, j);
+                if (!style_same(*style, field->style))
+                    set_style(&field->style);
+                style = &field->style;
+                if ((field->character == ' ') &&
+                    (style_same(field->style,
+                    conn->screenbuffer.style)))
+                    continue;
+                prtchr(field->character, j, i);
             }
-            /* This call can preempt, but we are already at the end */
-            rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
-, 0, cons->scr.size_x,
-                cons->scr.size_y);
-        }
-        if ((!interbuffer) || (rc != 0)) {
-            set_attrs(&cons->scr.attrs);
-            screen_clear();
-            for (y = 0; y < cons->scr.size_y; y++)
-                for (x = 0; x < cons->scr.size_x; x++) {
-                    keyfield_t *field = get_field_at(&cons->scr, x, y);
-                    if (!attrs_same(cons->scr.attrs, field->attrs))
-                        set_attrs(&field->attrs);
-                    cons->scr.attrs = field->attrs;
-                    if ((field->character == ' ') &&
-                        (attrs_same(field->attrs, cons->scr.attrs)))
-                        continue;
-                    fb_putchar(field->character, x, y);
-                }
-        }
-        curs_goto(cons->scr.position_x, cons->scr.position_y);
-        curs_visibility(cons->scr.is_cursor_visible);
-        async_serialize_end();
     }
+    curs_goto(conn->screenbuffer.position_y,
+        conn->screenbuffer.position_x);
+    curs_visibility(conn->screenbuffer.is_cursor_visible);
+    async_serialize_end();
 }
 /** Handler for keyboard */
 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall)
 {
-    /* Ignore parameters, the connection is already opened */
-    while (true) {
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        int retval;
-        console_event_t ev;
+    ipc_callid_t callid;
+    ipc_call_t call;
+    int retval;
+    int c;
+    connection_t *conn;
+    int newcon;
+    /* Ignore parameters, the connection is alread opened */
+    while (1) {
+        callid = async_get_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             /* TODO: Handle hangup */
             return;
-        case KBD_EVENT:
-            /* Got event from keyboard driver. */
+        case KBD_MS_LEFT:
+            newcon = gcons_mouse_btn(IPC_GET_ARG1(call));
+            if (newcon != -1)
+                change_console(newcon);
             retval = 0;
-            ev.type = IPC_GET_ARG1(call);
-            ev.key = IPC_GET_ARG2(call);
-            ev.mods = IPC_GET_ARG3(call);
-            ev.c = IPC_GET_ARG4(call);
+            break;
+        case KBD_MS_MOVE:
+            gcons_mouse_move(IPC_GET_ARG1(call),
+                IPC_GET_ARG2(call));
+            retval = 0;
+            break;
+        case KBD_PUSHCHAR:
+            /* got key from keyboard driver */
-            if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
-                CONSOLE_COUNT) && ((ev.mods & KM_CTRL) == 0)) {
-                if (ev.key == KC_F1 + KERNEL_CONSOLE)
-                    change_console(kernel_console);
+            retval = 0;
+            c = IPC_GET_ARG1(call);
+            /* switch to another virtual console */
+            conn = &connections[active_console];
+/*
+ *          if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
+ *              CONSOLE_COUNT)) {
+ */
+            if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
+                if (c == 0x112)
+                    change_console(KERNEL_CONSOLE);
                 else
-                    change_console(&consoles[ev.key - KC_F1]);
+                    change_console(c - 0x101);
                 break;
             }
-            fibril_mutex_lock(&input_mutex);
-            keybuffer_push(&active_console->keybuffer, &ev);
-            fibril_condvar_broadcast(&input_cv);
-            fibril_mutex_unlock(&input_mutex);
+            /* if client is awaiting key, send it */
+            if (conn->keyrequest_counter > 0) {
+                conn->keyrequest_counter--;
+                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
+                    c);
+                break;
+            }
+            keybuffer_push(&conn->keybuffer, c);
+            retval = 0;
             break;
         default:
             retval = ENOENT;
 ,361 → 363,201
     }
 }
-static void cons_write(console_t *cons, ipc_callid_t rid, ipc_call_t *request)
-{
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *buf = (char *) malloc(size);
-    if (buf == NULL) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    (void) ipc_data_write_finalize(callid, buf, size);
-    async_serialize_start();
-    size_t off = 0;
-    while (off < size) {
-        wchar_t ch = str_decode(buf, &off, size);
-        write_char(cons, ch);
-    }
-    async_serialize_end();
-    gcons_notify_char(cons->index);
-    ipc_answer_1(rid, EOK, size);
-    free(buf);
-}
-static void cons_read(console_t *cons, ipc_callid_t rid, ipc_call_t *request)
-{
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_read_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    char *buf = (char *) malloc(size);
-    if (buf == NULL) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    size_t pos = 0;
-    console_event_t ev;
-    fibril_mutex_lock(&input_mutex);
-recheck:
-    while ((keybuffer_pop(&cons->keybuffer, &ev)) && (pos < size)) {
-        if (ev.type == KEY_PRESS) {
-            buf[pos] = ev.c;
-            pos++;
-        }
-    }
-    if (pos == size) {
-        (void) ipc_data_read_finalize(callid, buf, size);
-        ipc_answer_1(rid, EOK, size);
-        free(buf);
-    } else {
-        fibril_condvar_wait(&input_cv, &input_mutex);
-        goto recheck;
-    }
-    fibril_mutex_unlock(&input_mutex);
-}
-static void cons_get_event(console_t *cons, ipc_callid_t rid, ipc_call_t *request)
-{
-    console_event_t ev;
-    fibril_mutex_lock(&input_mutex);
-recheck:
-    if (keybuffer_pop(&cons->keybuffer, &ev)) {
-        ipc_answer_4(rid, EOK, ev.type, ev.key, ev.mods, ev.c);
-    } else {
-        fibril_condvar_wait(&input_cv, &input_mutex);
-        goto recheck;
-    }
-    fibril_mutex_unlock(&input_mutex);
-}
 /** Default thread for new connections */
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    console_t *cons = NULL;
-    size_t i;
-    for (i = 0; i < CONSOLE_COUNT; i++) {
-        if (i == KERNEL_CONSOLE)
-            continue;
-        if (consoles[i].dev_handle == (dev_handle_t) IPC_GET_ARG1(*icall)) {
-            cons = &consoles[i];
-            break;
-        }
-    }
-    if (cons == NULL) {
-        ipc_answer_0(iid, ENOENT);
-        return;
-    }
     ipc_callid_t callid;
     ipc_call_t call;
-    ipcarg_t arg1;
-    ipcarg_t arg2;
-    ipcarg_t arg3;
+    int consnum;
+    ipcarg_t arg1, arg2;
+    connection_t *conn;
-    int cons_ccap;
-    int rc;
+    if ((consnum = find_free_connection()) == -1) {
+        ipc_answer_0(iid, ELIMIT);
+        return;
+    }
+    conn = &connections[consnum];
+    conn->used = 1;
     async_serialize_start();
-    if (cons->refcount == 0)
-        gcons_notify_connect(cons->index);
+    gcons_notify_connect(consnum);
+    conn->client_phone = IPC_GET_ARG5(*icall);
+    screenbuffer_clear(&conn->screenbuffer);
-    cons->refcount++;
     /* Accept the connection */
     ipc_answer_0(iid, EOK);
-    while (true) {
+    while (1) {
         async_serialize_end();
         callid = async_get_call(&call);
         async_serialize_start();
         arg1 = 0;
         arg2 = 0;
-        arg3 = 0;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
-            cons->refcount--;
-            if (cons->refcount == 0)
-                gcons_notify_disconnect(cons->index);
+            gcons_notify_disconnect(consnum);
+            /* Answer all pending requests */
+            while (conn->keyrequest_counter > 0) {
+                conn->keyrequest_counter--;
+                ipc_answer_0(fifo_pop(conn->keyrequests),
+                    ENOENT);
+                break;
+            }
+            conn->used = 0;
             return;
-        case VFS_OUT_READ:
-            async_serialize_end();
-            cons_read(cons, callid, &call);
-            async_serialize_start();
-            continue;
-        case VFS_OUT_WRITE:
-            async_serialize_end();
-            cons_write(cons, callid, &call);
-            async_serialize_start();
-            continue;
-        case VFS_OUT_SYNC:
-            fb_pending_flush();
-            if (cons == active_console) {
-                async_req_0_0(fb_info.phone, FB_FLUSH);
-                curs_goto(cons->scr.position_x, cons->scr.position_y);
-            }
+        case CONSOLE_PUTCHAR:
+            write_char(consnum, IPC_GET_ARG1(call));
+            gcons_notify_char(consnum);
             break;
         case CONSOLE_CLEAR:
             /* Send message to fb */
-            if (cons == active_console)
-                async_msg_0(fb_info.phone, FB_CLEAR);
+            if (consnum == active_console) {
+                async_msg_0(fb_info.phone, FB_CLEAR);
+            }
-            screenbuffer_clear(&cons->scr);
+            screenbuffer_clear(&conn->screenbuffer);
             break;
         case CONSOLE_GOTO:
-            screenbuffer_goto(&cons->scr,
-                IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-            if (cons == active_console)
+            screenbuffer_goto(&conn->screenbuffer,
+                IPC_GET_ARG2(call), IPC_GET_ARG1(call));
+            if (consnum == active_console)
                 curs_goto(IPC_GET_ARG1(call),
                     IPC_GET_ARG2(call));
             break;
-        case CONSOLE_GET_SIZE:
-            arg1 = fb_info.cols;
-            arg2 = fb_info.rows;
+        case CONSOLE_GETSIZE:
+            arg1 = fb_info.rows;
+            arg2 = fb_info.cols;
             break;
-        case CONSOLE_GET_COLOR_CAP:
-            rc = ccap_fb_to_con(fb_info.color_cap, &cons_ccap);
-            if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                continue;
-            }
-            arg1 = cons_ccap;
+        case CONSOLE_FLUSH:
+            if (consnum == active_console)
+                async_req_0_0(fb_info.phone, FB_FLUSH);
             break;
         case CONSOLE_SET_STYLE:
-            fb_pending_flush();
             arg1 = IPC_GET_ARG1(call);
-            screenbuffer_set_style(&cons->scr, arg1);
-            if (cons == active_console)
-                set_style(arg1);
-            break;
-        case CONSOLE_SET_COLOR:
-            fb_pending_flush();
-            arg1 = IPC_GET_ARG1(call);
             arg2 = IPC_GET_ARG2(call);
-            arg3 = IPC_GET_ARG3(call);
-            screenbuffer_set_color(&cons->scr, arg1, arg2, arg3);
-            if (cons == active_console)
-                set_color(arg1, arg2, arg3);
+            screenbuffer_set_style(&conn->screenbuffer, arg1,
+                arg2);
+            if (consnum == active_console)
+                set_style_col(arg1, arg2);
             break;
-        case CONSOLE_SET_RGB_COLOR:
-            fb_pending_flush();
-            arg1 = IPC_GET_ARG1(call);
-            arg2 = IPC_GET_ARG2(call);
-            screenbuffer_set_rgb_color(&cons->scr, arg1, arg2);
-            if (cons == active_console)
-                set_rgb_color(arg1, arg2);
-            break;
         case CONSOLE_CURSOR_VISIBILITY:
-            fb_pending_flush();
             arg1 = IPC_GET_ARG1(call);
-            cons->scr.is_cursor_visible = arg1;
-            if (cons == active_console)
+            conn->screenbuffer.is_cursor_visible = arg1;
+            if (consnum == active_console)
                 curs_visibility(arg1);
             break;
-        case CONSOLE_GET_EVENT:
-            async_serialize_end();
-            cons_get_event(cons, callid, &call);
-            async_serialize_start();
-            continue;
-        case CONSOLE_KCON_ENABLE:
-            change_console(kernel_console);
+        case CONSOLE_GETCHAR:
+            if (keybuffer_empty(&conn->keybuffer)) {
+                /* buffer is empty -> store request */
+                if (conn->keyrequest_counter <
+                    MAX_KEYREQUESTS_BUFFERED) {
+                    fifo_push(conn->keyrequests, callid);
+                    conn->keyrequest_counter++;
+                } else {
+                    /*
+                     * No key available and too many
+                     * requests => fail.
+                    */
+                    ipc_answer_0(callid, ELIMIT);
+                }
+                continue;
+            }
+            keybuffer_pop(&conn->keybuffer, (int *) &arg1);
             break;
         }
-        ipc_answer_3(callid, EOK, arg1, arg2, arg3);
+        ipc_answer_2(callid, EOK, arg1, arg2);
     }
 }
-static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+int main(int argc, char *argv[])
 {
-    change_console(prev_console);
-}
+    ipcarg_t phonehash;
+    int kbd_phone;
+    int i;
-static bool console_init(void)
-{
-    ipcarg_t color_cap;
+    async_set_client_connection(client_connection);
+    /* Connect to keyboard driver */
-    /* Connect to keyboard driver */
-    kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-    if (kbd_phone < 0) {
-        printf(NAME ": Failed to connect to keyboard service\n");
-        return false;
+    kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+    while (kbd_phone < 0) {
+        usleep(10000);
+        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
     }
-    ipcarg_t phonehash;
-    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
-        printf(NAME ": Failed to create callback from keyboard service\n");
-        return false;
-    }
+    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
+        return -1;
+    async_new_connection(phonehash, 0, NULL, keyboard_events);
-    async_new_connection(phonehash, 0, NULL, keyboard_events);
     /* Connect to framebuffer driver */
-    fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
-    if (fb_info.phone < 0) {
-        printf(NAME ": Failed to connect to video service\n");
-        return -1;
-    }
-    /* Register driver */
-    int rc = devmap_driver_register(NAME, client_connection);
-    if (rc < 0) {
-        printf(NAME ": Unable to register driver (%d)\n", rc);
-        return false;
+    fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+    while (fb_info.phone < 0) {
+        usleep(10000);
+        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
     }
+    /* Save old kernel screen */
+    kernel_pixmap = switch_screens(-1);
     /* Initialize gcons */
     gcons_init(fb_info.phone);
-    /* Synchronize, the gcons could put something in queue */
+    /* Synchronize, the gcons can have something in queue */
     async_req_0_0(fb_info.phone, FB_FLUSH);
-    async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows);
-    async_req_0_1(fb_info.phone, FB_GET_COLOR_CAP, &color_cap);
-    fb_info.color_cap = color_cap;
+    /* Enable double buffering */
+    async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t) -1, 1);
-    /* Set up shared memory buffer. */
-    size_t ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows;
-    interbuffer = as_get_mappable_page(ib_size);
+    async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.rows,
+        &fb_info.cols);
+    set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
+    clrscr();
-    if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
-        AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer)
-        interbuffer = NULL;
+    /* Init virtual consoles */
+    for (i = 0; i < CONSOLE_COUNT; i++) {
+        connections[i].used = 0;
+        keybuffer_init(&connections[i].keybuffer);
+        connections[i].keyrequests.head = 0;
+        connections[i].keyrequests.tail = 0;
+        connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED;
+        connections[i].keyrequest_counter = 0;
+        if (screenbuffer_init(&connections[i].screenbuffer,
+            fb_info.cols, fb_info.rows) == NULL) {
+            /* FIXME: handle error */
+            return -1;
+        }
+    }
+    connections[KERNEL_CONSOLE].used = 1;
-    if (interbuffer) {
+    interbuffer = mmap(NULL,
+        sizeof(keyfield_t) * fb_info.cols * fb_info.rows,
+        PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+    if (!interbuffer) {
         if (ipc_share_out_start(fb_info.phone, interbuffer,
             AS_AREA_READ) != EOK) {
-            as_area_destroy(interbuffer);
+            munmap(interbuffer,
+                sizeof(keyfield_t) * fb_info.cols * fb_info.rows);
             interbuffer = NULL;
         }
     }
-    fb_pending.cnt = 0;
-    /* Inititalize consoles */
-    size_t i;
-    for (i = 0; i < CONSOLE_COUNT; i++) {
-        if (i != KERNEL_CONSOLE) {
-            if (screenbuffer_init(&consoles[i].scr,
-                fb_info.cols, fb_info.rows) == NULL) {
-                printf(NAME ": Unable to allocate screen buffer %u\n", i);
-                return false;
-            }
-            screenbuffer_clear(&consoles[i].scr);
-            keybuffer_init(&consoles[i].keybuffer);
-            consoles[i].index = i;
-            consoles[i].refcount = 0;
-            char vc[MAX_DEVICE_NAME];
-            snprintf(vc, MAX_DEVICE_NAME, "vc%u", i);
-            if (devmap_device_register(vc, &consoles[i].dev_handle) != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s\n", vc);
-                return false;
-            }
-        }
-    }
-    /* Disable kernel output to the console */
-    __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
-    /* Initialize the screen */
-    async_serialize_start();
-    gcons_redraw_console();
-    set_rgb_color(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-    screen_clear();
     curs_goto(0, 0);
-    curs_visibility(active_console->scr.is_cursor_visible);
-    async_serialize_end();
-    /* Receive kernel notifications */
-    if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
-        printf(NAME ": Error registering kconsole notifications\n");
-    async_set_interrupt_received(interrupt_received);
-    return true;
-}
+    curs_visibility(
+        connections[active_console].screenbuffer.is_cursor_visible);
-int main(int argc, char *argv[])
-{
-    printf(NAME ": HelenOS Console service\n");
-    if (!console_init())
+    /* Register at NS */
+    if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
         return -1;
+    }
-    printf(NAME ": Accepting connections\n");
     async_manager();
-    return 0;
+    return 0;
 }
 /** @}
  */

 /trunk/uspace/srv/console/gcons.c
 ,7 → 27,7
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
 ,25 → 39,23
 #include <sys/mman.h>
 #include <string.h>
 #include <align.h>
-#include <bool.h>
 #include "console.h"
 #include "gcons.h"
-#define CONSOLE_TOP     66
-#define CONSOLE_MARGIN  6
+#define CONSOLE_TOP      66
+#define CONSOLE_MARGIN   6
-#define STATUS_START   110
-#define STATUS_TOP     8
-#define STATUS_SPACE   4
-#define STATUS_WIDTH   48
-#define STATUS_HEIGHT  48
+#define STATUS_START    110
+#define STATUS_TOP      8
+#define STATUS_SPACE    4
+#define STATUS_WIDTH    48
+#define STATUS_HEIGHT   48
-#define MAIN_COLOR  0xffffff
+#define MAIN_COLOR      0xffffff
-static bool use_gcons = false;
-static ipcarg_t xres;
-static ipcarg_t yres;
+static int use_gcons = 0;
+static ipcarg_t xres,yres;
 enum butstate {
     CONS_DISCONNECTED = 0,
 ,22 → 77,16
 static int ic_pixmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1};
 static int animation = -1;
-static size_t active_console = 0;
+static int active_console = 0;
-size_t mouse_x;
-size_t mouse_y;
-bool btn_pressed;
-size_t btn_x;
-size_t btn_y;
 static void vp_switch(int vp)
 {
-    async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp);
+    async_msg_1(fbphone,FB_VIEWPORT_SWITCH, vp);
 }
 /** Create view port */
-static int vp_create(size_t x, size_t y, size_t width, size_t height)
+static int vp_create(unsigned int x, unsigned int y, unsigned int width,
+    unsigned int height)
 {
     return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
         (width << 16) | height);
 ,52 → 97,48
     async_msg_0(fbphone, FB_CLEAR);
 }
-static void set_rgb_color(uint32_t fgcolor, uint32_t bgcolor)
+static void set_style(int fgcolor, int bgcolor)
 {
-    async_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
+    async_msg_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
 }
 /** Transparent putchar */
-static void tran_putch(wchar_t ch, size_t col, size_t row)
+static void tran_putch(char c, int row, int col)
 {
-    async_msg_3(fbphone, FB_PUTCHAR, ch, col, row);
+    async_msg_3(fbphone, FB_TRANS_PUTCHAR, c, row, col);
 }
 /** Redraw the button showing state of a given console */
-static void redraw_state(size_t index)
+static void redraw_state(int consnum)
 {
-    vp_switch(cstatus_vp[index]);
-    enum butstate state = console_state[index];
+    char data[5];
+    int i;
+    enum butstate state = console_state[consnum];
+    vp_switch(cstatus_vp[consnum]);
     if (ic_pixmaps[state] != -1)
-        async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index],
+        async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum],
             ic_pixmaps[state]);
-    if ((state != CONS_DISCONNECTED) && (state != CONS_KERNEL)
-        && (state != CONS_DISCONNECTED_SEL)) {
-        char data[5];
-        snprintf(data, 5, "%u", index + 1);
-        size_t i;
-        for (i = 0; data[i] != 0; i++)
-            tran_putch(data[i], 2 + i, 1);
-    }
+    if (state != CONS_DISCONNECTED && state != CONS_KERNEL &&
+        state != CONS_DISCONNECTED_SEL) {
+        snprintf(data, 5, "%d", consnum + 1);
+        for (i = 0; data[i]; i++)
+            tran_putch(data[i], 1, 2 + i);
+    }
 }
 /** Notification run on changing console (except kernel console) */
-void gcons_change_console(size_t index)
+void gcons_change_console(int consnum)
 {
+    int i;
     if (!use_gcons)
         return;
     if (active_console == KERNEL_CONSOLE) {
-        size_t i;
         for (i = 0; i < CONSOLE_COUNT; i++)
             redraw_state(i);
         if (animation != -1)
             async_msg_1(fbphone, FB_ANIM_START, animation);
     } else {
 ,74 → 146,71
             console_state[active_console] = CONS_DISCONNECTED;
         else
             console_state[active_console] = CONS_IDLE;
         redraw_state(active_console);
     }
-    active_console = index;
-    if ((console_state[index] == CONS_DISCONNECTED)
-        || (console_state[index] == CONS_DISCONNECTED_SEL))
-        console_state[index] = CONS_DISCONNECTED_SEL;
-    else
-        console_state[index] = CONS_SELECTED;
-    redraw_state(index);
+    active_console = consnum;
+    if (console_state[consnum] == CONS_DISCONNECTED) {
+        console_state[consnum] = CONS_DISCONNECTED_SEL;
+        redraw_state(consnum);
+    } else
+        console_state[consnum] = CONS_SELECTED;
+    redraw_state(consnum);
     vp_switch(console_vp);
 }
 /** Notification function that gets called on new output to virtual console */
-void gcons_notify_char(size_t index)
+void gcons_notify_char(int consnum)
 {
     if (!use_gcons)
         return;
-    if ((index == active_console)
-        || (console_state[index] == CONS_HAS_DATA))
+    if (consnum == active_console ||
+        console_state[consnum] == CONS_HAS_DATA)
         return;
-    console_state[index] = CONS_HAS_DATA;
+    console_state[consnum] = CONS_HAS_DATA;
     if (active_console == KERNEL_CONSOLE)
         return;
+    redraw_state(consnum);
-    redraw_state(index);
     vp_switch(console_vp);
 }
 /** Notification function called on service disconnect from console */
-void gcons_notify_disconnect(size_t index)
+void gcons_notify_disconnect(int consnum)
 {
     if (!use_gcons)
         return;
-    if (index == active_console)
-        console_state[index] = CONS_DISCONNECTED_SEL;
+    if (active_console == consnum)
+        console_state[consnum] = CONS_DISCONNECTED_SEL;
     else
-        console_state[index] = CONS_DISCONNECTED;
+        console_state[consnum] = CONS_DISCONNECTED;
     if (active_console == KERNEL_CONSOLE)
         return;
-    redraw_state(index);
+    redraw_state(consnum);
     vp_switch(console_vp);
 }
 /** Notification function called on console connect */
-void gcons_notify_connect(size_t index)
+void gcons_notify_connect(int consnum)
 {
     if (!use_gcons)
         return;
-    if (index == active_console)
-        console_state[index] = CONS_SELECTED;
+    if (active_console == consnum)
+        console_state[consnum] = CONS_SELECTED;
     else
-        console_state[index] = CONS_IDLE;
+        console_state[consnum] = CONS_IDLE;
     if (active_console == KERNEL_CONSOLE)
         return;
-    redraw_state(index);
+    redraw_state(consnum);
     vp_switch(console_vp);
 }
 ,43 → 217,50
 /** Change to kernel console */
 void gcons_in_kernel(void)
 {
+    if (console_state[active_console] == CONS_DISCONNECTED_SEL)
+        console_state[active_console] = CONS_DISCONNECTED;
+    else
+        console_state[active_console] = CONS_IDLE;
+    redraw_state(active_console);
     if (animation != -1)
         async_msg_1(fbphone, FB_ANIM_STOP, animation);
-    active_console = KERNEL_CONSOLE;
+    active_console = KERNEL_CONSOLE; /* Set to kernel console */
     vp_switch(0);
 }
-/** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
-static inline int limit(size_t a, size_t left, size_t right)
+/** Return x, where left <= x <= right && |a-x|==min(|a-x|) is smallest */
+static inline int limit(int a,int left, int right)
 {
     if (a < left)
         a = left;
     if (a >= right)
         a = right - 1;
     return a;
 }
+int mouse_x, mouse_y;
+int btn_pressed, btn_x, btn_y;
 /** Handle mouse move
  *
  * @param dx Delta X of mouse move
  * @param dy Delta Y of mouse move
  */
-void gcons_mouse_move(ssize_t dx, ssize_t dy)
+void gcons_mouse_move(int dx, int dy)
 {
-    mouse_x = limit(mouse_x + dx, 0, xres);
-    mouse_y = limit(mouse_y + dy, 0, yres);
+    mouse_x = limit(mouse_x+dx, 0, xres);
+    mouse_y = limit(mouse_y+dy, 0, yres);
     async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
 static int gcons_find_conbut(int x, int y)
 {
-    int status_start = STATUS_START + (xres - 800) / 2;
-    if ((y < STATUS_TOP) || (y >= STATUS_TOP + STATUS_HEIGHT))
+    int status_start = STATUS_START + (xres - 800) / 2;;
+    if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT)
         return -1;
     if (x < status_start)
 ,39 → 268,36
     if (x >= status_start + (STATUS_WIDTH + STATUS_SPACE) * CONSOLE_COUNT)
         return -1;
-    if (((x - status_start) % (STATUS_WIDTH + STATUS_SPACE)) < STATUS_SPACE)
+    if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) < STATUS_SPACE)
         return -1;
-    return (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
+    return (x - status_start) / (STATUS_WIDTH+STATUS_SPACE);
 }
 /** Handle mouse click
  *
- * @param state New state (true - pressed, false - depressed)
+ * @param state New state (1-pressed, 0-depressed)
  */
-int gcons_mouse_btn(bool state)
+int gcons_mouse_btn(int state)
 {
     int conbut;
     if (state) {
         conbut = gcons_find_conbut(mouse_x, mouse_y);
         if (conbut != -1) {
-            btn_pressed = true;
+            btn_pressed = 1;
             btn_x = mouse_x;
             btn_y = mouse_y;
         }
         return -1;
-    }
-    if ((!state) && (!btn_pressed))
+    }
+    if (!state && !btn_pressed)
         return -1;
-    btn_pressed = false;
+    btn_pressed = 0;
     conbut = gcons_find_conbut(mouse_x, mouse_y);
     if (conbut == gcons_find_conbut(btn_x, btn_y))
         return conbut;
     return -1;
 }
 ,60 → 313,53
 {
     char *shm;
     int rc;
     /* Create area */
     shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
         MAP_ANONYMOUS, 0, 0);
     if (shm == MAP_FAILED)
         return;
     memcpy(shm, logo, size);
     /* Send area */
     rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
     if (rc)
         goto exit;
     rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
     if (rc)
         goto drop;
     /* Draw logo */
     async_msg_2(fbphone, FB_DRAW_PPM, x, y);
 drop:
     /* Drop area */
     async_msg_0(fbphone, FB_DROP_SHM);
-exit:
+exit:
     /* Remove area */
     munmap(shm, size);
 }
-extern char _binary_gfx_helenos_ppm_start[0];
-extern int _binary_gfx_helenos_ppm_size;
-extern char _binary_gfx_nameic_ppm_start[0];
-extern int _binary_gfx_nameic_ppm_size;
-/** Redraws console graphics */
-void gcons_redraw_console(void)
+extern char _binary_helenos_ppm_start[0];
+extern int _binary_helenos_ppm_size;
+extern char _binary_nameic_ppm_start[0];
+extern int _binary_nameic_ppm_size;
+/** Redraws console graphics  */
+static void gcons_redraw_console(void)
 {
     int i;
     if (!use_gcons)
         return;
     vp_switch(0);
-    set_rgb_color(MAIN_COLOR, MAIN_COLOR);
+    set_style(MAIN_COLOR, MAIN_COLOR);
     clear();
-    draw_pixmap(_binary_gfx_helenos_ppm_start,
-        (size_t) &_binary_gfx_helenos_ppm_size, xres - 66, 2);
-    draw_pixmap(_binary_gfx_nameic_ppm_start,
-        (size_t) &_binary_gfx_nameic_ppm_size, 5, 17);
+    draw_pixmap(_binary_helenos_ppm_start,
+        (size_t) &_binary_helenos_ppm_size, xres - 66, 2);
+    draw_pixmap(_binary_nameic_ppm_start,
+        (size_t) &_binary_nameic_ppm_size, 5, 17);
     for (i = 0; i < CONSOLE_COUNT; i++)
         redraw_state(i);
     vp_switch(console_vp);
 }
 ,159 → 367,152
  *
  * @param data PPM data
  * @param size PPM data size
- *
  * @return Pixmap identification
- *
  */
-static int make_pixmap(char *data, size_t size)
+static int make_pixmap(char *data, int size)
 {
     char *shm;
     int rc;
     int pxid = -1;
     /* Create area */
     shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
         MAP_ANONYMOUS, 0, 0);
     if (shm == MAP_FAILED)
         return -1;
     memcpy(shm, data, size);
     /* Send area */
     rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
     if (rc)
         goto exit;
     rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
     if (rc)
         goto drop;
     /* Obtain pixmap */
     rc = async_req_0_0(fbphone, FB_SHM2PIXMAP);
     if (rc < 0)
         goto drop;
     pxid = rc;
 drop:
     /* Drop area */
     async_msg_0(fbphone, FB_DROP_SHM);
-exit:
+exit:
     /* Remove area */
     munmap(shm, size);
     return pxid;
 }
-extern char _binary_gfx_anim_1_ppm_start[0];
-extern int _binary_gfx_anim_1_ppm_size;
-extern char _binary_gfx_anim_2_ppm_start[0];
-extern int _binary_gfx_anim_2_ppm_size;
-extern char _binary_gfx_anim_3_ppm_start[0];
-extern int _binary_gfx_anim_3_ppm_size;
-extern char _binary_gfx_anim_4_ppm_start[0];
-extern int _binary_gfx_anim_4_ppm_size;
+extern char _binary_anim_1_ppm_start[0];
+extern int _binary_anim_1_ppm_size;
+extern char _binary_anim_2_ppm_start[0];
+extern int _binary_anim_2_ppm_size;
+extern char _binary_anim_3_ppm_start[0];
+extern int _binary_anim_3_ppm_size;
+extern char _binary_anim_4_ppm_start[0];
+extern int _binary_anim_4_ppm_size;
 static void make_anim(void)
 {
-    int an = async_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]);
+    int an;
+    int pm;
+    an = async_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]);
     if (an < 0)
         return;
-    int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
-        (int) &_binary_gfx_anim_1_ppm_size);
+    pm = make_pixmap(_binary_anim_1_ppm_start,
+        (int) &_binary_anim_1_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-    pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
-        (int) &_binary_gfx_anim_2_ppm_size);
+    pm = make_pixmap(_binary_anim_2_ppm_start,
+        (int) &_binary_anim_2_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-    pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
-        (int) &_binary_gfx_anim_3_ppm_size);
+    pm = make_pixmap(_binary_anim_3_ppm_start,
+        (int) &_binary_anim_3_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-    pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
-        (int) &_binary_gfx_anim_4_ppm_size);
+    pm = make_pixmap(_binary_anim_4_ppm_start,
+        (int) &_binary_anim_4_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
     async_msg_1(fbphone, FB_ANIM_START, an);
     animation = an;
 }
-extern char _binary_gfx_cons_selected_ppm_start[0];
-extern int _binary_gfx_cons_selected_ppm_size;
-extern char _binary_gfx_cons_idle_ppm_start[0];
-extern int _binary_gfx_cons_idle_ppm_size;
-extern char _binary_gfx_cons_has_data_ppm_start[0];
-extern int _binary_gfx_cons_has_data_ppm_size;
-extern char _binary_gfx_cons_kernel_ppm_start[0];
-extern int _binary_gfx_cons_kernel_ppm_size;
+extern char _binary_cons_selected_ppm_start[0];
+extern int _binary_cons_selected_ppm_size;
+extern char _binary_cons_idle_ppm_start[0];
+extern int _binary_cons_idle_ppm_size;
+extern char _binary_cons_has_data_ppm_start[0];
+extern int _binary_cons_has_data_ppm_size;
+extern char _binary_cons_kernel_ppm_start[0];
+extern int _binary_cons_kernel_ppm_size;
 /** Initialize nice graphical console environment */
 void gcons_init(int phone)
 {
+    int rc;
+    int i;
+    int status_start = STATUS_START;
     fbphone = phone;
-    int rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
+    rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
     if (rc)
         return;
-    if ((xres < 800) || (yres < 600))
+    if (xres < 800 || yres < 600)
         return;
-    /* Create console viewport */
+    /* create console viewport */
     /* Align width & height to character size */
     console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP,
         ALIGN_DOWN(xres - 2 * CONSOLE_MARGIN, 8),
         ALIGN_DOWN(yres - (CONSOLE_TOP + CONSOLE_MARGIN), 16));
     if (console_vp < 0)
         return;
     /* Create status buttons */
-    size_t status_start = STATUS_START + (xres - 800) / 2;
-    size_t i;
+    status_start += (xres - 800) / 2;
     for (i = 0; i < CONSOLE_COUNT; i++) {
         cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN +
             i * (STATUS_WIDTH + STATUS_SPACE), STATUS_TOP,
             STATUS_WIDTH, STATUS_HEIGHT);
         if (cstatus_vp[i] < 0)
             return;
         vp_switch(cstatus_vp[i]);
-        set_rgb_color(0x202020, 0xffffff);
+        set_style(0x202020, 0xffffff);
     }
     /* Initialize icons */
     ic_pixmaps[CONS_SELECTED] =
-        make_pixmap(_binary_gfx_cons_selected_ppm_start,
-        (size_t) &_binary_gfx_cons_selected_ppm_size);
-    ic_pixmaps[CONS_IDLE] =
-        make_pixmap(_binary_gfx_cons_idle_ppm_start,
-        (size_t) &_binary_gfx_cons_idle_ppm_size);
+        make_pixmap(_binary_cons_selected_ppm_start,
+        (int) &_binary_cons_selected_ppm_size);
+    ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start,
+        (int) &_binary_cons_idle_ppm_size);
     ic_pixmaps[CONS_HAS_DATA] =
-        make_pixmap(_binary_gfx_cons_has_data_ppm_start,
-        (size_t) &_binary_gfx_cons_has_data_ppm_size);
+        make_pixmap(_binary_cons_has_data_ppm_start,
+        (int) &_binary_cons_has_data_ppm_size);
     ic_pixmaps[CONS_DISCONNECTED] =
-        make_pixmap(_binary_gfx_cons_idle_ppm_start,
-        (size_t) &_binary_gfx_cons_idle_ppm_size);
-    ic_pixmaps[CONS_KERNEL] =
-        make_pixmap(_binary_gfx_cons_kernel_ppm_start,
-        (size_t) &_binary_gfx_cons_kernel_ppm_size);
+        make_pixmap(_binary_cons_idle_ppm_start,
+        (int) &_binary_cons_idle_ppm_size);
+    ic_pixmaps[CONS_KERNEL] = make_pixmap(_binary_cons_kernel_ppm_start,
+        (int) &_binary_cons_kernel_ppm_size);
     ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
     make_anim();
-    use_gcons = true;
+    use_gcons = 1;
     console_state[0] = CONS_DISCONNECTED_SEL;
     console_state[KERNEL_CONSOLE] = CONS_KERNEL;
-    vp_switch(console_vp);
+    gcons_redraw_console();
 }
 /** @}
  */

 /trunk/uspace/srv/console/Makefile
 ,9 → 31,8
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
-include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I. -I../kbd/include -I../fb
 LIBS = $(LIBC_PREFIX)/libc.a
 ,50 → 41,40
 #
 OUTPUT = console
 GENERIC_SOURCES = \
     console.c \
     screenbuffer.c \
-    ../kbd/generic/keybuffer.c \
+    ../kbd/generic/key_buffer.c \
     gcons.c
-IMAGES = \
-    gfx/helenos.ppm \
-    gfx/nameic.ppm \
-    gfx/cons_selected.ppm \
-    gfx/cons_idle.ppm \
-    gfx/cons_has_data.ppm \
-    gfx/cons_kernel.ppm \
-    gfx/anim_1.ppm \
-    gfx/anim_2.ppm \
-    gfx/anim_3.ppm \
-    gfx/anim_4.ppm
+IMAGES = helenos.ppm nameic.ppm cons_selected.ppm cons_idle.ppm \
+    cons_has_data.ppm cons_kernel.ppm anim_1.ppm anim_2.ppm anim_3.ppm \
+    anim_4.ppm
+ARCH_SOURCES =
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \
-    $(addsuffix .o,$(basename $(IMAGES)))
+            $(addsuffix .o,$(basename $(IMAGES)))
+ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
-OBJECTS := $(GENERIC_OBJECTS)
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/console/console.h
 ,7 → 27,7
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
 ,10 → 35,20
 #ifndef __CONSOLE_H__
 #define __CONSOLE_H__
-#define CONSOLE_COUNT   12
-#define KERNEL_CONSOLE  11
+#define KERNEL_CONSOLE 11
+#define CONSOLE_COUNT 12
+#define CONSOLE_GETCHAR     1026
+#define CONSOLE_PUTCHAR     1027
+#define CONSOLE_CLEAR       1028
+#define CONSOLE_GOTO        1029
+#define CONSOLE_GETSIZE     1030
+#define CONSOLE_FLUSH       1031
+#define CONSOLE_SET_STYLE   1032
+#define CONSOLE_CURSOR_VISIBILITY   1033
 #endif
 /** @}
  */

 /trunk/uspace/srv/console/screenbuffer.c
 ,55 → 27,48
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
 #include <screenbuffer.h>
-#include <io/style.h>
 #include <malloc.h>
 #include <unistd.h>
-/** Store one character to screenbuffer.
+/** Store one character to screenbuffer. Its position is determined by
+ * scr->position_x and scr->position_y.
  *
- * Its position is determined by scr->position_x
- * and scr->position_y.
- *
- * @param scr Screenbuffer
- * @param c   Stored character
- *
+ * @param scr   screenbuffer
+ * @param c stored character
  */
-void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch)
+void screenbuffer_putchar(screenbuffer_t *scr, char c)
 {
-    keyfield_t *field =
-        get_field_at(scr, scr->position_x, scr->position_y);
+    keyfield_t *field;
-    field->character = ch;
-    field->attrs = scr->attrs;
+    field = get_field_at(scr, scr->position_x, scr->position_y);
+    field->character = c;
+    field->style = scr->style;
 }
-/** Initilize screenbuffer.
- *
- * Allocate space for screen content in accordance to given size.
- *
- * @param scr    Initialized screenbuffer
- * @param size_x Width in characters
- * @param size_y Height in characters
- *
- * @return Pointer to screenbuffer (same as scr parameter) or NULL
- *
+/** Initilize screenbuffer. Allocate space for screen content in accordance to given size.
+ * @param scr       initialized screenbuffer
+ * @param size_x    width in characters
+ * @param size_y    height in characters
+ * @return pointer to screenbuffer (same as scr parameter) or NULL
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y)
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y)
 {
     scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
-    if (!scr->buffer)
+    if (!scr->buffer) {
         return NULL;
+    }
     scr->size_x = size_x;
     scr->size_y = size_y;
-    scr->attrs.t = at_style;
-    scr->attrs.a.s.style = STYLE_NORMAL;
+    scr->style.fg_color = DEFAULT_FOREGROUND;
+    scr->style.bg_color = DEFAULT_BACKGROUND;
     scr->is_cursor_visible = 1;
     screenbuffer_clear(scr);
 ,63 → 76,56
     return scr;
 }
-/** Clear screenbuffer.
- *
- * @param scr Screenbuffer
- *
+/** Clear screenbuffer.
+ * @param scr screenbuffer
  */
 void screenbuffer_clear(screenbuffer_t *scr)
 {
-    size_t i;
+    unsigned int i;
     for (i = 0; i < (scr->size_x * scr->size_y); i++) {
         scr->buffer[i].character = ' ';
-        scr->buffer[i].attrs = scr->attrs;
+        scr->buffer[i].style = scr->style;
     }
     scr->top_line = 0;
+    scr->position_y = 0;
     scr->position_x = 0;
-    scr->position_y = 0;
 }
 /** Clear one buffer line.
- *
  * @param scr
  * @param line One buffer line (not a screen line!)
- *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, size_t line)
+void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line)
 {
-    size_t x;
+    unsigned int i;
-    for (x = 0; x < scr->size_x; x++) {
-        scr->buffer[x + line * scr->size_x].character = ' ';
-        scr->buffer[x + line * scr->size_x].attrs = scr->attrs;
+    for (i = 0; i < scr->size_x; i++) {
+        scr->buffer[i + line * scr->size_x].character = ' ';
+        scr->buffer[i + line * scr->size_x].style = scr->style;
     }
 }
 /** Copy content buffer from screenbuffer to given memory.
- *
- * @param scr  Source screenbuffer
- * @param dest Destination
- *
+ * @param scr   source screenbuffer
+ * @param dest  destination
  */
-void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest)
+void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest)
 {
-    size_t i;
+    unsigned int i;
-    for (i = 0; i < (scr->size_x * scr->size_y); i++)
+    for (i = 0; i < scr->size_x * scr->size_y; i++) {
         dest[i] = scr->buffer[i];
+    }
 }
 /** Set new cursor position in screenbuffer.
- *
  * @param scr
  * @param x
  * @param y
- *
  */
-void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y)
+void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y)
 {
     scr->position_x = x % scr->size_x;
     scr->position_y = y % scr->size_y;
 ,46 → 132,16
 }
 /** Set new style.
- *
  * @param scr
  * @param fg_color
  * @param bg_color
- *
  */
-void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style)
+void screenbuffer_set_style(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
 {
-    scr->attrs.t = at_style;
-    scr->attrs.a.s.style = style;
+    scr->style.fg_color = fg_color;
+    scr->style.bg_color = bg_color;
 }
-/** Set new color.
- *
- * @param scr
- * @param fg_color
- * @param bg_color
- *
- */
-void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color, uint8_t bg_color, uint8_t flags)
-{
-    scr->attrs.t = at_idx;
-    scr->attrs.a.i.fg_color = fg_color;
-    scr->attrs.a.i.bg_color = bg_color;
-    scr->attrs.a.i.flags = flags;
-}
-/** Set new RGB color.
- *
- * @param scr
- * @param fg_color
- * @param bg_color
- *
- */
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color, uint32_t bg_color)
-{
-    scr->attrs.t = at_rgb;
-    scr->attrs.a.r.fg_color = fg_color;
-    scr->attrs.a.r.bg_color = bg_color;
-}
 /** @}
  */

 /trunk/uspace/srv/console/gcons.h
 ,30 → 27,24
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
-#ifndef GCONS_H_
-#define GCONS_H_
+#ifndef _GCONS_H_
+#define _GCONS_H_
-#include <sys/types.h>
 void gcons_init(int phone);
-void gcons_redraw_console(void);
-void gcons_change_console(size_t index);
-void gcons_notify_char(size_t index);
+void gcons_change_console(int consnum);
+void gcons_notify_char(int consnum);
 void gcons_in_kernel(void);
+void gcons_notify_connect(int consnum);
+void gcons_notify_disconnect(int consnum);
+void gcons_mouse_move(int dx, int dy);
+int gcons_mouse_btn(int state);
-void gcons_notify_connect(size_t index);
-void gcons_notify_disconnect(size_t index);
-void gcons_mouse_move(ssize_t dx, ssize_t dy);
-int gcons_mouse_btn(bool state);
 #endif
 /** @}
  */

 /trunk/uspace/srv/console/screenbuffer.h
 ,133 → 27,74
  */
 /** @addtogroup console
- * @{
+ * @{
  */
 /** @file
  */
-#ifndef SCREENBUFFER_H__
-#define SCREENBUFFER_H__
+#ifndef __SCREENBUFFER_H__
+#define __SCREENBUFFER_H__
-#include <stdint.h>
-#include <sys/types.h>
-#include <bool.h>
-#define DEFAULT_FOREGROUND  0x0       /**< default console foreground color */
-#define DEFAULT_BACKGROUND  0xf0f0f0  /**< default console background color */
+#define DEFAULT_FOREGROUND 0x0  /**< default console foreground color */
+#define DEFAULT_BACKGROUND 0xf0f0f0 /**< default console background color */
 typedef struct {
-    uint8_t style;
-} attr_style_t;
+    unsigned int bg_color;      /**< background color */
+    unsigned int fg_color;      /**< foreground color */
+} style_t;
-typedef struct {
-    uint8_t fg_color;
-    uint8_t bg_color;
-    uint8_t flags;
-} attr_idx_t;
-typedef struct {
-    uint32_t bg_color;  /**< background color */
-    uint32_t fg_color;  /**< foreground color */
-} attr_rgb_t;
-typedef struct {
-    enum {
-        at_style,
-        at_idx,
-        at_rgb
-    } t;
-    union {
-        attr_style_t s;
-        attr_idx_t i;
-        attr_rgb_t r;
-    } a;
-} attrs_t;
 /** One field on screen. It contain one character and its attributes. */
 typedef struct {
-    wchar_t character;  /**< Character itself */
-    attrs_t attrs;      /**< Character attributes */
+    char character;         /**< Character itself */
+    style_t style;          /**< Character`s attributes */
 } keyfield_t;
 /** Structure for buffering state of one virtual console.
  */
 typedef struct {
-    keyfield_t *buffer;      /**< Screen content - characters and
-                                  their attributes (used as a circular buffer) */
-    size_t size_x;           /**< Number of columns  */
-    size_t size_y;           /**< Number of rows */
-    /** Coordinates of last printed character for determining cursor position */
-    size_t position_x;
-    size_t position_y;
-    attrs_t attrs;           /**< Current attributes. */
-    size_t top_line;         /**< Points to buffer[][] line that will
-                                  be printed at screen as the first line */
-    bool is_cursor_visible;  /**< Cursor state - default is visible */
+    keyfield_t *buffer;         /**< Screen content - characters and its style. Used as cyclyc buffer. */
+    unsigned int size_x, size_y;        /**< Number of columns and rows */
+    unsigned int position_x, position_y;    /**< Coordinates of last printed character for determining cursor position */
+    style_t style;              /**< Current style */
+    unsigned int top_line;          /**< Points to buffer[][] line that will be printed at screen as the first line */
+    unsigned char is_cursor_visible;    /**< Cursor state - default is visible */
 } screenbuffer_t;
-/** Returns keyfield for position on screen
- *
- * Screenbuffer->buffer is cyclic buffer so we
- * must couted in index of the topmost line.
- *
- * @param scr Screenbuffer
- * @param x   Position on screen
- * @param y   Position on screen
- *
- * @return Keyfield structure with character and its attributes on x, y
- *
+/** Returns keyfield for position on screen. Screenbuffer->buffer is cyclic buffer so we must couted in index of the topmost line.
+ * @param scr   screenbuffer
+ * @param x position on screen
+ * @param y position on screen
+ * @return  keyfield structure with character and its attributes on x,y
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, size_t x, size_t y)
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
 {
     return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
 }
-/** Compares two sets of attributes.
- *
- * @param s1 First style
- * @param s2 Second style
- *
- * @return Nonzero on equality
- *
+/** Compares two styles.
+ * @param s1 first style
+ * @param s2 second style
+ * @return nonzero on equality
  */
-static inline int attrs_same(attrs_t a1, attrs_t a2)
+static inline int style_same(style_t s1, style_t s2)
 {
-    if (a1.t != a2.t)
-        return 0;
-    switch (a1.t) {
-    case at_style:
-        return (a1.a.s.style == a2.a.s.style);
-    case at_idx:
-        return (a1.a.i.fg_color == a2.a.i.fg_color)
-            && (a1.a.i.bg_color == a2.a.i.bg_color)
-            && (a1.a.i.flags == a2.a.i.flags);
-    case at_rgb:
-        return (a1.a.r.fg_color == a2.a.r.fg_color)
-            && (a1.a.r.bg_color == a2.a.r.bg_color);
-    }
-    return 0;
+    return s1.fg_color == s2.fg_color && s1.bg_color == s2.bg_color;
 }
-void screenbuffer_putchar(screenbuffer_t *scr, wchar_t c);
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y);
+void screenbuffer_putchar(screenbuffer_t *scr, char c);
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y);
 void screenbuffer_clear(screenbuffer_t *scr);
-void screenbuffer_clear_line(screenbuffer_t *scr, size_t line);
+void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line);
 void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest);
-void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y);
-void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style);
-void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color,
-    uint8_t bg_color, uint8_t attr);
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color,
-    uint32_t bg_color);
+void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y);
+void screenbuffer_set_style(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color);
 #endif
 /** @}
  */

/trunk/uspace/srv/console/cons_kernel.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/anim_1.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/anim_2.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/anim_3.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/anim_4.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/cons_has_data.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/cons_selected.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/cons_idle.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/nameic.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/uspace/srv/console/helenos.ppm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/uspace/srv/rd/rd.c
 ,0 → 1,228
+/*
+ * Copyright (c) 2007 Michal Konopa
+ * Copyright (c) 2007 Martin Jelen
+ * Copyright (c) 2007 Peter Majer
+ * Copyright (c) 2007 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup rd
+ * @{
+ */
+/**
+ * @file    rd.c
+ * @brief   Initial RAM disk for HelenOS.
+ */
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <ipc/ns.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
+#include <align.h>
+#include <bool.h>
+#include <errno.h>
+#include <async.h>
+#include <align.h>
+#include <async.h>
+#include <futex.h>
+#include "rd.h"
+/** Pointer to the ramdisk's image. */
+static void *rd_addr;
+/** Size of the ramdisk. */
+static size_t rd_size;
+/**
+ * This futex protects the ramdisk's data.
+ * If we were to serve multiple requests (read + write or several writes)
+ * concurrently (i.e. from two or more threads), each read and write needs to be
+ * protected by this futex.
+ */
+atomic_t rd_futex = FUTEX_INITIALIZER;
+/** Handle one connection to ramdisk.
+ *
+ * @param iid       Hash of the request that opened the connection.
+ * @param icall     Call data of the request that opened the connection.
+ */
+static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    ipc_callid_t callid;
+    ipc_call_t call;
+    int retval;
+    void *fs_va = NULL;
+    ipcarg_t offset;
+    /*
+     * We allocate VA for communication per connection.
+     * This allows us to potentionally have more clients and work
+     * concurrently.
+     */
+    fs_va = as_get_mappable_page(ALIGN_UP(BLOCK_SIZE, PAGE_SIZE));
+    if (!fs_va) {
+        /*
+         * Hang up the phone if we cannot proceed any further.
+         * This is the answer to the call that opened the connection.
+         */
+        ipc_answer_0(iid, EHANGUP);
+        return;
+    } else {
+        /*
+         * Answer the first IPC_M_CONNECT_ME_TO call.
+         * Return supported block size as ARG1.
+         */
+        ipc_answer_1(iid, EOK, BLOCK_SIZE);
+    }
+    /*
+     * Now we wait for the client to send us its communication as_area.
+     */
+    size_t size;
+    if (ipc_share_out_receive(&callid, &size, NULL)) {
+        if (size >= BLOCK_SIZE) {
+            /*
+             * The client sends an as_area that can absorb the whole
+             * block.
+             */
+            (void) ipc_share_out_finalize(callid, fs_va);
+        } else {
+            /*
+             * The client offered as_area too small.
+             * Close the connection.
+             */
+            ipc_answer_0(callid, EHANGUP);
+            return;
+        }
+    } else {
+        /*
+         * The client doesn't speak the same protocol.
+         * At this point we can't handle protocol variations.
+         * Close the connection.
+         */
+        ipc_answer_0(callid, EHANGUP);
+        return;
+    }
+    while (1) {
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
+        case IPC_M_PHONE_HUNGUP:
+            /*
+             * The other side has hung up.
+             * Answer the message and exit the fibril.
+             */
+            ipc_answer_0(callid, EOK);
+            return;
+        case RD_READ_BLOCK:
+            offset = IPC_GET_ARG1(call);
+            if (offset * BLOCK_SIZE > rd_size - BLOCK_SIZE) {
+                /*
+                 * Reading past the end of the device.
+                 */
+                retval = ELIMIT;
+                break;
+            }
+            futex_down(&rd_futex);
+            memcpy(fs_va, rd_addr + offset, BLOCK_SIZE);
+            futex_up(&rd_futex);
+            retval = EOK;
+            break;
+        case RD_WRITE_BLOCK:
+            offset = IPC_GET_ARG1(call);
+            if (offset * BLOCK_SIZE > rd_size - BLOCK_SIZE) {
+                /*
+                 * Writing past the end of the device.
+                 */
+                retval = ELIMIT;
+                break;
+            }
+            futex_up(&rd_futex);
+            memcpy(rd_addr + offset, fs_va, BLOCK_SIZE);
+            futex_down(&rd_futex);
+            retval = EOK;
+            break;
+        default:
+            /*
+             * The client doesn't speak the same protocol.
+             * Instead of closing the connection, we just ignore
+             * the call. This can be useful if the client uses a
+             * newer version of the protocol.
+             */
+            retval = EINVAL;
+            break;
+        }
+        ipc_answer_0(callid, retval);
+    }
+}
+/** Prepare the ramdisk image for operation. */
+static bool rd_init(void)
+{
+    int retval, flags;
+    rd_size = sysinfo_value("rd.size");
+    void *rd_ph_addr = (void *) sysinfo_value("rd.address.physical");
+    if (rd_size == 0)
+        return false;
+    rd_addr = as_get_mappable_page(rd_size);
+    flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
+    retval = physmem_map(rd_ph_addr, rd_addr,
+        ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
+    if (retval < 0)
+        return false;
+    return true;
+}
+int main(int argc, char **argv)
+{
+    if (rd_init()) {
+        ipcarg_t phonead;
+        async_set_client_connection(rd_connection);
+        /* Register service at nameserver */
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_RD, 0, 0, &phonead) != 0)
+            return -1;
+        async_manager();
+        /* Never reached */
+        return 0;
+    }
+    return -1;
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/rd/Makefile
 ,0 → 1,72
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Setup toolchain
+#
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
+## Sources
+#
+OUTPUT = rd
+SOURCES = \
+    rd.c
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /trunk/uspace/srv/rd/rd.h
 ,0 → 1,52
+/*
+ * Copyright (c) 2007 Michal Konopa
+ * Copyright (c) 2007 Martin Jelen
+ * Copyright (c) 2007 Peter Majer
+ * Copyright (c) 2007 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup rd
+ * @{
+ */
+/**
+ * @file    rd.h
+ * @brief   Initial RAM disk for HelenOS - header
+ */
+/* Basic constants. */
+#ifndef RD_RD_H_
+#define RD_RD_H_
+#define BLOCK_SIZE  1024    /**< Working block size */
+#define RD_BASE     1024
+#define RD_READ_BLOCK   (RD_BASE + 1)   /**< Method for reading block. */
+#define RD_WRITE_BLOCK  (RD_BASE + 2)   /**< Method for writing block. */
+#endif

 /trunk/uspace/srv/devmap/devmap.c
 ,9 → 28,9
 /**
  * @defgroup devmap Device mapper.
- * @brief HelenOS device mapper.
+ * @brief   HelenOS device mapper.
  * @{
- */
+ */
 /** @file
  */
 ,131 → 41,116
 #include <stdio.h>
 #include <errno.h>
 #include <bool.h>
-#include <fibril_sync.h>
+#include <futex.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ipc/devmap.h>
-#define NAME          "devmap"
-#define NULL_DEVICES  256
+#include "devmap.h"
-/** Representation of device driver.
- *
- * Each driver is responsible for a set of devices.
- *
- */
-typedef struct {
-    /** Pointers to previous and next drivers in linked list */
-    link_t drivers;
-    /** Pointer to the linked list of devices controlled by this driver */
-    link_t devices;
-    /** Phone asociated with this driver */
-    ipcarg_t phone;
-    /** Device driver name */
-    char *name;
-    /** Fibril mutex for list of devices owned by this driver */
-    fibril_mutex_t devices_mutex;
-} devmap_driver_t;
-/** Info about registered device
- *
- */
-typedef struct {
-    /** Pointer to the previous and next device in the list of all devices */
-    link_t devices;
-    /** Pointer to the previous and next device in the list of devices
-        owned by one driver */
-    link_t driver_devices;
-    /** Unique device identifier  */
-    dev_handle_t handle;
-    /** Device name */
-    char *name;
-    /** Device driver handling this device */
-    devmap_driver_t *driver;
-} devmap_device_t;
 LIST_INITIALIZE(devices_list);
 LIST_INITIALIZE(drivers_list);
-/* Locking order:
- *  drivers_list_mutex
- *  devices_list_mutex
- *  (devmap_driver_t *)->devices_mutex
- *  create_handle_mutex
+/* order of locking:
+ * drivers_list_futex
+ * devices_list_futex
+ * (devmap_driver_t *)->devices_futex
+ * create_handle_futex
  **/
-static FIBRIL_MUTEX_INITIALIZE(devices_list_mutex);
-static FIBRIL_CONDVAR_INITIALIZE(devices_list_cv);
-static FIBRIL_MUTEX_INITIALIZE(drivers_list_mutex);
-static FIBRIL_MUTEX_INITIALIZE(create_handle_mutex);
-static FIBRIL_MUTEX_INITIALIZE(null_devices_mutex);
+static atomic_t devices_list_futex = FUTEX_INITIALIZER;
+static atomic_t drivers_list_futex = FUTEX_INITIALIZER;
+static atomic_t create_handle_futex = FUTEX_INITIALIZER;
-static dev_handle_t last_handle = 0;
-static devmap_device_t *null_devices[NULL_DEVICES];
-static dev_handle_t devmap_create_handle(void)
+static int devmap_create_handle(void)
 {
+    static int last_handle = 0;
+    int handle;
     /* TODO: allow reusing old handles after their unregistration
-     * and implement some version of LRU algorithm, avoid overflow
-     */
-    fibril_mutex_lock(&create_handle_mutex);
-    last_handle++;
-    fibril_mutex_unlock(&create_handle_mutex);
-    return last_handle;
+        and implement some version of LRU algorithm */
+    /* FIXME: overflow */
+    futex_down(&create_handle_futex);
+    last_handle += 1;
+    handle = last_handle;
+    futex_up(&create_handle_futex);
+    return handle;
 }
+/** Initialize device mapper.
+ *
+ *
+ */
+static int devmap_init()
+{
+    /* TODO: */
+    return EOK;
+}
 /** Find device with given name.
  *
  */
 static devmap_device_t *devmap_device_find_name(const char *name)
 {
-    link_t *item = devices_list.next;
+    link_t *item;
     devmap_device_t *device = NULL;
+    item = devices_list.next;
     while (item != &devices_list) {
         device = list_get_instance(item, devmap_device_t, devices);
-        if (str_cmp(device->name, name) == 0)
+        if (0 == strcmp(device->name, name)) {
             break;
+        }
         item = item->next;
     }
-    if (item == &devices_list)
+    if (item == &devices_list) {
+        printf("DEVMAP: no device named %s.\n", name);
         return NULL;
+    }
     device = list_get_instance(item, devmap_device_t, devices);
     return device;
 }
 /** Find device with given handle.
- *
  * @todo: use hash table
- *
  */
-static devmap_device_t *devmap_device_find_handle(dev_handle_t handle)
+static devmap_device_t *devmap_device_find_handle(int handle)
 {
-    fibril_mutex_lock(&devices_list_mutex);
-    link_t *item = (&devices_list)->next;
+    link_t *item;
     devmap_device_t *device = NULL;
+    futex_down(&devices_list_futex);
+    item = (&devices_list)->next;
     while (item != &devices_list) {
         device = list_get_instance(item, devmap_device_t, devices);
-        if (device->handle == handle)
+        if (device->handle == handle) {
             break;
+        }
         item = item->next;
     }
     if (item == &devices_list) {
-        fibril_mutex_unlock(&devices_list_mutex);
+        futex_up(&devices_list_futex);
         return NULL;
     }
     device = list_get_instance(item, devmap_device_t, devices);
-    fibril_mutex_unlock(&devices_list_mutex);
+    futex_up(&devices_list_futex);
     return device;
 }
 ,12 → 160,14
  */
 static int devmap_device_unregister_core(devmap_device_t *device)
 {
     list_remove(&(device->devices));
     list_remove(&(device->driver_devices));
-    free(device->name);
+    free(device->name);
     free(device);
     return EOK;
 }
 ,80 → 177,90
  */
 static void devmap_driver_register(devmap_driver_t **odriver)
 {
+    size_t name_size;
+    ipc_callid_t callid;
+    ipc_call_t call;
+    devmap_driver_t *driver;
+    ipc_callid_t iid;
+    ipc_call_t icall;
     *odriver = NULL;
-    ipc_call_t icall;
-    ipc_callid_t iid = async_get_call(&icall);
+    iid = async_get_call(&icall);
     if (IPC_GET_METHOD(icall) != DEVMAP_DRIVER_REGISTER) {
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
-    devmap_driver_t *driver = (devmap_driver_t *) malloc(sizeof(devmap_driver_t));
-    if (driver == NULL) {
+    }
+    if (NULL ==
+        (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
         ipc_answer_0(iid, ENOMEM);
         return;
     }
-    /*
+    /*
      * Get driver name
      */
-    ipc_callid_t callid;
-    size_t name_size;
     if (!ipc_data_write_receive(&callid, &name_size)) {
+        printf("Unexpected request.\n");
         free(driver);
         ipc_answer_0(callid, EREFUSED);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     if (name_size > DEVMAP_NAME_MAXLEN) {
+        printf("Too logn name: %u: maximum is %u.\n", name_size,
+            DEVMAP_NAME_MAXLEN);
         free(driver);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /*
      * Allocate buffer for device name.
      */
-    driver->name = (char *) malloc(name_size + 1);
-    if (driver->name == NULL) {
+    if (NULL == (driver->name = (char *)malloc(name_size + 1))) {
+        printf("Cannot allocate space for driver name.\n");
         free(driver);
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
+    }
     /*
      * Send confirmation to sender and get data into buffer.
      */
-    if (ipc_data_write_finalize(callid, driver->name, name_size) != EOK) {
+    if (EOK != ipc_data_write_finalize(callid, driver->name, name_size)) {
+        printf("Cannot read driver name.\n");
         free(driver->name);
         free(driver);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     driver->name[name_size] = 0;
-    /* Initialize mutex for list of devices owned by this driver */
-    fibril_mutex_initialize(&driver->devices_mutex);
-    /*
+    printf("Read driver name: '%s'.\n", driver->name);
+    /* Initialize futex for list of devices owned by this driver */
+    futex_initialize(&(driver->devices_futex), 1);
+    /*
      * Initialize list of asociated devices
      */
-    list_initialize(&driver->devices);
-    /*
-     * Create connection to the driver
+    list_initialize(&(driver->devices));
+    /*
+     * Create connection to the driver
      */
-    ipc_call_t call;
     callid = async_get_call(&call);
-    if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
+    if (IPC_M_CONNECT_TO_ME != IPC_GET_METHOD(call)) {
+        printf("DEVMAP: Unexpected method: %u.\n",
+            IPC_GET_METHOD(call));
         ipc_answer_0(callid, ENOTSUP);
         free(driver->name);
 ,71 → 268,81
         ipc_answer_0(iid, ENOTSUP);
         return;
     }
     driver->phone = IPC_GET_ARG5(call);
     ipc_answer_0(callid, EOK);
     list_initialize(&(driver->drivers));
+    futex_down(&drivers_list_futex);
-    fibril_mutex_lock(&drivers_list_mutex);
     /* TODO:
      * check that no driver with name equal to driver->name is registered
      */
-    /*
+    /*
      * Insert new driver into list of registered drivers
      */
     list_append(&(driver->drivers), &drivers_list);
-    fibril_mutex_unlock(&drivers_list_mutex);
+    futex_up(&drivers_list_futex);
     ipc_answer_0(iid, EOK);
+    printf("Driver registered.\n");
     *odriver = driver;
+    return;
 }
-/**
- * Unregister device driver, unregister all its devices and free driver
+/** Unregister device driver, unregister all its devices and free driver
  * structure.
- *
  */
 static int devmap_driver_unregister(devmap_driver_t *driver)
 {
-    if (driver == NULL)
+    devmap_device_t *device;
+    if (NULL == driver) {
+        printf("Error: driver == NULL.\n");
         return EEXISTS;
+    }
+    printf("Unregister driver '%s'.\n", driver->name);
+    futex_down(&drivers_list_futex);
+    ipc_hangup(driver->phone);
-    fibril_mutex_lock(&drivers_list_mutex);
-    if (driver->phone != 0)
-        ipc_hangup(driver->phone);
-    /* Remove it from list of drivers */
+    /* remove it from list of drivers */
     list_remove(&(driver->drivers));
+    /* unregister all its devices */
-    /* Unregister all its devices */
-    fibril_mutex_lock(&devices_list_mutex);
-    fibril_mutex_lock(&driver->devices_mutex);
+    futex_down(&devices_list_futex);
+    futex_down(&(driver->devices_futex));
     while (!list_empty(&(driver->devices))) {
-        devmap_device_t *device = list_get_instance(driver->devices.next,
+        device = list_get_instance(driver->devices.next,
             devmap_device_t, driver_devices);
+        printf("Unregister device '%s'.\n", device->name);
         devmap_device_unregister_core(device);
     }
-    fibril_mutex_unlock(&driver->devices_mutex);
-    fibril_mutex_unlock(&devices_list_mutex);
-    fibril_mutex_unlock(&drivers_list_mutex);
+    futex_up(&(driver->devices_futex));
+    futex_up(&devices_list_futex);
+    futex_up(&drivers_list_futex);
     /* free name and driver */
-    if (driver->name != NULL)
+    if (NULL != driver->name) {
         free(driver->name);
+    }
     free(driver);
+    printf("Driver unregistered.\n");
     return EOK;
 }
 /** Register instance of device
  *
  */
 ,38 → 349,45
 static void devmap_device_register(ipc_callid_t iid, ipc_call_t *icall,
     devmap_driver_t *driver)
 {
-    if (driver == NULL) {
+    ipc_callid_t callid;
+    size_t size;
+    devmap_device_t *device;
+    if (NULL == driver) {
+        printf("Invalid driver registration.\n");
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /* Create new device entry */
-    devmap_device_t *device = (devmap_device_t *) malloc(sizeof(devmap_device_t));
-    if (device == NULL) {
+    if (NULL ==
+        (device = (devmap_device_t *)malloc(sizeof(devmap_device_t)))) {
+        printf("Cannot allocate new device.\n");
         ipc_answer_0(iid, ENOMEM);
         return;
     }
     /* Get device name */
-    ipc_callid_t callid;
-    size_t size;
     if (!ipc_data_write_receive(&callid, &size)) {
         free(device);
+        printf("Cannot read device name.\n");
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     if (size > DEVMAP_NAME_MAXLEN) {
+        printf("Too long device name: %u.\n", size);
         free(device);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
-    /* +1 for terminating \0 */
-    device->name = (char *) malloc(size + 1);
-    if (device->name == NULL) {
+        /* +1 for terminating \0 */
+    device->name = (char *)malloc(size + 1);
+    if (NULL == device->name) {
+        printf("Cannot read device name.\n");
         free(device);
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
 ,40 → 396,42
     ipc_data_write_finalize(callid, device->name, size);
     device->name[size] = 0;
     list_initialize(&(device->devices));
     list_initialize(&(device->driver_devices));
-    fibril_mutex_lock(&devices_list_mutex);
+    futex_down(&devices_list_futex);
     /* Check that device with such name is not already registered */
     if (NULL != devmap_device_find_name(device->name)) {
-        printf(NAME ": Device '%s' already registered\n", device->name);
-        fibril_mutex_unlock(&devices_list_mutex);
+        printf("Device '%s' already registered.\n", device->name);
+        futex_up(&devices_list_futex);
         free(device->name);
         free(device);
         ipc_answer_0(iid, EEXISTS);
         return;
     }
     /* Get unique device handle */
-    device->handle = devmap_create_handle();
+    device->handle = devmap_create_handle();
     device->driver = driver;
     /* Insert device into list of all devices  */
     list_append(&device->devices, &devices_list);
     /* Insert device into list of devices that belog to one driver */
-    fibril_mutex_lock(&device->driver->devices_mutex);
+    futex_down(&device->driver->devices_futex);
     list_append(&device->driver_devices, &device->driver->devices);
-    fibril_mutex_unlock(&device->driver->devices_mutex);
-    fibril_condvar_broadcast(&devices_list_cv);
-    fibril_mutex_unlock(&devices_list_mutex);
+    futex_up(&device->driver->devices_futex);
+    futex_up(&devices_list_futex);
+    printf("Device '%s' registered.\n", device->name);
     ipc_answer_1(iid, EOK, device->handle);
+    return;
 }
 /**
 ,325 → 441,179
     devmap_driver_t *driver)
 {
     /* TODO */
     return EOK;
 }
 /** Connect client to the device.
- *
  * Find device driver owning requested device and forward
  * the message to it.
- *
  */
 static void devmap_forward(ipc_callid_t callid, ipc_call_t *call)
 {
+    devmap_device_t *dev;
+    int handle;
     /*
      * Get handle from request
      */
-    dev_handle_t handle = IPC_GET_ARG2(*call);
-    devmap_device_t *dev = devmap_device_find_handle(handle);
-    if ((dev == NULL) || (dev->driver == NULL) || (dev->driver->phone == 0)) {
+    handle = IPC_GET_ARG2(*call);
+    dev = devmap_device_find_handle(handle);
+    if (NULL == dev) {
+        printf("DEVMAP: No registered device with handle %d.\n",
+            handle);
         ipc_answer_0(callid, ENOENT);
         return;
-    }
-    ipc_forward_fast(callid, dev->driver->phone, dev->handle,
+    }
+    ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle),
         IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+    return;
 }
 /** Find handle for device instance identified by name.
- *
  * In answer will be send EOK and device handle in arg1 or a error
- * code from errno.h.
- *
+ * code from errno.h.
  */
 static void devmap_get_handle(ipc_callid_t iid, ipc_call_t *icall)
 {
-    /*
+    char *name = NULL;
+    size_t name_size;
+    const devmap_device_t *dev;
+    ipc_callid_t callid;
+    ipcarg_t retval;
+    /*
      * Wait for incoming message with device name (but do not
      * read the name itself until the buffer is allocated).
      */
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_write_receive(&callid, &size)) {
+    if (!ipc_data_write_receive(&callid, &name_size)) {
         ipc_answer_0(callid, EREFUSED);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
-    if ((size < 1) || (size > DEVMAP_NAME_MAXLEN)) {
+    if (name_size > DEVMAP_NAME_MAXLEN) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /*
      * Allocate buffer for device name.
      */
-    char *name = (char *) malloc(size + 1);
-    if (name == NULL) {
+    if (NULL == (name = (char *)malloc(name_size))) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
+    }
     /*
      * Send confirmation to sender and get data into buffer.
      */
-    ipcarg_t retval = ipc_data_write_finalize(callid, name, size);
-    if (retval != EOK) {
+    if (EOK != (retval = ipc_data_write_finalize(callid, name,
+        name_size))) {
         ipc_answer_0(iid, EREFUSED);
-        free(name);
         return;
     }
-    name[size] = '\0';
-    fibril_mutex_lock(&devices_list_mutex);
-    const devmap_device_t *dev;
-recheck:
     /*
-     * Find device name in the list of known devices.
+     * Find device name in linked list of known devices.
      */
     dev = devmap_device_find_name(name);
     /*
      * Device was not found.
      */
-    if (dev == NULL) {
-        if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) {
-            /* Blocking lookup */
-            fibril_condvar_wait(&devices_list_cv,
-                &devices_list_mutex);
-            goto recheck;
-        }
+    if (NULL == dev) {
+        printf("DEVMAP: device %s has not been registered.\n", name);
         ipc_answer_0(iid, ENOENT);
-        free(name);
-        fibril_mutex_unlock(&devices_list_mutex);
         return;
     }
-    fibril_mutex_unlock(&devices_list_mutex);
+    printf("DEVMAP: device %s has handler %d.\n", name, dev->handle);
     ipc_answer_1(iid, EOK, dev->handle);
-    free(name);
+    return;
 }
-/** Find name of device identified by id and send it to caller.
+/** Find name of device identified by id and send it to caller.
  *
  */
-static void devmap_get_name(ipc_callid_t iid, ipc_call_t *icall)
+static void devmap_get_name(ipc_callid_t iid, ipc_call_t *icall)
 {
-    const devmap_device_t *device = devmap_device_find_handle(IPC_GET_ARG1(*icall));
+    const devmap_device_t *device;
+    size_t name_size;
+    device = devmap_device_find_handle(IPC_GET_ARG1(*icall));
     /*
      * Device not found.
      */
-    if (device == NULL) {
+    if (NULL == device) {
         ipc_answer_0(iid, ENOENT);
         return;
-    }
+    }
     ipc_answer_0(iid, EOK);
-    /* FIXME:
-     * We have no channel from DEVMAP to client, therefore
-     * sending must be initiated by client.
-     *
-     * size_t name_size = str_size(device->name);
-     *
-     * int rc = ipc_data_write_send(phone, device->name, name_size);
-     * if (rc != EOK) {
-     *     async_wait_for(req, NULL);
-     *     return rc;
-     * }
-     */
-    /* TODO: send name in response */
-}
-static void devmap_get_count(ipc_callid_t iid, ipc_call_t *icall)
-{
-    fibril_mutex_lock(&devices_list_mutex);
-    ipc_answer_1(iid, EOK, list_count(&devices_list));
-    fibril_mutex_unlock(&devices_list_mutex);
-}
+    name_size = strlen(device->name);
-static void devmap_get_devices(ipc_callid_t iid, ipc_call_t *icall)
-{
-    fibril_mutex_lock(&devices_list_mutex);
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_read_receive(&callid, &size)) {
-        ipc_answer_0(callid, EREFUSED);
-        ipc_answer_0(iid, EREFUSED);
-        return;
-    }
-    if ((size % sizeof(dev_desc_t)) != 0) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(iid, EREFUSED);
-        return;
-    }
-    size_t count = size / sizeof(dev_desc_t);
-    dev_desc_t *desc = (dev_desc_t *) malloc(size);
-    if (desc == NULL) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(iid, EREFUSED);
-        return;
-    }
-    size_t pos = 0;
-    link_t *item = devices_list.next;
-    while ((item != &devices_list) && (pos < count)) {
-        devmap_device_t *device = list_get_instance(item, devmap_device_t, devices);
-        desc[pos].handle = device->handle;
-        str_cpy(desc[pos].name, DEVMAP_NAME_MAXLEN, device->name);
-        pos++;
-        item = item->next;
-    }
-    ipcarg_t retval = ipc_data_read_finalize(callid, desc, pos * sizeof(dev_desc_t));
-    if (retval != EOK) {
-        ipc_answer_0(iid, EREFUSED);
-        free(desc);
-        return;
-    }
-    free(desc);
-    fibril_mutex_unlock(&devices_list_mutex);
-    ipc_answer_1(iid, EOK, pos);
-}
-static void devmap_null_create(ipc_callid_t iid, ipc_call_t *icall)
-{
-    fibril_mutex_lock(&null_devices_mutex);
-    unsigned int i;
-    bool fnd = false;
-    for (i = 0; i < NULL_DEVICES; i++) {
-        if (null_devices[i] == NULL) {
-            fnd = true;
-            break;
-        }
-    }
-    if (!fnd) {
-        fibril_mutex_unlock(&null_devices_mutex);
-        ipc_answer_0(iid, ENOMEM);
-        return;
-    }
-    /* Create NULL device entry */
-    devmap_device_t *device = (devmap_device_t *) malloc(sizeof(devmap_device_t));
-    if (device == NULL) {
-        fibril_mutex_unlock(&null_devices_mutex);
-        ipc_answer_0(iid, ENOMEM);
-        return;
-    }
-    char null[DEVMAP_NAME_MAXLEN];
-    snprintf(null, DEVMAP_NAME_MAXLEN, "null%u", i);
-    device->name = str_dup(null);
-    if (device->name == NULL) {
-        fibril_mutex_unlock(&null_devices_mutex);
-        free(device);
-        ipc_answer_0(iid, ENOMEM);
-        return;
-    }
-    list_initialize(&(device->devices));
-    list_initialize(&(device->driver_devices));
-    fibril_mutex_lock(&devices_list_mutex);
-    /* Get unique device handle */
-    device->handle = devmap_create_handle();
-    device->driver = NULL;
-    /* Insert device into list of all devices
-       and into null devices array */
-    list_append(&device->devices, &devices_list);
-    null_devices[i] = device;
-    fibril_mutex_unlock(&devices_list_mutex);
-    fibril_mutex_unlock(&null_devices_mutex);
-    ipc_answer_1(iid, EOK, (ipcarg_t) i);
-}
+/*  FIXME:
+    we have no channel from DEVMAP to client ->
+    sending must be initiated by client
-static void devmap_null_destroy(ipc_callid_t iid, ipc_call_t *icall)
-{
-    fibril_mutex_lock(&null_devices_mutex);
-    ipcarg_t i = IPC_GET_ARG1(*icall);
-    if (null_devices[i] == NULL) {
-        ipc_answer_0(iid, ENOENT);
-        return;
+    int rc = ipc_data_write_send(phone, device->name, name_size);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        return rc;
     }
-    devmap_device_unregister_core(null_devices[i]);
-    null_devices[i] = NULL;
-    fibril_mutex_unlock(&null_devices_mutex);
-    ipc_answer_0(iid, EOK);
-}
+*/
+    /* TODO: send name in response */
-/** Initialize device mapper.
- *
- *
- */
-static bool devmap_init(void)
-{
-    fibril_mutex_lock(&null_devices_mutex);
-    unsigned int i;
-    for (i = 0; i < NULL_DEVICES; i++)
-        null_devices[i] = NULL;
-    fibril_mutex_unlock(&null_devices_mutex);
-    return true;
+    return;
 }
 /** Handle connection with device driver.
  *
  */
-static void devmap_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
+static void
+devmap_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
-    /* Accept connection */
-    ipc_answer_0(iid, EOK);
-    devmap_driver_t *driver = NULL;
+    ipc_callid_t callid;
+    ipc_call_t call;
+    bool cont = true;
+    devmap_driver_t *driver = NULL;
+    ipc_answer_0(iid, EOK);
     devmap_driver_register(&driver);
-    if (NULL == driver)
+    if (NULL == driver) {
+        printf("DEVMAP: driver registration failed.\n");
         return;
+    }
-    bool cont = true;
     while (cont) {
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
+            printf("DEVMAP: connection hung up.\n");
             cont = false;
-            continue;
+            continue; /* Exit thread */
         case DEVMAP_DRIVER_UNREGISTER:
-            if (NULL == driver)
+            printf("DEVMAP: unregister driver.\n");
+            if (NULL == driver) {
+                printf("DEVMAP: driver was not registered!\n");
                 ipc_answer_0(callid, ENOENT);
-            else
+            } else {
                 ipc_answer_0(callid, EOK);
+            }
             break;
         case DEVMAP_DEVICE_REGISTER:
             /* Register one instance of device */
 ,72 → 627,73
             devmap_get_handle(callid, &call);
             break;
         case DEVMAP_DEVICE_GET_NAME:
-            devmap_get_name(callid, &call);
+            devmap_get_handle(callid, &call);
             break;
         default:
-            if (!(callid & IPC_CALLID_NOTIFICATION))
+            if (!(callid & IPC_CALLID_NOTIFICATION)) {
                 ipc_answer_0(callid, ENOENT);
+            }
         }
     }
-    if (driver != NULL) {
-        /*
+    if (NULL != driver) {
+        /*
          * Unregister the device driver and all its devices.
          */
         devmap_driver_unregister(driver);
         driver = NULL;
     }
 }
 /** Handle connection with device client.
  *
  */
-static void devmap_connection_client(ipc_callid_t iid, ipc_call_t *icall)
+static void
+devmap_connection_client(ipc_callid_t iid, ipc_call_t *icall)
 {
-    /* Accept connection */
-    ipc_answer_0(iid, EOK);
+    ipc_callid_t callid;
+    ipc_call_t call;
     bool cont = true;
+    ipc_answer_0(iid, EOK); /* Accept connection */
     while (cont) {
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
+            printf("DEVMAP: connection hung up.\n");
             cont = false;
-            continue;
+            continue; /* Exit thread */
         case DEVMAP_DEVICE_GET_HANDLE:
-            devmap_get_handle(callid, &call);
+            devmap_get_handle(callid, &call);
             break;
         case DEVMAP_DEVICE_GET_NAME:
+            /* TODO */
             devmap_get_name(callid, &call);
             break;
-        case DEVMAP_DEVICE_NULL_CREATE:
-            devmap_null_create(callid, &call);
-            break;
-        case DEVMAP_DEVICE_NULL_DESTROY:
-            devmap_null_destroy(callid, &call);
-            break;
-        case DEVMAP_DEVICE_GET_COUNT:
-            devmap_get_count(callid, &call);
-            break;
-        case DEVMAP_DEVICE_GET_DEVICES:
-            devmap_get_devices(callid, &call);
-            break;
         default:
-            if (!(callid & IPC_CALLID_NOTIFICATION))
+            if (!(callid & IPC_CALLID_NOTIFICATION)) {
                 ipc_answer_0(callid, ENOENT);
+            }
         }
     }
 }
-/** Function for handling connections to devmap
+/** Function for handling connections to devmap
  *
  */
-static void devmap_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void
+devmap_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    /* Select interface */
-    switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
+    printf("DEVMAP: new connection.\n");
+        /* Select interface */
+    switch ((ipcarg_t)(IPC_GET_ARG1(*icall))) {
     case DEVMAP_DRIVER:
         devmap_connection_driver(iid, icall);
         break;
 ,13 → 701,21
         devmap_connection_client(iid, icall);
         break;
     case DEVMAP_CONNECT_TO_DEVICE:
-        /* Connect client to selected device */
+            /* Connect client to selected device */
+        printf("DEVMAP: connect to device %d.\n",
+            IPC_GET_ARG2(*icall));
         devmap_forward(iid, icall);
         break;
     default:
-        /* No such interface */
-        ipc_answer_0(iid, ENOENT);
+        ipc_answer_0(iid, ENOENT); /* No such interface */
+        printf("DEVMAP: Unknown interface %u.\n",
+            (ipcarg_t)(IPC_GET_ARG1(*icall)));
     }
+    /* Cleanup */
+    printf("DEVMAP: connection closed.\n");
+    return;
 }
 /**
 ,24 → 723,23
  */
 int main(int argc, char *argv[])
 {
-    printf(NAME ": HelenOS Device Mapper\n");
-    if (!devmap_init()) {
-        printf(NAME ": Error while initializing service\n");
+    ipcarg_t phonead;
+    printf("DEVMAP: HelenOS device mapper.\n");
+    if (devmap_init() != 0) {
+        printf("Error while initializing DEVMAP service.\n");
         return -1;
     }
-    /* Set a handler of incomming connections */
+        /* Set a handler of incomming connections */
     async_set_client_connection(devmap_connection);
     /* Register device mapper at naming service */
-    ipcarg_t phonead;
     if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0)
         return -1;
-    printf(NAME ": Accepting connections\n");
     async_manager();
     /* Never reached */
     return 0;
 }
 ,3 → 747,4
 /**
  * @}
  */

 /trunk/uspace/srv/devmap/devmap.h
 ,0 → 1,99
+/*
+ * Copyright (c) 2007 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup devmap
+ * @{
+ */
+#ifndef DEVMAP_DEVMAP_H_
+#define DEVMAP_DEVMAP_H_
+#include <ipc/ipc.h>
+#include <libadt/list.h>
+#define DEVMAP_NAME_MAXLEN 512
+typedef enum {
+    DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
+    DEVMAP_DRIVER_UNREGISTER,
+    DEVMAP_DEVICE_REGISTER,
+    DEVMAP_DEVICE_UNREGISTER,
+    DEVMAP_DEVICE_GET_NAME,
+    DEVMAP_DEVICE_GET_HANDLE
+} devmap_request_t;
+/** Representation of device driver.
+ * Each driver is responsible for a set of devices.
+ */
+typedef struct {
+        /** Pointers to previous and next drivers in linked list */
+    link_t drivers;
+        /** Pointer to the linked list of devices controlled by
+         * this driver */
+    link_t devices;
+        /** Phone asociated with this driver */
+    ipcarg_t phone;
+        /** Device driver name */
+    char *name;
+        /** Futex for list of devices owned by this driver */
+    atomic_t devices_futex;
+} devmap_driver_t;
+/** Info about registered device
+ *
+ */
+typedef struct {
+        /** Pointer to the previous and next device in the list of all devices */
+    link_t devices;
+        /** Pointer to the previous and next device in the list of devices
+         owned by one driver */
+    link_t driver_devices;
+        /** Unique device identifier  */
+    int handle;
+        /** Device name */
+    char *name;
+        /** Device driver handling this device */
+    devmap_driver_t *driver;
+} devmap_device_t;
+/** Interface provided by devmap.
+ * Every process that connects to devmap must ask one of following
+ * interfaces otherwise connection will be refused.
+ */
+typedef enum {
+        /** Connect as device driver */
+    DEVMAP_DRIVER = 1,
+        /** Connect as client */
+    DEVMAP_CLIENT,
+        /** Create new connection to instance of device that
+         * is specified by second argument of call. */
+    DEVMAP_CONNECT_TO_DEVICE
+} devmap_interface_t;
+#endif

 /trunk/uspace/srv/devmap/Makefile
 ,11 → 31,12
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-LIBS = $(LIBC_PREFIX)/libc.a
+CFLAGS += -I../libipc/include
+LIBS =  $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 ,30 → 44,28
 SOURCES = \
     devmap.c
-CFLAGS += -D$(UARCH)
+CFLAGS += -D$(ARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/ns/ns.c
 ,98 → 28,104
 /** @addtogroup ns
  * @{
- */
+ */
 /**
- * @file  ns.c
- * @brief Naming service for HelenOS IPC.
+ * @file    ns.c
+ * @brief   Naming service for HelenOS IPC.
  */
 #include <ipc/ipc.h>
+#include <ipc/ns.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <stdio.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
+#include <assert.h>
+#include <libadt/list.h>
+#include <libadt/hash_table.h>
+#include <sysinfo.h>
+#include <ddi.h>
 #include <as.h>
-#include <ddi.h>
-#include <event.h>
-#include <macros.h>
-#include <sysinfo.h>
-#include "ns.h"
-#include "service.h"
-#include "clonable.h"
-#include "task.h"
+#define NAME    "NS"
+#define NS_HASH_TABLE_CHAINS    20
+static int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call);
+static int connect_to_service(ipcarg_t service, ipc_call_t *call,
+    ipc_callid_t callid);
+/* Static functions implementing NS hash table operations. */
+static hash_index_t ns_hash(unsigned long *key);
+static int ns_compare(unsigned long *key, hash_count_t keys, link_t *item);
+static void ns_remove(link_t *item);
+/** Operations for NS hash table. */
+static hash_table_operations_t ns_hash_table_ops = {
+    .hash = ns_hash,
+    .compare = ns_compare,
+    .remove_callback = ns_remove
+};
+/** NS hash table structure. */
+static hash_table_t ns_hash_table;
+/** NS hash table item. */
+typedef struct {
+    link_t link;
+    ipcarg_t service;       /**< Number of the service. */
+    ipcarg_t phone;         /**< Phone registered with the service. */
+    ipcarg_t in_phone_hash;     /**< Incoming phone hash. */
+} hashed_service_t;
 static void *clockaddr = NULL;
 static void *klogaddr = NULL;
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *ph_addr,
-    size_t pages, void **addr)
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name,
+    void **addr)
 {
-    if (ph_addr == NULL) {
-        ipc_answer_0(callid, ENOENT);
-        return;
-    }
-    if (*addr == NULL) {
-        *addr = as_get_mappable_page(pages * PAGE_SIZE);
-        if (*addr == NULL) {
+    void *ph_addr;
+    if (!*addr) {
+        ph_addr = (void *) sysinfo_value(name);
+        if (!ph_addr) {
             ipc_answer_0(callid, ENOENT);
             return;
         }
-        if (physmem_map(ph_addr, *addr, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
-            ipc_answer_0(callid, ENOENT);
-            return;
-        }
+        *addr = as_get_mappable_page(PAGE_SIZE);
+        physmem_map(ph_addr, *addr, 1,
+            AS_AREA_READ | AS_AREA_CACHEABLE);
     }
     ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
 }
 int main(int argc, char **argv)
 {
-    printf(NAME ": HelenOS IPC Naming Service\n");
+    ipc_call_t call;
+    ipc_callid_t callid;
-    int rc = service_init();
-    if (rc != EOK)
-        return rc;
-    rc = clonable_init();
-    if (rc != EOK)
-        return rc;
-    rc = task_init();
-    if (rc != EOK)
-        return rc;
-    printf(NAME ": Accepting connections\n");
-    while (true) {
-        process_pending_conn();
-        process_pending_wait();
+    ipcarg_t retval;
+    if (!hash_table_create(&ns_hash_table, NS_HASH_TABLE_CHAINS, 3,
+        &ns_hash_table_ops)) {
+        return ENOMEM;
+    }
-        ipc_call_t call;
-        ipc_callid_t callid = ipc_wait_for_call(&call);
-        task_id_t id;
-        ipcarg_t retval;
+    while (1) {
+        callid = ipc_wait_for_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_SHARE_IN:
             switch (IPC_GET_ARG3(call)) {
             case SERVICE_MEM_REALTIME:
-                get_as_area(callid, &call,
-                    (void *) sysinfo_value("clock.faddr"),
-, &clockaddr);
+                get_as_area(callid, &call, "clock.faddr",
+                    &clockaddr);
                 break;
             case SERVICE_MEM_KLOG:
-                get_as_area(callid, &call,
-                    (void *) sysinfo_value("klog.faddr"),
-                    sysinfo_value("klog.pages"), &klogaddr);
+                get_as_area(callid, &call, "klog.faddr",
+                    &klogaddr);
                 break;
             default:
                 ipc_answer_0(callid, ENOENT);
 ,62 → 132,141
             }
             continue;
         case IPC_M_PHONE_HUNGUP:
-            retval = ns_task_disconnect(&call);
+            retval = EOK;
             break;
         case IPC_M_CONNECT_TO_ME:
             /*
              * Server requests service registration.
              */
-            if (service_clonable(IPC_GET_ARG1(call))) {
-                register_clonable(IPC_GET_ARG1(call),
-                    IPC_GET_ARG5(call), &call, callid);
-                continue;
-            } else {
-                retval = register_service(IPC_GET_ARG1(call),
-                    IPC_GET_ARG5(call), &call);
-            }
+            retval = register_service(IPC_GET_ARG1(call),
+                IPC_GET_ARG5(call), &call);
             break;
         case IPC_M_CONNECT_ME_TO:
             /*
              * Client requests to be connected to a service.
              */
-            if (service_clonable(IPC_GET_ARG1(call))) {
-                connect_to_clonable(IPC_GET_ARG1(call),
-                    &call, callid);
-                continue;
-            } else {
-                connect_to_service(IPC_GET_ARG1(call), &call,
-                    callid);
-                continue;
-            }
+            retval = connect_to_service(IPC_GET_ARG1(call), &call,
+                callid);
             break;
-        case NS_PING:
-            retval = EOK;
-            break;
-        case NS_TASK_WAIT:
-            id = (task_id_t)
-                MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-            wait_for_task(id, &call, callid);
-            continue;
-        case NS_ID_INTRO:
-            retval = ns_task_id_intro(&call);
-            break;
-        case NS_RETVAL:
-            retval = ns_task_retval(&call);
-            break;
         default:
             retval = ENOENT;
             break;
         }
-        if (!(callid & IPC_CALLID_NOTIFICATION))
+        if (!(callid & IPC_CALLID_NOTIFICATION)) {
             ipc_answer_0(callid, retval);
+        }
     }
-    /* Not reached */
+}
+/** Register service.
+ *
+ * @param service Service to be registered.
+ * @param phone Phone to be used for connections to the service.
+ * @param call Pointer to call structure.
+ *
+ * @return Zero on success or a value from @ref errno.h.
+ */
+int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
+{
+    unsigned long keys[3] = {
+        service,
+        call->in_phone_hash,
+    };
+    hashed_service_t *hs;
+    if (hash_table_find(&ns_hash_table, keys)) {
+        return EEXISTS;
+    }
+    hs = (hashed_service_t *) malloc(sizeof(hashed_service_t));
+    if (!hs) {
+        return ENOMEM;
+    }
+    link_initialize(&hs->link);
+    hs->service = service;
+    hs->phone = phone;
+    hs->in_phone_hash = call->in_phone_hash;
+    hash_table_insert(&ns_hash_table, keys, &hs->link);
     return 0;
 }
-/**
+/** Connect client to service.
+ *
+ * @param service Service to be connected to.
+ * @param call Pointer to call structure.
+ * @param callid Call ID of the request.
+ *
+ * @return Zero on success or a value from @ref errno.h.
+ */
+int connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
+{
+    unsigned long keys[3] = { service, 0, 0 };
+    link_t *hlp;
+    hashed_service_t *hs;
+    hlp = hash_table_find(&ns_hash_table, keys);
+    if (!hlp) {
+        return ENOENT;
+    }
+    hs = hash_table_get_instance(hlp, hashed_service_t, link);
+    return ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+}
+/** Compute hash index into NS hash table.
+ *
+ * @param key Pointer keys. However, only the first key (i.e. service number)
+ *        is used to compute the hash index.
+ * @return Hash index corresponding to key[0].
+ */
+hash_index_t ns_hash(unsigned long *key)
+{
+    assert(key);
+    return *key % NS_HASH_TABLE_CHAINS;
+}
+/** Compare a key with hashed item.
+ *
+ * This compare function always ignores the third key.
+ * It exists only to make it possible to remove records
+ * originating from connection with key[1] in_phone_hash
+ * value. Note that this is close to being classified
+ * as a nasty hack.
+ *
+ * @param key Array of keys.
+ * @param keys Must be lesser or equal to 3.
+ * @param item Pointer to a hash table item.
+ * @return Non-zero if the key matches the item, zero otherwise.
+ */
+int ns_compare(unsigned long key[], hash_count_t keys, link_t *item)
+{
+    hashed_service_t *hs;
+    assert(key);
+    assert(keys <= 3);
+    assert(item);
+    hs = hash_table_get_instance(item, hashed_service_t, link);
+    if (keys == 2)
+        return key[1] == hs->in_phone_hash;
+    else
+        return key[0] == hs->service;
+}
+/** Perform actions after removal of item from the hash table.
+ *
+ * @param item Item that was removed from the hash table.
+ */
+void ns_remove(link_t *item)
+{
+    assert(item);
+    free(hash_table_get_instance(item, hashed_service_t, link));
+}
+/**
  * @}
  */

 /trunk/uspace/srv/ns/Makefile
 ,7 → 31,6
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,33 → 40,28
 OUTPUT = ns
 SOURCES = \
-    ns.c \
-    service.c \
-    clonable.c \
-    task.c
+    ns.c
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/fb/fb.c
 ,5 → 1,4
 /*
- * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
 ,10 → 29,10
 /**
  * @defgroup fb Graphical framebuffer
- * @brief HelenOS graphical framebuffer.
+ * @brief   HelenOS graphical framebuffer.
  * @ingroup fbs
  * @{
- */
+ */
 /** @file
  */
 ,13 → 50,8
 #include <ipc/services.h>
 #include <kernel/errno.h>
 #include <kernel/genarch/fb/visuals.h>
-#include <io/color.h>
-#include <io/style.h>
 #include <async.h>
-#include <fibril.h>
 #include <bool.h>
-#include <stdio.h>
-#include <byteorder.h>
 #include "font-8x16.h"
 #include "fb.h"
 ,865 → 62,574
 #include "pointer.xbm"
 #include "pointer_mask.xbm"
-#define DEFAULT_BGCOLOR  0xf0f0f0
-#define DEFAULT_FGCOLOR  0x000000
+#define DEFAULT_BGCOLOR                0xf0f0f0
+#define DEFAULT_FGCOLOR                0x0
-#define GLYPH_UNAVAIL    '?'
+/***************************************************************/
+/* Pixel specific fuctions */
-#define MAX_ANIM_LEN     8
-#define MAX_ANIMATIONS   4
-#define MAX_PIXMAPS      256  /**< Maximum number of saved pixmaps */
-#define MAX_VIEWPORTS    128  /**< Viewport is a rectangular area on the screen */
+typedef void (*conv2scr_fn_t)(void *, int);
+typedef int (*conv2rgb_fn_t)(void *);
-/** Function to render a pixel from a RGB value. */
-typedef void (*rgb_conv_t)(void *, uint32_t);
+struct {
+    uint8_t *fbaddress;
-/** Function to render a bit mask. */
-typedef void (*mask_conv_t)(void *, bool);
-/** Function to draw a glyph. */
-typedef void (*dg_t)(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
-struct {
-    uint8_t *fb_addr;
     unsigned int xres;
     unsigned int yres;
     unsigned int scanline;
-    unsigned int glyphscanline;
     unsigned int pixelbytes;
-    unsigned int glyphbytes;
-    /** Pre-rendered mask for rendering glyphs. Specific for the visual. */
-    uint8_t *glyphs;
-    rgb_conv_t rgb_conv;
-    mask_conv_t mask_conv;
+    unsigned int invert_colors;
+    conv2scr_fn_t rgb2scr;
+    conv2rgb_fn_t scr2rgb;
 } screen;
-/** Backbuffer character cell. */
 typedef struct {
-    uint32_t glyph;
-    uint32_t fg_color;
-    uint32_t bg_color;
-} bb_cell_t;
+    int initialized;
+    unsigned int x, y;
+    unsigned int width, height;
-typedef struct {
-    bool initialized;
-    unsigned int x;
-    unsigned int y;
-    unsigned int width;
-    unsigned int height;
     /* Text support in window */
-    unsigned int cols;
-    unsigned int rows;
-    /*
-     * Style and glyphs for text printing
-     */
-    /** Current attributes. */
-    attr_rgb_t attr;
-    uint8_t *bgpixel;
-    /**
-     * Glyph drawing function for this viewport.  Different viewports
-     * might use different drawing functions depending on whether their
-     * scanlines are aligned on a word boundary.
-     */
-    dg_t dglyph;
+    unsigned int rows, cols;
+    /* Style for text printing */
+    style_t style;
     /* Auto-cursor position */
-    bool cursor_active;
-    unsigned int cur_col;
-    unsigned int cur_row;
-    bool cursor_shown;
-    /* Back buffer */
-    bb_cell_t *backbuf;
-    unsigned int bbsize;
+    int cursor_active, cur_col, cur_row;
+    int cursor_shown;
+    /* Double buffering */
+    uint8_t *dbdata;
+    unsigned int dboffset;
+    unsigned int paused;
 } viewport_t;
+#define MAX_ANIM_LEN    8
+#define MAX_ANIMATIONS  4
 typedef struct {
-    bool initialized;
-    bool enabled;
+    int initialized;
+    int enabled;
     unsigned int vp;
     unsigned int pos;
     unsigned int animlen;
     unsigned int pixmaps[MAX_ANIM_LEN];
 } animation_t;
 static animation_t animations[MAX_ANIMATIONS];
-static bool anims_enabled;
+static int anims_enabled;
+/** Maximum number of saved pixmaps
+ * Pixmap is a saved rectangle
+ */
+#define MAX_PIXMAPS        256
 typedef struct {
     unsigned int width;
     unsigned int height;
     uint8_t *data;
 } pixmap_t;
+static pixmap_t pixmaps[MAX_PIXMAPS];
-static pixmap_t pixmaps[MAX_PIXMAPS];
+/* Viewport is a rectangular area on the screen */
+#define MAX_VIEWPORTS 128
 static viewport_t viewports[128];
-static bool client_connected = false;  /**< Allow only 1 connection */
+/* Allow only 1 connection */
+static int client_connected = 0;
-static uint32_t color_table[16] = {
-    [COLOR_BLACK]       = 0x000000,
-    [COLOR_BLUE]        = 0x0000f0,
-    [COLOR_GREEN]       = 0x00f000,
-    [COLOR_CYAN]        = 0x00f0f0,
-    [COLOR_RED]         = 0xf00000,
-    [COLOR_MAGENTA]     = 0xf000f0,
-    [COLOR_YELLOW]      = 0xf0f000,
-    [COLOR_WHITE]       = 0xf0f0f0,
-    [8 + COLOR_BLACK]   = 0x000000,
-    [8 + COLOR_BLUE]    = 0x0000ff,
-    [8 + COLOR_GREEN]   = 0x00ff00,
-    [8 + COLOR_CYAN]    = 0x00ffff,
-    [8 + COLOR_RED]     = 0xff0000,
-    [8 + COLOR_MAGENTA] = 0xff00ff,
-    [8 + COLOR_YELLOW]  = 0xffff00,
-    [8 + COLOR_WHITE]   = 0xffffff,
-};
+#define RED(x, bits)    ((x >> (16 + 8 - bits)) & ((1 << bits) - 1))
+#define GREEN(x, bits)  ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
+#define BLUE(x, bits)   ((x >> (8 - bits)) & ((1 << bits) - 1))
-static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
-static int rgb_from_style(attr_rgb_t *rgb, int style);
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags);
+#define COL_WIDTH   8
+#define ROW_BYTES   (screen.scanline * FONT_SCANLINES)
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t attr);
+#define POINTPOS(x, y)  ((y) * screen.scanline + (x) * screen.pixelbytes)
-static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
-static void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
+static inline int COLOR(int color)
+{
+    return screen.invert_colors ? ~color : color;
+}
-static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
-    unsigned int row);
-#define RED(x, bits)                 (((x) >> (8 + 8 + 8 - (bits))) & ((1 << (bits)) - 1))
-#define GREEN(x, bits)               (((x) >> (8 + 8 - (bits))) & ((1 << (bits)) - 1))
-#define BLUE(x, bits)                (((x) >> (8 - (bits))) & ((1 << (bits)) - 1))
-#define COL2X(col)                   ((col) * FONT_WIDTH)
-#define ROW2Y(row)                   ((row) * FONT_SCANLINES)
-#define X2COL(x)                     ((x) / FONT_WIDTH)
-#define Y2ROW(y)                     ((y) / FONT_SCANLINES)
-#define FB_POS(x, y)                 ((y) * screen.scanline + (x) * screen.pixelbytes)
-#define BB_POS(vport, col, row)      ((row) * vport->cols + (col))
-#define GLYPH_POS(glyph, y, cursor)  (((glyph) + (cursor) * FONT_GLYPHS) * screen.glyphbytes + (y) * screen.glyphscanline)
-/*
- * RGB conversion and mask functions.
- *
- * These functions write an RGB value to some memory in some predefined format.
- * The naming convention corresponds to the format created by these functions.
- * The functions use the so called network order (i.e. big endian) with respect
- * to their names.
- */
-static void rgb_0888(void *dst, uint32_t rgb)
+/* Conversion routines between different color representations */
+static void
+rgb_byte0888(void *dst, int rgb)
 {
-    *((uint32_t *) dst) = host2uint32_t_be((0 << 24) |
-        (RED(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | (BLUE(rgb, 8)));
+    *(int *)dst = rgb;
 }
-static void bgr_0888(void *dst, uint32_t rgb)
+static int
+byte0888_rgb(void *src)
 {
-    *((uint32_t *) dst) = host2uint32_t_be((0 << 24) |
-        (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | (RED(rgb, 8)));
+    return (*(int *)src) & 0xffffff;
 }
-static void mask_0888(void *dst, bool mask)
+static void
+bgr_byte0888(void *dst, int rgb)
 {
-    bgr_0888(dst, mask ? 0xffffff : 0);
+    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
+        RED(rgb, 8);
 }
-static void rgb_8880(void *dst, uint32_t rgb)
+static int
+byte0888_bgr(void *src)
 {
-    *((uint32_t *) dst) = host2uint32_t_be((RED(rgb, 8) << 24) |
-        (GREEN(rgb, 8) << 16) | (BLUE(rgb, 8) << 8) | 0);
+    int color = *(uint32_t *)(src);
+    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) |
+        ((color >> 16) & 0xff);
 }
-static void bgr_8880(void *dst, uint32_t rgb)
+static void
+rgb_byte888(void *dst, int rgb)
 {
-    *((uint32_t *) dst) = host2uint32_t_be((BLUE(rgb, 8) << 24) |
-        (GREEN(rgb, 8) << 16) | (RED(rgb, 8) << 8) | 0);
+    uint8_t *scr = dst;
+#if defined(FB_INVERT_ENDIAN)
+    scr[0] = RED(rgb, 8);
+    scr[1] = GREEN(rgb, 8);
+    scr[2] = BLUE(rgb, 8);
+#else
+    scr[2] = RED(rgb, 8);
+    scr[1] = GREEN(rgb, 8);
+    scr[0] = BLUE(rgb, 8);
+#endif
 }
-static void mask_8880(void *dst, bool mask)
+static int
+byte888_rgb(void *src)
 {
-    bgr_8880(dst, mask ? 0xffffff : 0);
+    uint8_t *scr = src;
+#if defined(FB_INVERT_ENDIAN)
+    return scr[0] << 16 | scr[1] << 8 | scr[2];
+#else
+    return scr[2] << 16 | scr[1] << 8 | scr[0];
+#endif
 }
-static void rgb_888(void *dst, uint32_t rgb)
+/**  16-bit depth (5:5:5) */
+static void
+rgb_byte555(void *dst, int rgb)
 {
-    ((uint8_t *) dst)[0] = RED(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
+    /* 5-bit, 5-bits, 5-bits */
+    *((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 |
+        BLUE(rgb, 5);
 }
-static void bgr_888(void *dst, uint32_t rgb)
+/** 16-bit depth (5:5:5) */
+static int
+byte555_rgb(void *src)
 {
-    ((uint8_t *) dst)[0] = BLUE(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = RED(rgb, 8);
+    int color = *(uint16_t *)(src);
+    return (((color >> 10) & 0x1f) << (16 + 3)) |
+        (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
 }
-static void mask_888(void *dst, bool mask)
+/**  16-bit depth (5:6:5) */
+static void
+rgb_byte565(void *dst, int rgb)
 {
-    bgr_888(dst, mask ? 0xffffff : 0);
+    /* 5-bit, 6-bits, 5-bits */
+    *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 |
+        BLUE(rgb, 5);
 }
-static void rgb_555_be(void *dst, uint32_t rgb)
+/** 16-bit depth (5:6:5) */
+static int
+byte565_rgb(void *src)
 {
-    *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 10 |
-        GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+    int color = *(uint16_t *)(src);
+    return (((color >> 11) & 0x1f) << (16 + 3)) |
+        (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
 }
-static void rgb_555_le(void *dst, uint32_t rgb)
+/** Put pixel - 8-bit depth (3:2:3) */
+static void
+rgb_byte8(void *dst, int rgb)
 {
-    *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 10 |
-        GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+    *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
 }
-static void rgb_565_be(void *dst, uint32_t rgb)
+/** Return pixel color - 8-bit depth (3:2:3) */
+static int
+byte8_rgb(void *src)
 {
-    *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 11 |
-        GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
+    int color = *(uint8_t *)src;
+    return (((color >> 5) & 0x7) << (16 + 5)) |
+        (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
 }
-static void rgb_565_le(void *dst, uint32_t rgb)
+/** Put pixel into viewport
+ *
+ * @param vport Viewport identification
+ * @param x X coord relative to viewport
+ * @param y Y coord relative to viewport
+ * @param color RGB color
+ */
+static void
+putpixel(viewport_t *vport, unsigned int x, unsigned int y, int color)
 {
-    *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 11 |
-        GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
+    int dx = vport->x + x;
+    int dy = vport->y + y;
+    if (! (vport->paused && vport->dbdata))
+        (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)],
+            COLOR(color));
+    if (vport->dbdata) {
+        int dline = (y + vport->dboffset) % vport->height;
+        int doffset = screen.pixelbytes * (dline * vport->width + x);
+        (*screen.rgb2scr)(&vport->dbdata[doffset], COLOR(color));
+    }
 }
-static void mask_555(void *dst, bool mask)
+/** Get pixel from viewport */
+static int
+getpixel(viewport_t *vport, unsigned int x, unsigned int y)
 {
-    rgb_555_be(dst, mask ? 0xffffff : 0);
+    int dx = vport->x + x;
+    int dy = vport->y + y;
+    return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx, dy)]));
 }
-static void mask_565(void *dst, bool mask)
+static inline void
+putpixel_mem(char *mem, unsigned int x, unsigned int y, int color)
 {
-    rgb_565_be(dst, mask ? 0xffffff : 0);
+    (*screen.rgb2scr)(&mem[POINTPOS(x, y)], COLOR(color));
 }
-static void bgr_323(void *dst, uint32_t rgb)
+static void
+draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy,
+    unsigned int width, unsigned int height, int color)
 {
-    *((uint8_t *) dst)
-        = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3));
+    unsigned int x, y;
+    static void *tmpline;
+    if (!tmpline)
+        tmpline = malloc(screen.scanline * screen.pixelbytes);
+    /* Clear first line */
+    for (x = 0; x < width; x++)
+        putpixel_mem(tmpline, x, 0, color);
+    if (!vport->paused) {
+        /* Recompute to screen coords */
+        sx += vport->x;
+        sy += vport->y;
+        /* Copy the rest */
+        for (y = sy;y < sy+height; y++)
+            memcpy(&screen.fbaddress[POINTPOS(sx,y)], tmpline,
+                screen.pixelbytes * width);
+    }
+    if (vport->dbdata) {
+        for (y = sy; y < sy + height; y++) {
+            int rline = (y + vport->dboffset) % vport->height;
+            int rpos = (rline * vport->width + sx) *
+                screen.pixelbytes;
+            memcpy(&vport->dbdata[rpos], tmpline,
+                screen.pixelbytes * width);
+        }
+    }
 }
-static void mask_323(void *dst, bool mask)
+/** Fill viewport with background color */
+static void
+clear_port(viewport_t *vport)
 {
-    bgr_323(dst, mask ? 0x0 : ~0x0);
+    draw_rectangle(vport, 0, 0, vport->width, vport->height,
+        vport->style.bg_color);
 }
-/** Draw a filled rectangle.
+/** Scroll unbuffered viewport up/down
  *
- * @note Need real implementation that does not access VRAM twice.
- *
+ * @param vport Viewport to scroll
+ * @param lines Positive number - scroll up, negative - scroll down
  */
-static void draw_filled_rect(unsigned int x0, unsigned int y0, unsigned int x1,
-    unsigned int y1, uint32_t color)
+static void
+scroll_port_nodb(viewport_t *vport, int lines)
 {
-    unsigned int x;
-    unsigned int y;
-    unsigned int copy_bytes;
-    uint8_t *sp;
-    uint8_t *dp;
-    uint8_t cbuf[4];
-    if ((y0 >= y1) || (x0 >= x1))
-        return;
-    screen.rgb_conv(cbuf, color);
-    sp = &screen.fb_addr[FB_POS(x0, y0)];
-    dp = sp;
-    /* Draw the first line. */
-    for (x = x0; x < x1; x++) {
-        memcpy(dp, cbuf, screen.pixelbytes);
-        dp += screen.pixelbytes;
+    int y;
+    if (lines > 0) {
+        for (y = vport->y; y < vport->y+vport->height - lines; y++)
+            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
+                &screen.fbaddress[POINTPOS(vport->x,y + lines)],
+                screen.pixelbytes * vport->width);
+        draw_rectangle(vport, 0, vport->height - lines, vport->width,
+            lines, vport->style.bg_color);
+    } else if (lines < 0) {
+        lines = -lines;
+        for (y = vport->y + vport->height-1; y >= vport->y + lines; y--)
+            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
+                &screen.fbaddress[POINTPOS(vport->x,y - lines)],
+                screen.pixelbytes * vport->width);
+        draw_rectangle(vport, 0, 0, vport->width, lines,
+            vport->style.bg_color);
     }
-    dp = sp + screen.scanline;
-    copy_bytes = (x1 - x0) * screen.pixelbytes;
-    /* Draw the remaining lines by copying. */
-    for (y = y0 + 1; y < y1; y++) {
-        memcpy(dp, sp, copy_bytes);
-        dp += screen.scanline;
+}
+/** Refresh given viewport from double buffer */
+static void
+refresh_viewport_db(viewport_t *vport)
+{
+    unsigned int y, srcy, srcoff, dsty, dstx;
+    for (y = 0; y < vport->height; y++) {
+        srcy = (y + vport->dboffset) % vport->height;
+        srcoff = (vport->width * srcy) * screen.pixelbytes;
+        dstx = vport->x;
+        dsty = vport->y + y;
+        memcpy(&screen.fbaddress[POINTPOS(dstx,dsty)],
+            &vport->dbdata[srcoff], vport->width * screen.pixelbytes);
     }
 }
-/** Redraw viewport.
- *
- * @param vport Viewport to redraw
- *
- */
-static void vport_redraw(viewport_t *vport)
+/** Scroll viewport that has double buffering enabled */
+static void
+scroll_port_db(viewport_t *vport, int lines)
 {
-    unsigned int col;
-    unsigned int row;
-    for (row = 0; row < vport->rows; row++) {
-        for (col = 0; col < vport->cols; col++) {
-            draw_vp_glyph(vport, false, col, row);
-        }
+    ++vport->paused;
+    if (lines > 0) {
+        draw_rectangle(vport, 0, 0, vport->width, lines,
+            vport->style.bg_color);
+        vport->dboffset += lines;
+        vport->dboffset %= vport->height;
+    } else if (lines < 0) {
+        lines = -lines;
+        draw_rectangle(vport, 0, vport->height-lines, vport->width,
+            lines, vport->style.bg_color);
+        if (vport->dboffset < lines)
+            vport->dboffset += vport->height;
+        vport->dboffset -= lines;
     }
-    if (COL2X(vport->cols) < vport->width) {
-        draw_filled_rect(
-            vport->x + COL2X(vport->cols), vport->y,
-            vport->x + vport->width, vport->y + vport->height,
-            vport->attr.bg_color);
-    }
+    --vport->paused;
-    if (ROW2Y(vport->rows) < vport->height) {
-        draw_filled_rect(
-            vport->x, vport->y + ROW2Y(vport->rows),
-            vport->x + vport->width, vport->y + vport->height,
-            vport->attr.bg_color);
-    }
+    refresh_viewport_db(vport);
 }
-static void backbuf_clear(bb_cell_t *backbuf, size_t len, uint32_t fg_color,
-    uint32_t bg_color)
+/** Scrolls viewport given number of lines */
+static void
+scroll_port(viewport_t *vport, int lines)
 {
-    size_t i;
+    if (vport->dbdata)
+        scroll_port_db(vport, lines);
+    else
+        scroll_port_nodb(vport, lines);
-    for (i = 0; i < len; i++) {
-        backbuf[i].glyph = 0;
-        backbuf[i].fg_color = fg_color;
-        backbuf[i].bg_color = bg_color;
-    }
 }
-/** Clear viewport.
- *
- * @param vport Viewport to clear
- *
- */
-static void vport_clear(viewport_t *vport)
+static void
+invert_pixel(viewport_t *vport, unsigned int x, unsigned int y)
 {
-    backbuf_clear(vport->backbuf, vport->cols * vport->rows,
-        vport->attr.fg_color, vport->attr.bg_color);
-    vport_redraw(vport);
+    putpixel(vport, x, y, ~getpixel(vport, x, y));
 }
-/** Scroll viewport by the specified number of lines.
+/***************************************************************/
+/* Character-console functions */
+/** Draw character at given position
  *
- * @param vport Viewport to scroll
- * @param lines Number of lines to scroll
- *
+ * @param vport Viewport where the character is printed
+ * @param sx Coordinates of top-left of the character
+ * @param sy Coordinates of top-left of the character
+ * @param style Color of the character
+ * @param transparent If false, print background color
  */
-static void vport_scroll(viewport_t *vport, int lines)
+static void
+draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy,
+    style_t style, int transparent)
 {
-    unsigned int col;
-    unsigned int row;
-    unsigned int x;
+    int i;
     unsigned int y;
-    uint32_t glyph;
-    uint32_t fg_color;
-    uint32_t bg_color;
-    bb_cell_t *bbp;
-    bb_cell_t *xbp;
-    /*
-     * Redraw.
-     */
-    y = vport->y;
-    for (row = 0; row < vport->rows; row++) {
-        x = vport->x;
-        for (col = 0; col < vport->cols; col++) {
-            if (((int) row + lines >= 0) &&
-                ((int) row + lines < (int) vport->rows)) {
-                xbp = &vport->backbuf[BB_POS(vport, col, row + lines)];
-                bbp = &vport->backbuf[BB_POS(vport, col, row)];
-                glyph = xbp->glyph;
-                fg_color = xbp->fg_color;
-                bg_color = xbp->bg_color;
-                if ((bbp->glyph == glyph)
-                   && (bbp->fg_color == xbp->fg_color)
-                   && (bbp->bg_color == xbp->bg_color)) {
-                    x += FONT_WIDTH;
-                    continue;
-                }
-            } else {
-                glyph = 0;
-                fg_color = vport->attr.fg_color;
-                bg_color = vport->attr.bg_color;
-            }
-            (*vport->dglyph)(x, y, false, screen.glyphs, glyph,
-                fg_color, bg_color);
-            x += FONT_WIDTH;
+    unsigned int glline;
+    for (y = 0; y < FONT_SCANLINES; y++) {
+        glline = fb_font[glyph * FONT_SCANLINES + y];
+        for (i = 0; i < 8; i++) {
+            if (glline & (1 << (7 - i)))
+                putpixel(vport, sx + i, sy + y, style.fg_color);
+            else if (!transparent)
+                putpixel(vport, sx + i, sy + y, style.bg_color);
         }
-        y += FONT_SCANLINES;
     }
-    /*
-     * Scroll backbuffer.
-     */
-    if (lines > 0) {
-        memmove(vport->backbuf, vport->backbuf + vport->cols * lines,
-            vport->cols * (vport->rows - lines) * sizeof(bb_cell_t));
-        backbuf_clear(&vport->backbuf[BB_POS(vport, 0, vport->rows - lines)],
-            vport->cols * lines, vport->attr.fg_color, vport->attr.bg_color);
-    } else {
-        memmove(vport->backbuf - vport->cols * lines, vport->backbuf,
-            vport->cols * (vport->rows + lines) * sizeof(bb_cell_t));
-        backbuf_clear(vport->backbuf, - vport->cols * lines,
-            vport->attr.fg_color, vport->attr.bg_color);
-    }
 }
-/** Render glyphs
- *
- * Convert glyphs from device independent font
- * description to current visual representation.
- *
- */
-static void render_glyphs(void)
+/** Invert character at given position */
+static void
+invert_char(viewport_t *vport,unsigned int row, unsigned int col)
 {
-    unsigned int glyph;
-    for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
-        unsigned int y;
-        for (y = 0; y < FONT_SCANLINES; y++) {
-            unsigned int x;
-            for (x = 0; x < FONT_WIDTH; x++) {
-                screen.mask_conv(&screen.glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
-                    (fb_font[glyph][y] & (1 << (7 - x))) ? true : false);
-                screen.mask_conv(&screen.glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
-                    (fb_font[glyph][y] & (1 << (7 - x))) ? false : true);
-            }
-        }
-    }
+    unsigned int x;
+    unsigned int y;
+    for (x = 0; x < COL_WIDTH; x++)
+        for (y = 0; y < FONT_SCANLINES; y++)
+            invert_pixel(vport, col * COL_WIDTH + x, row *
+                FONT_SCANLINES + y);
 }
+/***************************************************************/
+/* Stdout specific functions */
 /** Create new viewport
  *
- * @param x      Origin of the viewport (x).
- * @param y      Origin of the viewport (y).
- * @param width  Width of the viewport.
- * @param height Height of the viewport.
- *
- * @return New viewport number.
- *
+ * @return New viewport number
  */
-static int vport_create(unsigned int x, unsigned int y,
-    unsigned int width, unsigned int height)
+static int
+viewport_create(unsigned int x, unsigned int y,unsigned int width,
+    unsigned int height)
 {
-    unsigned int i;
+    int i;
     for (i = 0; i < MAX_VIEWPORTS; i++) {
         if (!viewports[i].initialized)
             break;
     }
     if (i == MAX_VIEWPORTS)
         return ELIMIT;
-    unsigned int cols = width / FONT_WIDTH;
-    unsigned int rows = height / FONT_SCANLINES;
-    unsigned int bbsize = cols * rows * sizeof(bb_cell_t);
-    unsigned int word_size = sizeof(unsigned long);
-    bb_cell_t *backbuf = (bb_cell_t *) malloc(bbsize);
-    if (!backbuf)
-        return ENOMEM;
-    uint8_t *bgpixel = (uint8_t *) malloc(screen.pixelbytes);
-    if (!bgpixel) {
-        free(backbuf);
-        return ENOMEM;
-    }
-    backbuf_clear(backbuf, cols * rows, DEFAULT_FGCOLOR, DEFAULT_BGCOLOR);
-    memset(bgpixel, 0, screen.pixelbytes);
     viewports[i].x = x;
     viewports[i].y = y;
     viewports[i].width = width;
     viewports[i].height = height;
-    viewports[i].cols = cols;
-    viewports[i].rows = rows;
+    viewports[i].rows = height / FONT_SCANLINES;
+    viewports[i].cols = width / COL_WIDTH;
+    viewports[i].style.bg_color = DEFAULT_BGCOLOR;
+    viewports[i].style.fg_color = DEFAULT_FGCOLOR;
-    viewports[i].attr.bg_color = DEFAULT_BGCOLOR;
-    viewports[i].attr.fg_color = DEFAULT_FGCOLOR;
-    viewports[i].bgpixel = bgpixel;
-    /*
-     * Conditions necessary to select aligned version:
-     *  - word size is divisible by pixelbytes
-     *  - cell scanline size is divisible by word size
-     *  - cell scanlines are word-aligned
-     *
-     */
-    if (((word_size % screen.pixelbytes) == 0)
-        && ((FONT_WIDTH * screen.pixelbytes) % word_size == 0)
-        && ((x * screen.pixelbytes) % word_size == 0)
-        && (screen.scanline % word_size == 0)) {
-        viewports[i].dglyph = draw_glyph_aligned;
-    } else {
-        viewports[i].dglyph = draw_glyph_fallback;
-    }
     viewports[i].cur_col = 0;
     viewports[i].cur_row = 0;
-    viewports[i].cursor_active = false;
-    viewports[i].cursor_shown = false;
-    viewports[i].bbsize = bbsize;
-    viewports[i].backbuf = backbuf;
-    viewports[i].initialized = true;
-    screen.rgb_conv(viewports[i].bgpixel, viewports[i].attr.bg_color);
+    viewports[i].cursor_active = 0;
+    viewports[i].initialized = 1;
     return i;
 }
 /** Initialize framebuffer as a chardev output device
  *
- * @param addr   Address of the framebuffer
- * @param xres   Screen width in pixels
- * @param yres   Screen height in pixels
- * @param visual Bits per pixel (8, 16, 24, 32)
- * @param scan   Bytes per one scanline
+ * @param addr          Address of theframebuffer
+ * @param xres          Screen width in pixels
+ * @param yres          Screen height in pixels
+ * @param visual        Bits per pixel (8, 16, 24, 32)
+ * @param scan          Bytes per one scanline
+ * @param invert_colors Inverted colors.
  *
  */
-static bool screen_init(void *addr, unsigned int xres, unsigned int yres,
-    unsigned int scan, unsigned int visual)
+static bool
+screen_init(void *addr, unsigned int xres, unsigned int yres,
+    unsigned int scan, unsigned int visual, bool invert_colors)
 {
     switch (visual) {
     case VISUAL_INDIRECT_8:
-        screen.rgb_conv = bgr_323;
-        screen.mask_conv = mask_323;
+        screen.rgb2scr = rgb_byte8;
+        screen.scr2rgb = byte8_rgb;
         screen.pixelbytes = 1;
         break;
-    case VISUAL_RGB_5_5_5_LE:
-        screen.rgb_conv = rgb_555_le;
-        screen.mask_conv = mask_555;
+    case VISUAL_RGB_5_5_5:
+        screen.rgb2scr = rgb_byte555;
+        screen.scr2rgb = byte555_rgb;
         screen.pixelbytes = 2;
         break;
-    case VISUAL_RGB_5_5_5_BE:
-        screen.rgb_conv = rgb_555_be;
-        screen.mask_conv = mask_555;
+    case VISUAL_RGB_5_6_5:
+        screen.rgb2scr = rgb_byte565;
+        screen.scr2rgb = byte565_rgb;
         screen.pixelbytes = 2;
         break;
-    case VISUAL_RGB_5_6_5_LE:
-        screen.rgb_conv = rgb_565_le;
-        screen.mask_conv = mask_565;
-        screen.pixelbytes = 2;
-        break;
-    case VISUAL_RGB_5_6_5_BE:
-        screen.rgb_conv = rgb_565_be;
-        screen.mask_conv = mask_565;
-        screen.pixelbytes = 2;
-        break;
     case VISUAL_RGB_8_8_8:
-        screen.rgb_conv = rgb_888;
-        screen.mask_conv = mask_888;
+        screen.rgb2scr = rgb_byte888;
+        screen.scr2rgb = byte888_rgb;
         screen.pixelbytes = 3;
         break;
-    case VISUAL_BGR_8_8_8:
-        screen.rgb_conv = bgr_888;
-        screen.mask_conv = mask_888;
-        screen.pixelbytes = 3;
-        break;
     case VISUAL_RGB_8_8_8_0:
-        screen.rgb_conv = rgb_8880;
-        screen.mask_conv = mask_8880;
+        screen.rgb2scr = rgb_byte888;
+        screen.scr2rgb = byte888_rgb;
         screen.pixelbytes = 4;
         break;
     case VISUAL_RGB_0_8_8_8:
-        screen.rgb_conv = rgb_0888;
-        screen.mask_conv = mask_0888;
+        screen.rgb2scr = rgb_byte0888;
+        screen.scr2rgb = byte0888_rgb;
         screen.pixelbytes = 4;
         break;
     case VISUAL_BGR_0_8_8_8:
-        screen.rgb_conv = bgr_0888;
-        screen.mask_conv = mask_0888;
+        screen.rgb2scr = bgr_byte0888;
+        screen.scr2rgb = byte0888_bgr;
         screen.pixelbytes = 4;
         break;
-    case VISUAL_BGR_8_8_8_0:
-        screen.rgb_conv = bgr_8880;
-        screen.mask_conv = mask_8880;
-        screen.pixelbytes = 4;
-        break;
     default:
         return false;
     }
-    screen.fb_addr = (unsigned char *) addr;
+    screen.fbaddress = (unsigned char *) addr;
     screen.xres = xres;
     screen.yres = yres;
     screen.scanline = scan;
+    screen.invert_colors = invert_colors;
-    screen.glyphscanline = FONT_WIDTH * screen.pixelbytes;
-    screen.glyphbytes = screen.glyphscanline * FONT_SCANLINES;
-    size_t glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
-    uint8_t *glyphs = (uint8_t *) malloc(glyphsize);
-    if (!glyphs)
-        return false;
-    memset(glyphs, 0, glyphsize);
-    screen.glyphs = glyphs;
-    render_glyphs();
     /* Create first viewport */
-    vport_create(0, 0, xres, yres);
+    viewport_create(0, 0, xres, yres);
     return true;
 }
-/** Draw a glyph, takes advantage of alignment.
- *
- * This version can only be used if the following conditions are met:
- *
- *   - word size is divisible by pixelbytes
- *   - cell scanline size is divisible by word size
- *   - cell scanlines are word-aligned
- *
- * It makes use of the pre-rendered mask to process (possibly) several
- * pixels at once (word size / pixelbytes pixels at a time are processed)
- * making it very fast. Most notably this version is not applicable at 24 bits
- * per pixel.
- *
- * @param x        x coordinate of top-left corner on screen.
- * @param y        y coordinate of top-left corner on screen.
- * @param cursor   Draw glyph with cursor
- * @param glyphs   Pointer to font bitmap.
- * @param glyph    Code of the glyph to draw.
- * @param fg_color Foreground color.
- * @param bg_color Backgroudn color.
- *
- */
-static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color)
+/** Hide cursor if it is shown */
+static void
+cursor_hide(viewport_t *vport)
 {
-    unsigned int i;
-    unsigned int yd;
-    unsigned long fg_buf;
-    unsigned long bg_buf;
-    unsigned long mask;
-    /*
-     * Prepare a pair of words, one filled with foreground-color
-     * pattern and the other filled with background-color pattern.
-     */
-    for (i = 0; i < sizeof(unsigned long) / screen.pixelbytes; i++) {
-        screen.rgb_conv(&((uint8_t *) &fg_buf)[i * screen.pixelbytes],
-            fg_color);
-        screen.rgb_conv(&((uint8_t *) &bg_buf)[i * screen.pixelbytes],
-            bg_color);
+    if (vport->cursor_active && vport->cursor_shown) {
+        invert_char(vport, vport->cur_row, vport->cur_col);
+        vport->cursor_shown = 0;
     }
-    /* Pointer to the current position in the mask. */
-    unsigned long *maskp = (unsigned long *) &glyphs[GLYPH_POS(glyph, 0, cursor)];
-    /* Pointer to the current position on the screen. */
-    unsigned long *dp = (unsigned long *) &screen.fb_addr[FB_POS(x, y)];
-    /* Width of the character cell in words. */
-    unsigned int ww = FONT_WIDTH * screen.pixelbytes / sizeof(unsigned long);
-    /* Offset to add when moving to another screen scanline. */
-    unsigned int d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
-    for (yd = 0; yd < FONT_SCANLINES; yd++) {
-        /*
-         * Now process the cell scanline, combining foreground
-         * and background color patters using the pre-rendered mask.
-         */
-        for (i = 0; i < ww; i++) {
-            mask = *maskp++;
-            *dp++ = (fg_buf & mask) | (bg_buf & ~mask);
-        }
-        /* Move to the beginning of the next scanline of the cell. */
-        dp = (unsigned long *) ((uint8_t *) dp + d_add);
-    }
 }
-/** Draw a glyph, fallback version.
- *
- * This version does not make use of the pre-rendered mask, it uses
- * the font bitmap directly. It works always, but it is slower.
- *
- * @param x        x coordinate of top-left corner on screen.
- * @param y        y coordinate of top-left corner on screen.
- * @param cursor   Draw glyph with cursor
- * @param glyphs   Pointer to font bitmap.
- * @param glyph    Code of the glyph to draw.
- * @param fg_color Foreground color.
- * @param bg_color Backgroudn color.
- *
- */
-void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color)
+/** Show cursor if cursor showing is enabled */
+static void
+cursor_print(viewport_t *vport)
 {
-    unsigned int i;
-    unsigned int j;
-    unsigned int yd;
-    uint8_t fg_buf[4];
-    uint8_t bg_buf[4];
-    uint8_t *sp;
-    uint8_t b;
-    /* Pre-render 1x the foreground and background color pixels. */
-    if (cursor) {
-        screen.rgb_conv(fg_buf, bg_color);
-        screen.rgb_conv(bg_buf, fg_color);
-    } else {
-        screen.rgb_conv(fg_buf, fg_color);
-        screen.rgb_conv(bg_buf, bg_color);
-    }
-    /* Pointer to the current position on the screen. */
-    uint8_t *dp = (uint8_t *) &screen.fb_addr[FB_POS(x, y)];
-    /* Offset to add when moving to another screen scanline. */
-    unsigned int d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
-    for (yd = 0; yd < FONT_SCANLINES; yd++) {
-        /* Byte containing bits of the glyph scanline. */
-        b = fb_font[glyph][yd];
-        for (i = 0; i < FONT_WIDTH; i++) {
-            /* Choose color based on the current bit. */
-            sp = (b & 0x80) ? fg_buf : bg_buf;
-            /* Copy the pixel. */
-            for (j = 0; j < screen.pixelbytes; j++) {
-                *dp++ = *sp++;
-            }
-            /* Move to the next bit. */
-            b = b << 1;
-        }
-        /* Move to the beginning of the next scanline of the cell. */
-        dp += d_add;
-    }
-}
-/** Draw glyph at specified position in viewport.
- *
- * @param vport  Viewport identification
- * @param cursor Draw glyph with cursor
- * @param col    Screen position relative to viewport
- * @param row    Screen position relative to viewport
- *
- */
-static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
-    unsigned int row)
-{
-    unsigned int x = vport->x + COL2X(col);
-    unsigned int y = vport->y + ROW2Y(row);
-    uint32_t glyph = vport->backbuf[BB_POS(vport, col, row)].glyph;
-    uint32_t fg_color = vport->backbuf[BB_POS(vport, col, row)].fg_color;
-    uint32_t bg_color = vport->backbuf[BB_POS(vport, col, row)].bg_color;
-    (*vport->dglyph)(x, y, cursor, screen.glyphs, glyph,
-        fg_color, bg_color);
-}
-/** Hide cursor if it is shown
- *
- */
-static void cursor_hide(viewport_t *vport)
-{
-    if ((vport->cursor_active) && (vport->cursor_shown)) {
-        draw_vp_glyph(vport, false, vport->cur_col, vport->cur_row);
-        vport->cursor_shown = false;
-    }
-}
-/** Show cursor if cursor showing is enabled
- *
- */
-static void cursor_show(viewport_t *vport)
-{
     /* Do not check for cursor_shown */
     if (vport->cursor_active) {
-        draw_vp_glyph(vport, true, vport->cur_col, vport->cur_row);
-        vport->cursor_shown = true;
+        invert_char(vport, vport->cur_row, vport->cur_col);
+        vport->cursor_shown = 1;
     }
 }
-/** Invert cursor, if it is enabled
- *
- */
-static void cursor_blink(viewport_t *vport)
+/** Invert cursor, if it is enabled */
+static void
+cursor_blink(viewport_t *vport)
 {
     if (vport->cursor_shown)
         cursor_hide(vport);
     else
-        cursor_show(vport);
+        cursor_print(vport);
 }
-/** Draw character at given position relative to viewport
- *
- * @param vport  Viewport identification
- * @param c      Character to draw
- * @param col    Screen position relative to viewport
- * @param row    Screen position relative to viewport
- *
+/** Draw character at given position relative to viewport
+ *
+ * @param vport Viewport identification
+ * @param c Character to print
+ * @param row Screen position relative to viewport
+ * @param col Screen position relative to viewport
+ * @param transparent If false, print background color with character
  */
-static void draw_char(viewport_t *vport, wchar_t c, unsigned int col, unsigned int row)
+static void
+draw_char(viewport_t *vport, char c, unsigned int row, unsigned int col,
+    style_t style, int transparent)
 {
-    bb_cell_t *bbp;
+    /* Optimize - do not hide cursor if we are going to overwrite it */
+    if (vport->cursor_active && vport->cursor_shown &&
+        (vport->cur_col != col || vport->cur_row != row))
+        invert_char(vport, vport->cur_row, vport->cur_col);
-    /* Do not hide cursor if we are going to overwrite it */
-    if ((vport->cursor_active) && (vport->cursor_shown) &&
-        ((vport->cur_col != col) || (vport->cur_row != row)))
-        cursor_hide(vport);
-    bbp = &vport->backbuf[BB_POS(vport, col, row)];
-    bbp->glyph = fb_font_glyph(c);
-    bbp->fg_color = vport->attr.fg_color;
-    bbp->bg_color = vport->attr.bg_color;
-    draw_vp_glyph(vport, false, col, row);
+    draw_glyph(vport, c, col * COL_WIDTH, row * FONT_SCANLINES, style,
+        transparent);
     vport->cur_col = col;
     vport->cur_row = row;
     vport->cur_col++;
     if (vport->cur_col >= vport->cols) {
         vport->cur_col = 0;
 ,97 → 637,65
         if (vport->cur_row >= vport->rows)
             vport->cur_row--;
     }
-    cursor_show(vport);
+    cursor_print(vport);
 }
-/** Draw text data to viewport.
+/** Draw text data to viewport
  *
  * @param vport Viewport id
- * @param data  Text data.
- * @param x     Leftmost column of the area.
- * @param y     Topmost row of the area.
- * @param w     Number of rows.
- * @param h     Number of columns.
- *
+ * @param data Text data fitting exactly into viewport
  */
-static void draw_text_data(viewport_t *vport, keyfield_t *data, unsigned int x,
-    unsigned int y, unsigned int w, unsigned int h)
+static void
+draw_text_data(viewport_t *vport, keyfield_t *data)
 {
-    unsigned int i;
-    unsigned int j;
-    bb_cell_t *bbp;
-    attrs_t *a;
-    attr_rgb_t rgb;
-    for (j = 0; j < h; j++) {
-        for (i = 0; i < w; i++) {
-            unsigned int col = x + i;
-            unsigned int row = y + j;
-            bbp = &vport->backbuf[BB_POS(vport, col, row)];
-            a = &data[j * w + i].attrs;
-            rgb_from_attr(&rgb, a);
-            bbp->glyph = fb_font_glyph(data[j * w + i].character);
-            bbp->fg_color = rgb.fg_color;
-            bbp->bg_color = rgb.bg_color;
-            draw_vp_glyph(vport, false, col, row);
-        }
+    int i;
+    int col,row;
+    clear_port(vport);
+    for (i = 0; i < vport->cols * vport->rows; i++) {
+        if (data[i].character == ' ' && style_same(data[i].style,
+            vport->style))
+            continue;
+        col = i % vport->cols;
+        row = i / vport->cols;
+        draw_glyph(vport, data[i].character, col * COL_WIDTH, row *
+            FONT_SCANLINES, data[i].style, style_same(data[i].style,
+            vport->style));
     }
-    cursor_show(vport);
+    cursor_print(vport);
 }
-static void putpixel_pixmap(void *data, unsigned int x, unsigned int y, uint32_t color)
+/** Return first free pixmap */
+static int
+find_free_pixmap(void)
 {
-    int pm = *((int *) data);
-    pixmap_t *pmap = &pixmaps[pm];
-    unsigned int pos = (y * pmap->width + x) * screen.pixelbytes;
+    int i;
-    screen.rgb_conv(&pmap->data[pos], color);
+    for (i = 0;i < MAX_PIXMAPS;i++)
+        if (!pixmaps[i].data)
+            return i;
+    return -1;
 }
-static void putpixel(void *data, unsigned int x, unsigned int y, uint32_t color)
+static void
+putpixel_pixmap(int pm, unsigned int x, unsigned int y, int color)
 {
-    viewport_t *vport = (viewport_t *) data;
-    unsigned int dx = vport->x + x;
-    unsigned int dy = vport->y + y;
-    screen.rgb_conv(&screen.fb_addr[FB_POS(dx, dy)], color);
-}
+    pixmap_t *pmap = &pixmaps[pm];
+    int pos = (y * pmap->width + x) * screen.pixelbytes;
-/** Return first free pixmap
- *
- */
-static int find_free_pixmap(void)
-{
-    unsigned int i;
-    for (i = 0; i < MAX_PIXMAPS; i++)
-        if (!pixmaps[i].data)
-            return i;
-    return -1;
+    (*screen.rgb2scr)(&pmap->data[pos],COLOR(color));
 }
-/** Create a new pixmap and return appropriate ID
- *
- */
-static int shm2pixmap(unsigned char *shm, size_t size)
+/** Create a new pixmap and return appropriate ID */
+static int
+shm2pixmap(unsigned char *shm, size_t size)
 {
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
     pmap = &pixmaps[pm];
     if (ppm_get_data(shm, size, &pmap->width, &pmap->height))
 ,19 → 704,19
     pmap->data = malloc(pmap->width * pmap->height * screen.pixelbytes);
     if (!pmap->data)
         return ENOMEM;
-    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height, putpixel_pixmap, (void *) &pm);
+    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height,
+        (putpixel_cb_t)putpixel_pixmap, (void *)pm);
     return pm;
 }
 /** Handle shared memory communication calls
  *
  * Protocol for drawing pixmaps:
  * - FB_PREPARE_SHM(client shm identification)
  * - IPC_M_AS_AREA_SEND
- * - FB_DRAW_PPM(startx, starty)
+ * - FB_DRAW_PPM(startx,starty)
  * - FB_DROP_SHM
  *
  * Protocol for text drawing
 ,32 → 724,28
  * - FB_DRAW_TEXT_DATA
  *
  * @param callid Callid of the current call
- * @param call   Current call data
- * @param vp     Active viewport
+ * @param call Current call data
+ * @param vp Active viewport
+ * @return 0 if the call was not handled byt this function, 1 otherwise
  *
- * @return false if the call was not handled byt this function, true otherwise
- *
- * Note: this function is not thread-safe, you would have
- * to redefine static variables with fibril_local.
- *
+ * note: this function is not threads safe, you would have
+ * to redefine static variables with __thread
  */
-static bool shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static int
+shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
 {
     static keyfield_t *interbuffer = NULL;
     static size_t intersize = 0;
     static unsigned char *shm = NULL;
     static ipcarg_t shm_id = 0;
     static size_t shm_size;
-    bool handled = true;
-    int retval = EOK;
+    int handled = 1;
+    int retval = 0;
     viewport_t *vport = &viewports[vp];
-    unsigned int x;
-    unsigned int y;
-    unsigned int w;
-    unsigned int h;
+    unsigned int x, y;
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_SHARE_OUT:
         /* We accept one area for data interchange */
 ,21 → 752,19
         if (IPC_GET_ARG1(*call) == shm_id) {
             void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
             shm_size = IPC_GET_ARG2(*call);
-            if (ipc_answer_1(callid, EOK, (sysarg_t) dest)) {
+            if (!ipc_answer_1(callid, EOK, (sysarg_t) dest))
+                shm = dest;
+            else
                 shm_id = 0;
-                return false;
-            }
-            shm = dest;
             if (shm[0] != 'P')
-                return false;
-            return true;
+                while (1)
+                    ;
+            return 1;
         } else {
             intersize = IPC_GET_ARG2(*call);
             receive_comm_area(callid, call, (void *) &interbuffer);
         }
-        return true;
+        return 1;
     case FB_PREPARE_SHM:
         if (shm_id)
             retval = EBUSY;
 ,7 → 779,7
         }
         shm_id = 0;
         break;
     case FB_SHM2PIXMAP:
         if (!shm) {
             retval = EINVAL;
 ,36 → 794,29
         }
         x = IPC_GET_ARG1(*call);
         y = IPC_GET_ARG2(*call);
-        if ((x > vport->width) || (y > vport->height)) {
+        if (x > vport->width || y > vport->height) {
             retval = EINVAL;
             break;
         }
         ppm_draw(shm, shm_size, IPC_GET_ARG1(*call),
-            IPC_GET_ARG2(*call), vport->width - x, vport->height - y, putpixel, (void *) vport);
+            IPC_GET_ARG2(*call), vport->width - x, vport->height - y,
+            (putpixel_cb_t)putpixel, vport);
         break;
     case FB_DRAW_TEXT_DATA:
-        x = IPC_GET_ARG1(*call);
-        y = IPC_GET_ARG2(*call);
-        w = IPC_GET_ARG3(*call);
-        h = IPC_GET_ARG4(*call);
         if (!interbuffer) {
             retval = EINVAL;
             break;
         }
-        if (x + w > vport->cols || y + h > vport->rows) {
+        if (intersize < vport->cols * vport->rows *
+            sizeof(*interbuffer)) {
             retval = EINVAL;
             break;
         }
-        if (intersize < w * h * sizeof(*interbuffer)) {
-            retval = EINVAL;
-            break;
-        }
-        draw_text_data(vport, interbuffer, x, y, w, h);
+        draw_text_data(vport, interbuffer);
         break;
     default:
-        handled = false;
+        handled = 0;
     }
     if (handled)
 ,39 → 824,41
     return handled;
 }
+static void
+copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
+{
+    int y;
+    int tmp, srcrowsize;
+    int realwidth, realheight, realrowsize;
+    int width = vport->width;
+    int height = vport->height;
-static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
-{
-    unsigned int width = vport->width;
-    unsigned int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
-    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
-    unsigned int realheight = pmap->height <= height ? pmap->height : height;
+    realwidth = pmap->width <= width ? pmap->width : width;
+    realheight = pmap->height <= height ? pmap->height : height;
+    srcrowsize = vport->width * screen.pixelbytes;
+    realrowsize = realwidth * screen.pixelbytes;
-    unsigned int srcrowsize = vport->width * screen.pixelbytes;
-    unsigned int realrowsize = realwidth * screen.pixelbytes;
-    unsigned int y;
     for (y = 0; y < realheight; y++) {
-        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-        memcpy(pmap->data + srcrowsize * y, screen.fb_addr + tmp, realrowsize);
+        tmp = (vport->y + y) * screen.scanline +
+            vport->x * screen.pixelbytes;
+        memcpy(pmap->data + srcrowsize * y, screen.fbaddress + tmp,
+            realrowsize);
     }
 }
-/** Save viewport to pixmap
- *
- */
-static int save_vp_to_pixmap(viewport_t *vport)
+/** Save viewport to pixmap */
+static int
+save_vp_to_pixmap(viewport_t *vport)
 {
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
 ,60 → 867,58
     pmap->data = malloc(screen.pixelbytes * vport->width * vport->height);
     if (!pmap->data)
         return ENOMEM;
     pmap->width = vport->width;
     pmap->height = vport->height;
     copy_vp_to_pixmap(vport, pmap);
     return pm;
 }
 /** Draw pixmap on screen
  *
  * @param vp Viewport to draw on
  * @param pm Pixmap identifier
- *
  */
 static int draw_pixmap(int vp, int pm)
 {
     pixmap_t *pmap = &pixmaps[pm];
     viewport_t *vport = &viewports[vp];
-    unsigned int width = vport->width;
-    unsigned int height = vport->height;
+    int y;
+    int tmp, srcrowsize;
+    int realwidth, realheight, realrowsize;
+    int width = vport->width;
+    int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
     if (!pmap->data)
         return EINVAL;
-    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
-    unsigned int realheight = pmap->height <= height ? pmap->height : height;
-    unsigned int srcrowsize = vport->width * screen.pixelbytes;
-    unsigned int realrowsize = realwidth * screen.pixelbytes;
-    unsigned int y;
+    realwidth = pmap->width <= width ? pmap->width : width;
+    realheight = pmap->height <= height ? pmap->height : height;
+    srcrowsize = vport->width * screen.pixelbytes;
+    realrowsize = realwidth * screen.pixelbytes;
     for (y = 0; y < realheight; y++) {
-        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-        memcpy(screen.fb_addr + tmp, pmap->data + y * srcrowsize, realrowsize);
+        tmp = (vport->y + y) * screen.scanline +
+            vport->x * screen.pixelbytes;
+        memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize,
+            realrowsize);
     }
-    return EOK;
+    return 0;
 }
-/** Tick animation one step forward
- *
- */
-static void anims_tick(void)
+/** Tick animation one step forward */
+static void
+anims_tick(void)
 {
-    unsigned int i;
+    int i;
     static int counts = 0;
     /* Limit redrawing */
 ,38 → 925,39
     counts = (counts + 1) % 8;
     if (counts)
         return;
     for (i = 0; i < MAX_ANIMATIONS; i++) {
-        if ((!animations[i].animlen) || (!animations[i].initialized) ||
-            (!animations[i].enabled))
+        if (!animations[i].animlen || !animations[i].initialized ||
+            !animations[i].enabled)
             continue;
-        draw_pixmap(animations[i].vp, animations[i].pixmaps[animations[i].pos]);
-        animations[i].pos = (animations[i].pos + 1) % animations[i].animlen;
+        draw_pixmap(animations[i].vp,
+            animations[i].pixmaps[animations[i].pos]);
+        animations[i].pos = (animations[i].pos + 1) %
+            animations[i].animlen;
     }
 }
-static unsigned int pointer_x;
-static unsigned int pointer_y;
-static bool pointer_shown, pointer_enabled;
+static int pointer_x, pointer_y;
+static int pointer_shown, pointer_enabled;
 static int pointer_vport = -1;
 static int pointer_pixmap = -1;
-static void mouse_show(void)
+static void
+mouse_show(void)
 {
     int i, j;
     int visibility;
     int color;
     int bytepos;
-    if ((pointer_shown) || (!pointer_enabled))
+    if (pointer_shown || !pointer_enabled)
         return;
-    /* Save image under the pointer. */
+    /* Save image under the cursor */
     if (pointer_vport == -1) {
-        pointer_vport = vport_create(pointer_x, pointer_y, pointer_width, pointer_height);
+        pointer_vport = viewport_create(pointer_x, pointer_y,
+            pointer_width, pointer_height);
         if (pointer_vport < 0)
             return;
     } else {
 ,13 → 964,14
         viewports[pointer_vport].x = pointer_x;
         viewports[pointer_vport].y = pointer_y;
     }
     if (pointer_pixmap == -1)
         pointer_pixmap = save_vp_to_pixmap(&viewports[pointer_vport]);
     else
-        copy_vp_to_pixmap(&viewports[pointer_vport], &pixmaps[pointer_pixmap]);
-    /* Draw mouse pointer. */
+        copy_vp_to_pixmap(&viewports[pointer_vport],
+            &pixmaps[pointer_pixmap]);
+    /* Draw cursor */
     for (i = 0; i < pointer_height; i++)
         for (j = 0; j < pointer_width; j++) {
             bytepos = i * ((pointer_width - 1) / 8 + 1) + j / 8;
 ,10 → 989,10
     pointer_shown = 1;
 }
-static void mouse_hide(void)
+static void
+mouse_hide(void)
 {
-    /* Restore image under the pointer. */
+    /* Restore image under the cursor */
     if (pointer_shown) {
         draw_pixmap(pointer_vport, pointer_pixmap);
         pointer_shown = 0;
 ,8 → 999,8
     }
 }
-static void mouse_move(unsigned int x, unsigned int y)
+static void
+mouse_move(unsigned int x, unsigned int y)
 {
     mouse_hide();
     pointer_x = x;
 ,14 → 1008,14
     mouse_show();
 }
-static int anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static int
+anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
 {
-    bool handled = true;
-    int retval = EOK;
-    int i, nvp;
+    int handled = 1;
+    int retval = 0;
+    int i,nvp;
     int newval;
     switch (IPC_GET_METHOD(*call)) {
     case FB_ANIM_CREATE:
         nvp = IPC_GET_ARG1(*call);
 ,16 → 1105,14
     return handled;
 }
+/** Handler for messages concerning pixmap handling */
+static int
+pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+{
+    int handled = 1;
+    int retval = 0;
+    int i,nvp;
-/** Handler for messages concerning pixmap handling
- *
- */
-static int pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
-{
-    bool handled = true;
-    int retval = EOK;
-    int i, nvp;
     switch (IPC_GET_METHOD(*call)) {
     case FB_VP_DRAW_PIXMAP:
         nvp = IPC_GET_ARG1(*call);
 ,7 → 1150,7
     default:
         handled = 0;
     }
     if (handled)
         ipc_answer_0(callid, retval);
     return handled;
 ,99 → 1157,35
 }
-static int rgb_from_style(attr_rgb_t *rgb, int style)
-{
-    switch (style) {
-    case STYLE_NORMAL:
-        rgb->fg_color = color_table[COLOR_BLACK];
-        rgb->bg_color = color_table[COLOR_WHITE];
-        break;
-    case STYLE_EMPHASIS:
-        rgb->fg_color = color_table[COLOR_RED];
-        rgb->bg_color = color_table[COLOR_WHITE];
-        break;
-    default:
-        return EINVAL;
-    }
-    return EOK;
-}
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
-{
-    fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
-    bg_color = (bg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
-    rgb->fg_color = color_table[fg_color];
-    rgb->bg_color = color_table[bg_color];
-    return EOK;
-}
-static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a)
-{
-    int rc;
-    switch (a->t) {
-    case at_style:
-        rc = rgb_from_style(rgb, a->a.s.style);
-        break;
-    case at_idx:
-        rc = rgb_from_idx(rgb, a->a.i.fg_color,
-            a->a.i.bg_color, a->a.i.flags);
-        break;
-    case at_rgb:
-        *rgb = a->a.r;
-        rc = EOK;
-        break;
-    }
-    return rc;
-}
-static int fb_set_style(viewport_t *vport, ipcarg_t style)
-{
-    return rgb_from_style(&vport->attr, (int) style);
-}
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
-{
-    return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
-}
 /** Function for handling connections to FB
  *
  */
-static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void
+fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    unsigned int vp = 0;
-    viewport_t *vport = &viewports[vp];
+    ipc_callid_t callid;
+    ipc_call_t call;
+    int retval;
+    int i;
+    unsigned int row,col;
+    char c;
+    int vp = 0;
+    viewport_t *vport = &viewports[0];
     if (client_connected) {
         ipc_answer_0(iid, ELIMIT);
         return;
     }
-    /* Accept connection */
-    client_connected = true;
-    ipc_answer_0(iid, EOK);
-    while (true) {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        int retval;
-        unsigned int i;
-        int scroll;
-        wchar_t ch;
-        unsigned int col, row;
-        if ((vport->cursor_active) || (anims_enabled))
+    client_connected = 1;
+    ipc_answer_0(iid, EOK); /* Accept connection */
+    while (1) {
+        if (vport->cursor_active || anims_enabled)
             callid = async_get_call_timeout(&call, 250000);
         else
             callid = async_get_call(&call);
         mouse_hide();
         if (!callid) {
             cursor_blink(vport);
 ,92 → 1193,105
             mouse_show();
             continue;
         }
         if (shm_handle(callid, &call, vp))
             continue;
         if (pixmap_handle(callid, &call, vp))
             continue;
         if (anim_handle(callid, &call, vp))
             continue;
-        switch (IPC_GET_METHOD(call)) {
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
-            client_connected = false;
-            /* Cleanup other viewports */
+            client_connected = 0;
+            /* cleanup other viewports */
             for (i = 1; i < MAX_VIEWPORTS; i++)
-                vport->initialized = false;
-            /* Exit thread */
-            return;
+                vport->initialized = 0;
+            return; /* Exit thread */
         case FB_PUTCHAR:
-            ch = IPC_GET_ARG1(call);
-            col = IPC_GET_ARG2(call);
-            row = IPC_GET_ARG3(call);
-            if ((col >= vport->cols) || (row >= vport->rows)) {
+        case FB_TRANS_PUTCHAR:
+            c = IPC_GET_ARG1(call);
+            row = IPC_GET_ARG2(call);
+            col = IPC_GET_ARG3(call);
+            if (row >= vport->rows || col >= vport->cols) {
                 retval = EINVAL;
                 break;
             }
             ipc_answer_0(callid, EOK);
-            draw_char(vport, ch, col, row);
-            /* Message already answered */
-            continue;
+            draw_char(vport, c, row, col, vport->style,
+                IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
+            continue; /* msg already answered */
         case FB_CLEAR:
-            vport_clear(vport);
-            cursor_show(vport);
-            retval = EOK;
+            clear_port(vport);
+            cursor_print(vport);
+            retval = 0;
             break;
-        case FB_CURSOR_GOTO:
-            col = IPC_GET_ARG1(call);
-            row = IPC_GET_ARG2(call);
-            if ((col >= vport->cols) || (row >= vport->rows)) {
+        case FB_CURSOR_GOTO:
+            row = IPC_GET_ARG1(call);
+            col = IPC_GET_ARG2(call);
+            if (row >= vport->rows || col >= vport->cols) {
                 retval = EINVAL;
                 break;
             }
-            retval = EOK;
+            retval = 0;
             cursor_hide(vport);
             vport->cur_col = col;
             vport->cur_row = row;
-            cursor_show(vport);
-            break;
+            cursor_print(vport);
+            break;
         case FB_CURSOR_VISIBILITY:
             cursor_hide(vport);
             vport->cursor_active = IPC_GET_ARG1(call);
-            cursor_show(vport);
-            retval = EOK;
+            cursor_print(vport);
+            retval = 0;
             break;
         case FB_GET_CSIZE:
-            ipc_answer_2(callid, EOK, vport->cols, vport->rows);
+            ipc_answer_2(callid, EOK, vport->rows, vport->cols);
             continue;
-        case FB_GET_COLOR_CAP:
-            ipc_answer_1(callid, EOK, FB_CCAP_RGB);
-            continue;
         case FB_SCROLL:
-            scroll = IPC_GET_ARG1(call);
-            if ((scroll > (int) vport->rows) || (scroll < (-(int) vport->rows))) {
+            i = IPC_GET_ARG1(call);
+            if (i > vport->rows || i < (- (int)vport->rows)) {
                 retval = EINVAL;
                 break;
             }
             cursor_hide(vport);
-            vport_scroll(vport, scroll);
-            cursor_show(vport);
-            retval = EOK;
+            scroll_port(vport, i*FONT_SCANLINES);
+            cursor_print(vport);
+            retval = 0;
             break;
+        case FB_VIEWPORT_DB:
+            /* Enable double buffering */
+            i = IPC_GET_ARG1(call);
+            if (i == -1)
+                i = vp;
+            if (i < 0 || i >= MAX_VIEWPORTS) {
+                retval = EINVAL;
+                break;
+            }
+            if (!viewports[i].initialized ) {
+                retval = EADDRNOTAVAIL;
+                break;
+            }
+            viewports[i].dboffset = 0;
+            if (IPC_GET_ARG2(call) == 1 && !viewports[i].dbdata)
+                viewports[i].dbdata =
+                    malloc(screen.pixelbytes *
+                    viewports[i].width * viewports[i].height);
+            else if (IPC_GET_ARG2(call) == 0 &&
+                viewports[i].dbdata) {
+                free(viewports[i].dbdata);
+                viewports[i].dbdata = NULL;
+            }
+            retval = 0;
+            break;
         case FB_VIEWPORT_SWITCH:
             i = IPC_GET_ARG1(call);
-            if (i >= MAX_VIEWPORTS) {
+            if (i < 0 || i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
             }
-            if (!viewports[i].initialized) {
+            if (! viewports[i].initialized ) {
                 retval = EADDRNOTAVAIL;
                 break;
             }
 ,11 → 1298,11
             cursor_hide(vport);
             vp = i;
             vport = &viewports[vp];
-            cursor_show(vport);
-            retval = EOK;
+            cursor_print(vport);
+            retval = 0;
             break;
         case FB_VIEWPORT_CREATE:
-            retval = vport_create(IPC_GET_ARG1(call) >> 16,
+            retval = viewport_create(IPC_GET_ARG1(call) >> 16,
                 IPC_GET_ARG1(call) & 0xffff,
                 IPC_GET_ARG2(call) >> 16,
                 IPC_GET_ARG2(call) & 0xffff);
 ,45 → 1309,34
             break;
         case FB_VIEWPORT_DELETE:
             i = IPC_GET_ARG1(call);
-            if (i >= MAX_VIEWPORTS) {
+            if (i < 0 || i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
             }
-            if (!viewports[i].initialized) {
+            if (! viewports[i].initialized ) {
                 retval = EADDRNOTAVAIL;
                 break;
             }
-            viewports[i].initialized = false;
-            if (viewports[i].bgpixel)
-                free(viewports[i].bgpixel);
-            if (viewports[i].backbuf)
-                free(viewports[i].backbuf);
-            retval = EOK;
+            viewports[i].initialized = 0;
+            if (viewports[i].dbdata) {
+                free(viewports[i].dbdata);
+                viewports[i].dbdata = NULL;
+            }
+            retval = 0;
             break;
         case FB_SET_STYLE:
-            retval = fb_set_style(vport, IPC_GET_ARG1(call));
+            vport->style.fg_color = IPC_GET_ARG1(call);
+            vport->style.bg_color = IPC_GET_ARG2(call);
+            retval = 0;
             break;
-        case FB_SET_COLOR:
-            retval = fb_set_color(vport, IPC_GET_ARG1(call),
-                IPC_GET_ARG2(call), IPC_GET_ARG3(call));
-            break;
-        case FB_SET_RGB_COLOR:
-            vport->attr.fg_color = IPC_GET_ARG1(call);
-            vport->attr.bg_color = IPC_GET_ARG2(call);
-            retval = EOK;
-            break;
         case FB_GET_RESOLUTION:
             ipc_answer_2(callid, EOK, screen.xres, screen.yres);
             continue;
         case FB_POINTER_MOVE:
-            pointer_enabled = true;
+            pointer_enabled = 1;
             mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-            retval = EOK;
+            retval = 0;
             break;
-        case FB_SCREEN_YIELD:
-        case FB_SCREEN_RECLAIM:
-            retval = EOK;
-            break;
         default:
             retval = ENOENT;
         }
 ,33 → 1344,41
     }
 }
-/** Initialization of framebuffer
- *
- */
-int fb_init(void)
+/** Initialization of framebuffer */
+int
+fb_init(void)
 {
+    void *fb_ph_addr;
+    unsigned int fb_width;
+    unsigned int fb_height;
+    unsigned int fb_scanline;
+    unsigned int fb_visual;
+    bool fb_invert_colors;
+    void *fb_addr;
+    size_t asz;
     async_set_client_connection(fb_client_connection);
-    void *fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
-    unsigned int fb_offset = sysinfo_value("fb.offset");
-    unsigned int fb_width = sysinfo_value("fb.width");
-    unsigned int fb_height = sysinfo_value("fb.height");
-    unsigned int fb_scanline = sysinfo_value("fb.scanline");
-    unsigned int fb_visual = sysinfo_value("fb.visual");
-    unsigned int fbsize = fb_scanline * fb_height;
-    void *fb_addr = as_get_mappable_page(fbsize);
+    fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
+    fb_width = sysinfo_value("fb.width");
+    fb_height = sysinfo_value("fb.height");
+    fb_scanline = sysinfo_value("fb.scanline");
+    fb_visual = sysinfo_value("fb.visual");
+    fb_invert_colors = sysinfo_value("fb.invert-colors");
-    if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
-        ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
-        return -1;
+    asz = fb_scanline * fb_height;
+    fb_addr = as_get_mappable_page(asz);
+    physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
+        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
-    if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
+    if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual,
+        fb_invert_colors))
         return 0;
     return -1;
 }
-/**
+/**
  * @}
  */

 /trunk/uspace/srv/fb/ega.c
 ,9 → 49,6
 #include <ipc/ns.h>
 #include <ipc/services.h>
 #include <libarch/ddi.h>
-#include <io/style.h>
-#include <io/color.h>
-#include <sys/types.h>
 #include "ega.h"
 #include "../console/screenbuffer.h"
 ,14 → 61,13
 saved_screen saved_screens[MAX_SAVED_SCREENS];
-#define EGA_IO_BASE ((ioport8_t *) 0x3d4)
+#define EGA_IO_ADDRESS 0x3d4
 #define EGA_IO_SIZE 2
-int ega_normal_color = 0x0f;
-int ega_inverted_color = 0xf0;
+#define NORMAL_COLOR       0x0f
+#define INVERTED_COLOR     0xf0
-#define NORMAL_COLOR        ega_normal_color
-#define INVERTED_COLOR      ega_inverted_color
+#define EGA_STYLE(fg,bg) ((fg) > (bg) ? NORMAL_COLOR : INVERTED_COLOR)
 /* Allow only 1 connection */
 static int client_connected = 0;
 ,16 → 74,13
 static unsigned int scr_width;
 static unsigned int scr_height;
-static uint8_t *scr_addr;
+static char *scr_addr;
-static unsigned int style;
+static unsigned int style = NORMAL_COLOR;
-static unsigned attr_to_ega_style(const attrs_t *a);
-static uint8_t ega_glyph(wchar_t ch);
 static void clrscr(void)
 {
-    unsigned i;
+    int i;
     for (i = 0; i < scr_width * scr_height; i++) {
         scr_addr[i * 2] = ' ';
 ,16 → 88,16
     }
 }
-static void cursor_goto(unsigned int col, unsigned int row)
+static void cursor_goto(unsigned int row, unsigned int col)
 {
     int ega_cursor;
     ega_cursor = col + scr_width * row;
-    pio_write_8(EGA_IO_BASE, 0xe);
-    pio_write_8(EGA_IO_BASE + 1, (ega_cursor >> 8) & 0xff);
-    pio_write_8(EGA_IO_BASE, 0xf);
-    pio_write_8(EGA_IO_BASE + 1, ega_cursor & 0xff);
+    outb(EGA_IO_ADDRESS, 0xe);
+    outb(EGA_IO_ADDRESS + 1, (ega_cursor >> 8) & 0xff);
+    outb(EGA_IO_ADDRESS, 0xf);
+    outb(EGA_IO_ADDRESS + 1, ega_cursor & 0xff);
 }
 static void cursor_disable(void)
 ,10 → 104,10
 {
     uint8_t stat;
-    pio_write_8(EGA_IO_BASE, 0xa);
-    stat = pio_read_8(EGA_IO_BASE + 1);
-    pio_write_8(EGA_IO_BASE, 0xa);
-    pio_write_8(EGA_IO_BASE + 1, stat | (1 << 5));
+    outb(EGA_IO_ADDRESS, 0xa);
+    stat=inb(EGA_IO_ADDRESS + 1);
+    outb(EGA_IO_ADDRESS, 0xa);
+    outb(EGA_IO_ADDRESS + 1, stat | (1 << 5));
 }
 static void cursor_enable(void)
 ,24 → 114,23
 {
     uint8_t stat;
-    pio_write_8(EGA_IO_BASE, 0xa);
-    stat = pio_read_8(EGA_IO_BASE + 1);
-    pio_write_8(EGA_IO_BASE, 0xa);
-    pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5)));
+    outb(EGA_IO_ADDRESS, 0xa);
+    stat=inb(EGA_IO_ADDRESS + 1);
+    outb(EGA_IO_ADDRESS, 0xa);
+    outb(EGA_IO_ADDRESS + 1, stat & (~(1 << 5)));
 }
 static void scroll(int rows)
 {
-    unsigned i;
+    int i;
     if (rows > 0) {
-        memmove(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
+        memcpy(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
             scr_width * scr_height * 2 - rows * scr_width * 2);
         for (i = 0; i < rows * scr_width; i++)
             (((short *) scr_addr) + scr_width * scr_height - rows *
                 scr_width)[i] = ((style << 8) + ' ');
     } else if (rows < 0) {
-        memmove(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
+        memcpy(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
             scr_width * scr_height * 2 + rows * scr_width * 2);
         for (i = 0; i < -rows * scr_width; i++)
             ((short *)scr_addr)[i] = ((style << 8 ) + ' ');
 ,38 → 137,22
     }
 }
-static void printchar(wchar_t c, unsigned int col, unsigned int row)
+static void printchar(char c, unsigned int row, unsigned int col)
 {
-    scr_addr[(row * scr_width + col) * 2] = ega_glyph(c);
+    scr_addr[(row * scr_width + col) * 2] = c;
     scr_addr[(row * scr_width + col) * 2 + 1] = style;
-    cursor_goto(col + 1, row);
+    cursor_goto(row, col + 1);
 }
-/** Draw text data to viewport.
- *
- * @param vport Viewport id
- * @param data  Text data.
- * @param x Leftmost column of the area.
- * @param y Topmost row of the area.
- * @param w Number of rows.
- * @param h Number of columns.
- */
-static void draw_text_data(keyfield_t *data, unsigned int x,
-    unsigned int y, unsigned int w, unsigned int h)
+static void draw_text_data(keyfield_t *data)
 {
-    unsigned int i, j;
-    keyfield_t *field;
-    uint8_t *dp;
+    int i;
-    for (j = 0; j < h; j++) {
-        for (i = 0; i < w; i++) {
-            field = &data[j * w + i];
-            dp = &scr_addr[2 * ((y + j) * scr_width + (x + i))];
-            dp[0] = ega_glyph(field->character);
-            dp[1] = attr_to_ega_style(&field->attrs);
-        }
+    for (i = 0; i < scr_width * scr_height; i++) {
+        scr_addr[i * 2] = data[i].character;
+        scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
+            data[i].style.bg_color);
     }
 }
 ,72 → 181,15
     return i;
 }
-static int style_to_ega_style(int style)
-{
-    unsigned int ega_style;
-    switch (style) {
-    case STYLE_NORMAL:
-        ega_style = INVERTED_COLOR;
-        break;
-    case STYLE_EMPHASIS:
-        ega_style = INVERTED_COLOR | 4;
-        break;
-    default:
-        return INVERTED_COLOR;
-    }
-    return ega_style;
-}
-static unsigned int color_to_ega_style(int fg_color, int bg_color, int attr)
-{
-    unsigned int style;
-    style = (fg_color & 7) | ((bg_color & 7) << 4);
-    if (attr & CATTR_BRIGHT)
-        style = style | 0x08;
-    return style;
-}
-static unsigned int rgb_to_ega_style(uint32_t fg, uint32_t bg)
-{
-    return (fg > bg) ? NORMAL_COLOR : INVERTED_COLOR;
-}
-static unsigned attr_to_ega_style(const attrs_t *a)
-{
-    switch (a->t) {
-    case at_style:
-        return style_to_ega_style(a->a.s.style);
-    case at_rgb:
-        return rgb_to_ega_style(a->a.r.fg_color, a->a.r.bg_color);
-    case at_idx:
-        return color_to_ega_style(a->a.i.fg_color,
-            a->a.i.bg_color, a->a.i.flags);
-    default:
-        return INVERTED_COLOR;
-    }
-}
-static uint8_t ega_glyph(wchar_t ch)
-{
-    if (ch >= 0 && ch < 128)
-        return ch;
-    return '?';
-}
 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
     int retval;
     ipc_callid_t callid;
     ipc_call_t call;
-    wchar_t c;
-    unsigned int row, col, w, h;
-    int bg_color, fg_color, attr;
-    uint32_t bg_rgb, fg_rgb;
+    char c;
+    unsigned int row, col;
+    int bgcolor,fgcolor;
     keyfield_t *interbuf = NULL;
     size_t intersize = 0;
     int i;
 ,27 → 220,16
             retval = EINVAL;
             break;
         case FB_DRAW_TEXT_DATA:
-            col = IPC_GET_ARG1(call);
-            row = IPC_GET_ARG2(call);
-            w = IPC_GET_ARG3(call);
-            h = IPC_GET_ARG4(call);
             if (!interbuf) {
                 retval = EINVAL;
                 break;
             }
-            if (col + w > scr_width || row + h > scr_height) {
-                retval = EINVAL;
-                break;
-            }
-            draw_text_data(interbuf, col, row, w, h);
+            draw_text_data(interbuf);
             retval = 0;
             break;
         case FB_GET_CSIZE:
-            ipc_answer_2(callid, EOK, scr_width, scr_height);
+            ipc_answer_2(callid, EOK, scr_height, scr_width);
             continue;
-        case FB_GET_COLOR_CAP:
-            ipc_answer_1(callid, EOK, FB_CCAP_INDEXED);
-            continue;
         case FB_CLEAR:
             clrscr();
             retval = 0;
 ,28 → 236,28
             break;
         case FB_PUTCHAR:
             c = IPC_GET_ARG1(call);
-            col = IPC_GET_ARG2(call);
-            row = IPC_GET_ARG3(call);
+            row = IPC_GET_ARG2(call);
+            col = IPC_GET_ARG3(call);
             if (col >= scr_width || row >= scr_height) {
                 retval = EINVAL;
                 break;
             }
-            printchar(c, col, row);
+            printchar(c, row, col);
             retval = 0;
             break;
         case FB_CURSOR_GOTO:
-            col = IPC_GET_ARG1(call);
-            row = IPC_GET_ARG2(call);
+            row = IPC_GET_ARG1(call);
+            col = IPC_GET_ARG2(call);
             if (row >= scr_height || col >= scr_width) {
                 retval = EINVAL;
                 break;
             }
-            cursor_goto(col, row);
+            cursor_goto(row, col);
             retval = 0;
             break;
         case FB_SCROLL:
             i = IPC_GET_ARG1(call);
-            if (i > (int) scr_height || i < -((int) scr_height)) {
+            if (i > scr_height || i < -((int) scr_height)) {
                 retval = EINVAL;
                 break;
             }
 ,7 → 265,7
             retval = 0;
             break;
         case FB_CURSOR_VISIBILITY:
-            if (IPC_GET_ARG1(call))
+            if(IPC_GET_ARG1(call))
                 cursor_enable();
             else
                 cursor_disable();
 ,22 → 272,11
             retval = 0;
             break;
         case FB_SET_STYLE:
-            style = style_to_ega_style(IPC_GET_ARG1(call));
+            fgcolor = IPC_GET_ARG1(call);
+            bgcolor = IPC_GET_ARG2(call);
+            style = EGA_STYLE(fgcolor, bgcolor);
             retval = 0;
             break;
-        case FB_SET_COLOR:
-            fg_color = IPC_GET_ARG1(call);
-            bg_color = IPC_GET_ARG2(call);
-            attr = IPC_GET_ARG3(call);
-            style = color_to_ega_style(fg_color, bg_color, attr);
-            retval = 0;
-            break;
-        case FB_SET_RGB_COLOR:
-            fg_rgb = IPC_GET_ARG1(call);
-            bg_rgb = IPC_GET_ARG2(call);
-            style = rgb_to_ega_style(fg_rgb, bg_rgb);
-            retval = 0;
-            break;
         case FB_VP_DRAW_PIXMAP:
             i = IPC_GET_ARG2(call);
             retval = print_screen(i);
 ,12 → 296,9
             }
             retval = 0;
             break;
-        case FB_SCREEN_YIELD:
-        case FB_SCREEN_RECLAIM:
-            retval = EOK;
-            break;
         default:
-            retval = EINVAL;
+            retval = ENOENT;
         }
         ipc_answer_0(callid, retval);
     }
 ,22 → 312,13
     ega_ph_addr = (void *) sysinfo_value("fb.address.physical");
     scr_width = sysinfo_value("fb.width");
     scr_height = sysinfo_value("fb.height");
+    iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);
-    if (sysinfo_value("fb.blinking")) {
-        ega_normal_color &= 0x77;
-        ega_inverted_color &= 0x77;
-    }
-    style = NORMAL_COLOR;
-    iospace_enable(task_get_id(), (void *) EGA_IO_BASE, 2);
     sz = scr_width * scr_height * 2;
     scr_addr = as_get_mappable_page(sz);
-    if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
-        return -1;
+    physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
     async_set_client_connection(ega_client_connection);
 ,6 → 326,6
 }
-/**
+/**
  * @}
  */

 /trunk/uspace/srv/fb/main.c
 ,21 → 33,16
 #include <as.h>
 #include <align.h>
 #include <errno.h>
-#include <stdio.h>
 #include "fb.h"
+#include "sysio.h"
 #include "ega.h"
-#include "msim.h"
-#include "ski.h"
-#include "sgcn.h"
 #include "main.h"
-#define NAME "fb"
 void receive_comm_area(ipc_callid_t callid, ipc_call_t *call, void **area)
 {
     void *dest;
     dest = as_get_mappable_page(IPC_GET_ARG2(*call));
     if (ipc_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
         if (*area)
 ,51 → 53,29
 int main(int argc, char *argv[])
 {
-    printf(NAME ": HelenOS Framebuffer service\n");
     ipcarg_t phonead;
-    bool initialized = false;
+    int initialized = 0;
 #ifdef FB_ENABLED
     if (sysinfo_value("fb.kind") == 1) {
         if (fb_init() == 0)
-            initialized = true;
-    }
+            initialized = 1;
+    }
 #endif
 #ifdef EGA_ENABLED
-    if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
+    if (!initialized && sysinfo_value("fb.kind") == 2) {
         if (ega_init() == 0)
-            initialized = true;
+            initialized = 1;
     }
 #endif
-#ifdef MSIM_ENABLED
-    if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
-        if (msim_init() == 0)
-            initialized = true;
-    }
-#endif
-#ifdef SGCN_ENABLED
-    if ((!initialized) && (sysinfo_value("fb.kind") == 4)) {
-        if (sgcn_init() == 0)
-            initialized = true;
-    }
-#endif
-#ifdef SKI_ENABLED
-    if ((!initialized) && (sysinfo_value("fb") != true)) {
-        if (ski_init() == 0)
-            initialized = true;
-    }
-#endif
     if (!initialized)
-        return -1;
+        sysio_init();
     if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0)
         return -1;
-    printf(NAME ": Accepting connections\n");
     async_manager();
     /* Never reached */
     return 0;
 }

 /trunk/uspace/srv/fb/sysio.c
 ,0 → 1,198
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @defgroup sysio SysIO
+ * @brief   HelenOS framebuffer emulation via kernel.
+ * @ingroup fbs
+ * @{
+ */
+/** @file
+ */
+#include <async.h>
+#include <ipc/fb.h>
+#include <ipc/ipc.h>
+#include <libc.h>
+#include <errno.h>
+#include <string.h>
+#include <libc.h>
+#include <stdio.h>
+#include "sysio.h"
+#define WIDTH 80
+#define HEIGHT 25
+/* Allow only 1 connection */
+static int client_connected = 0;
+static void sysput(char c)
+{
+    __SYSCALL3(SYS_IO, 1, (sysarg_t)&c, (sysarg_t) 1);
+}
+static void sysputs(char *s)
+{
+    while (*s) {
+        sysput(*(s++));
+    }
+//  __SYSCALL3(SYS_IO, 1, (sysarg_t)s, strlen(s));
+}
+/** Send clearscreen sequence to console */
+static void clrscr(void)
+{
+    sysputs("\033[2J");
+}
+/** Send ansi sequence to console to change cursor position */
+static void curs_goto(unsigned int row, unsigned int col)
+{
+    char control[20];
+    if (row > 200 || col > 200)
+        return;
+    snprintf(control, 20, "\033[%d;%df",row+1, col+1);
+    sysputs(control);
+}
+static void set_style(int mode)
+{
+    char control[20];
+    snprintf(control, 20, "\033[%dm", mode);
+    sysputs(control);
+}
+static void scroll(int i)
+{
+    if (i > 0) {
+        curs_goto(HEIGHT-1, 0);
+        while (i--)
+            sysputs("\033D");
+    } else if (i < 0) {
+        curs_goto(0,0);
+        while (i++)
+            sysputs("\033M");
+    }
+}
+/** ANSI terminal emulation main thread */
+static void sysio_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    int retval;
+    ipc_callid_t callid;
+    ipc_call_t call;
+    char c;
+    int lastcol=0;
+    int lastrow=0;
+    int newcol,newrow;
+    int fgcolor,bgcolor;
+    int i;
+    if (client_connected) {
+        ipc_answer_0(iid, ELIMIT);
+        return;
+    }
+    client_connected = 1;
+    ipc_answer_0(iid, EOK); /* Accept connection */
+    while (1) {
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
+        case IPC_M_PHONE_HUNGUP:
+            client_connected = 0;
+            ipc_answer_0(callid, EOK);
+            return; /* Exit thread */
+        case FB_PUTCHAR:
+            c = IPC_GET_ARG1(call);
+            newrow = IPC_GET_ARG2(call);
+            newcol = IPC_GET_ARG3(call);
+            if ((lastcol != newcol) || (lastrow != newrow))
+                curs_goto(newrow, newcol);
+            lastcol = newcol + 1;
+            lastrow = newrow;
+            sysput(c);
+            retval = 0;
+            break;
+        case FB_CURSOR_GOTO:
+            newrow = IPC_GET_ARG1(call);
+            newcol = IPC_GET_ARG2(call);
+            curs_goto(newrow, newcol);
+            lastrow = newrow;
+            lastcol = newcol;
+            retval = 0;
+            break;
+        case FB_GET_CSIZE:
+            ipc_answer_2(callid, EOK, HEIGHT, WIDTH);
+            continue;
+        case FB_CLEAR:
+            clrscr();
+            retval = 0;
+            break;
+        case FB_SET_STYLE:
+            fgcolor = IPC_GET_ARG1(call);
+            bgcolor = IPC_GET_ARG2(call);
+            if (fgcolor < bgcolor)
+                set_style(0);
+            else
+                set_style(7);
+            retval = 0;
+            break;
+        case FB_SCROLL:
+            i = IPC_GET_ARG1(call);
+            if ((i > HEIGHT) || (i < -HEIGHT)) {
+                retval = EINVAL;
+                break;
+            }
+            scroll(i);
+            curs_goto(lastrow, lastcol);
+            retval = 0;
+            break;
+        default:
+            retval = ENOENT;
+        }
+        ipc_answer_0(callid, retval);
+    }
+}
+/** ANSI terminal emulation initialization */
+void sysio_init(void)
+{
+    async_set_client_connection(sysio_client_connection);
+    clrscr();
+    curs_goto(0,0);
+    /* Set scrolling region to 0-25 lines */
+    sysputs("\033[0;25r");
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/fb/ppm.c
 ,26 → 89,26
 {
     unsigned int width, height;
     unsigned int maxcolor;
-    unsigned int i;
+    int i;
     unsigned int color;
     unsigned int coef;
     /* Read magic */
-    if ((data[0] != 'P') || (data[1] != '6'))
+    if (data[0] != 'P' || data[1] != '6')
         return EINVAL;
-    data += 2;
+    data+=2;
     skip_whitespace(&data);
     read_num(&data, &width);
     skip_whitespace(&data);
-    read_num(&data, &height);
+    read_num(&data,&height);
     skip_whitespace(&data);
-    read_num(&data, &maxcolor);
+    read_num(&data,&maxcolor);
     data++;
-    if ((maxcolor == 0) || (maxcolor > 255) || (width * height > datasz))
+    if (maxcolor == 0 || maxcolor > 255 || width * height > datasz) {
         return EINVAL;
+    }
     coef = 255 / maxcolor;
     if (coef * maxcolor > 255)
         coef -= 1;
 ,6 → 125,6
         (*putpixel)(vport, sx + (i % width), sy + (i / width), color);
         data += 3;
     }
     return 0;
 }

 /trunk/uspace/srv/fb/Makefile
 ,11 → 31,12
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-LIBS = $(LIBC_PREFIX)/libc.a
+CFLAGS += -I../libipc/include
+LIBS =  $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 ,69 → 43,50
 OUTPUT = fb
 SOURCES = \
     main.c \
+    sysio.c \
     ppm.c
-ifneq ($(UARCH),ia64)
+ifneq ($(ARCH), ia64)
     SOURCES += fb.c \
         font-8x16.c
     CFLAGS += -DFB_ENABLED
 endif
-ifeq ($(UARCH),ia32)
+ifeq ($(ARCH), ia32)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(UARCH),ia64)
-    SOURCES += ega.c \
-        ski.c \
-        serial_console.c
-    CFLAGS += -DSKI_ENABLED
-    CFLAGS += -DEGA_ENABLED
-endif
-ifeq ($(UARCH),amd64)
+ifeq ($(ARCH), amd64)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(UARCH),mips32)
-    SOURCES += msim.c \
-        serial_console.c
-    CFLAGS += -DMSIM_ENABLED
+ifeq ($(ARCH), mips32)
+    CFLAGS += -DFB_INVERT_ENDIAN
 endif
-ifeq ($(UARCH),sparc64)
-    SOURCES += sgcn.c \
-        serial_console.c
-    CFLAGS += -DSGCN_ENABLED
-endif
+CFLAGS += -D$(ARCH)
-CFLAGS += -D$(UARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/fb/font-8x16.h
 ,25 → 26,12
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
- * @{
- */
-/** @file
- */
+#ifndef FB_FONT_8X16_H_
+#define FB_FONT_8X16_H_
-#ifndef FONT_8X16_H_
-#define FONT_8X16_H_
+#define FONT_GLIPHS 256
+#define FONT_SCANLINES  16
-#define FONT_GLYPHS     2899
-#define FONT_WIDTH      8
-#define FONT_SCANLINES  16
+extern unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES];
-#include <sys/types.h>
-extern uint16_t fb_font_glyph(const wchar_t ch);
-extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
 #endif
-/** @}
- */

 /trunk/uspace/srv/fb/ega.h
 ,10 → 27,10
  */
 /** @addtogroup egafb
- * @brief HelenOS EGA framebuffer.
+ * @brief   HelenOS EGA framebuffer.
  * @ingroup fbs
  * @{
- */
+ */
 /** @file
  */
 ,3 → 43,4
 /** @}
  */

 /trunk/uspace/srv/fb/sysio.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup sysio
+ * @brief   HelenOS framebuffer emulation via kernel.
+ * @ingroup fbs
+ * @{
+ */
+/** @file
+ */
+#ifndef FB_SYSIO_H_
+#define FB_SYSIO_H_
+extern void sysio_init(void);
+#endif
+/** @}
+ */

 /trunk/uspace/srv/fb/fb.h
 ,7 → 29,7
 /** @addtogroup fb
  * @ingroup fbs
  * @{
- */
+ */
 /** @file
  */
 ,10 → 36,8
 #ifndef FB_FB_H_
 #define FB_FB_H_
-#include <stdint.h>
+typedef void (* putpixel_cb_t)(void *, unsigned int, unsigned int, int);
-typedef void (* putpixel_cb_t)(void *, unsigned int, unsigned int, uint32_t);
 extern int fb_init(void);
 #endif

 /trunk/uspace/srv/fb/font-8x16.c
 ,6 → 1,5
 /*
- * Copyright (c) 2000 Dmitry Bolkhovityanov
- * Copyright (c) 2009 Martin Decky
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,3245 → 26,4616
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
- * @{
- */
-/** @file
- */
-#include <sys/types.h>
 #include "font-8x16.h"
-/** Convert character to font glyph index
- *
- * The font does not cover all Unicode characters.
- * This function converts the character to an appropriate
- * glyph in the font or returns an index to the question
- * mark glyph if no specific glyph exists.
- */
-uint16_t fb_font_glyph(const wchar_t ch)
-{
-    if (ch == 0x0000)
-        return 0;
-    if ((ch >= 0x0020) && (ch <= 0x007f))
-        return (ch - 32);
-    if ((ch >= 0x00a0) && (ch <= 0x021f))
-        return (ch - 64);
-    if ((ch >= 0x0222) && (ch <= 0x0233))
-        return (ch - 66);
-    if ((ch >= 0x0250) && (ch <= 0x02ad))
-        return (ch - 94);
-    if ((ch >= 0x02b0) && (ch <= 0x02cf))
-        return (ch - 96);
-    if ((ch >= 0x02d8) && (ch <= 0x02dd))
-        return (ch - 104);
-    if (ch == 0x02ee)
-        return 630;
-    if ((ch >= 0x0300) && (ch <= 0x0301))
-        return (ch - 137);
-    if (ch == 0x0303)
-        return 633;
-    if (ch == 0x0309)
-        return 634;
-    if ((ch >= 0x0312) && (ch <= 0x0314))
-        return (ch - 151);
-    if (ch == 0x0323)
-        return 638;
-    if ((ch >= 0x0340) && (ch <= 0x0341))
-        return (ch - 193);
-    if ((ch >= 0x0374) && (ch <= 0x0375))
-        return (ch - 243);
-    if (ch == 0x037a)
-        return 643;
-    if (ch == 0x037e)
-        return 644;
-    if ((ch >= 0x0384) && (ch <= 0x038a))
-        return (ch - 255);
-    if (ch == 0x038c)
-        return 652;
-    if ((ch >= 0x038e) && (ch <= 0x03a1))
-        return (ch - 257);
-    if ((ch >= 0x03a3) && (ch <= 0x03ce))
-        return (ch - 258);
-    if ((ch >= 0x03d0) && (ch <= 0x03d7))
-        return (ch - 259);
-    if ((ch >= 0x03da) && (ch <= 0x03f3))
-        return (ch - 261);
-    if ((ch >= 0x0400) && (ch <= 0x0486))
-        return (ch - 273);
-    if ((ch >= 0x0488) && (ch <= 0x04ce))
-        return (ch - 274);
-    if ((ch >= 0x04d0) && (ch <= 0x04f5))
-        return (ch - 275);
-    if ((ch >= 0x04f8) && (ch <= 0x04f9))
-        return (ch - 277);
-    if ((ch >= 0x0500) && (ch <= 0x050f))
-        return (ch - 283);
-    if ((ch >= 0x0530) && (ch <= 0x0556))
-        return (ch - 315);
-    if ((ch >= 0x0559) && (ch <= 0x055f))
-        return (ch - 317);
-    if ((ch >= 0x0561) && (ch <= 0x0587))
-        return (ch - 318);
-    if ((ch >= 0x0589) && (ch <= 0x058a))
-        return (ch - 319);
-    if ((ch >= 0x0591) && (ch <= 0x05a1))
-        return (ch - 325);
-    if ((ch >= 0x05a3) && (ch <= 0x05b9))
-        return (ch - 326);
-    if ((ch >= 0x05bb) && (ch <= 0x05c4))
-        return (ch - 327);
-    if ((ch >= 0x05d0) && (ch <= 0x05ea))
-        return (ch - 338);
-    if ((ch >= 0x05f0) && (ch <= 0x05f4))
-        return (ch - 343);
-    if (ch == 0x060c)
-        return 1182;
-    if (ch == 0x061b)
-        return 1183;
-    if (ch == 0x061f)
-        return 1184;
-    if ((ch >= 0x0621) && (ch <= 0x063a))
-        return (ch - 384);
-    if ((ch >= 0x0640) && (ch <= 0x0655))
-        return (ch - 389);
-    if ((ch >= 0x0660) && (ch <= 0x066d))
-        return (ch - 399);
-    if ((ch >= 0x0670) && (ch <= 0x06ed))
-        return (ch - 401);
-    if ((ch >= 0x06f0) && (ch <= 0x06fe))
-        return (ch - 403);
-    if (ch == 0x10d3)
-        return 1388;
-    if (ch == 0x10d7)
-        return 1389;
-    if (ch == 0x10da)
-        return 1390;
-    if (ch == 0x10dd)
-        return 1391;
-    if (ch == 0x10e6)
-        return 1392;
-    if ((ch >= 0x1e00) && (ch <= 0x1e9b))
-        return (ch - 6287);
-    if ((ch >= 0x1ea0) && (ch <= 0x1ef9))
-        return (ch - 6291);
-    if ((ch >= 0x1f00) && (ch <= 0x1f07))
-        return (ch - 6297);
-    if ((ch >= 0x2000) && (ch <= 0x2027))
-        return (ch - 6545);
-    if ((ch >= 0x2030) && (ch <= 0x2046))
-        return (ch - 6553);
-    if ((ch >= 0x2048) && (ch <= 0x204d))
-        return (ch - 6554);
-    if (ch == 0x2070)
-        return 1716;
-    if ((ch >= 0x2074) && (ch <= 0x208f))
-        return (ch - 6591);
-    if ((ch >= 0x20a0) && (ch <= 0x20af))
-        return (ch - 6607);
-    if ((ch >= 0x2100) && (ch <= 0x213a))
-        return (ch - 6687);
-    if ((ch >= 0x2153) && (ch <= 0x2183))
-        return (ch - 6711);
-    if ((ch >= 0x2190) && (ch <= 0x21f3))
-        return (ch - 6723);
-    if ((ch >= 0x2200) && (ch <= 0x22f1))
-        return (ch - 6735);
-    if (ch == 0x2300)
-        return 2211;
-    if (ch == 0x2302)
-        return 2212;
-    if ((ch >= 0x2308) && (ch <= 0x230b))
-        return (ch - 6755);
-    if (ch == 0x2310)
-        return 2217;
-    if (ch == 0x2318)
-        return 2218;
-    if ((ch >= 0x231a) && (ch <= 0x231b))
-        return (ch - 6767);
-    if ((ch >= 0x2320) && (ch <= 0x2321))
-        return (ch - 6771);
-    if ((ch >= 0x2329) && (ch <= 0x232a))
-        return (ch - 6778);
-    if ((ch >= 0x239b) && (ch <= 0x23bd))
-        return (ch - 6890);
-    if (ch == 0x23ce)
-        return 2260;
-    if ((ch >= 0x2409) && (ch <= 0x240d))
-        return (ch - 6964);
-    if ((ch >= 0x2423) && (ch <= 0x2424))
-        return (ch - 6985);
-    if (ch == 0x2426)
-        return 2268;
-    if ((ch >= 0x2500) && (ch <= 0x2595))
-        return (ch - 7203);
-    if ((ch >= 0x25a0) && (ch <= 0x25f7))
-        return (ch - 7213);
-    if ((ch >= 0x2600) && (ch <= 0x2602))
-        return (ch - 7221);
-    if ((ch >= 0x2605) && (ch <= 0x260d))
-        return (ch - 7223);
-    if ((ch >= 0x2610) && (ch <= 0x2613))
-        return (ch - 7225);
-    if (ch == 0x2620)
-        return 2523;
-    if (ch == 0x2622)
-        return 2524;
-    if (ch == 0x2626)
-        return 2525;
-    if ((ch >= 0x2628) && (ch <= 0x262b))
-        return (ch - 7242);
-    if ((ch >= 0x262e) && (ch <= 0x2637))
-        return (ch - 7244);
-    if ((ch >= 0x2639) && (ch <= 0x2653))
-        return (ch - 7245);
-    if ((ch >= 0x2660) && (ch <= 0x2667))
-        return (ch - 7257);
-    if ((ch >= 0x2669) && (ch <= 0x266f))
-        return (ch - 7258);
-    if ((ch >= 0xfb00) && (ch <= 0xfb05))
-        return (ch - 61674);
-    if ((ch >= 0xfb50) && (ch <= 0xfbb1))
-        return (ch - 61748);
-    if ((ch >= 0xfbd3) && (ch <= 0xfbe9))
-        return (ch - 61781);
-    if ((ch >= 0xfbfc) && (ch <= 0xfbff))
-        return (ch - 61799);
-    if ((ch >= 0xfc5b) && (ch <= 0xfc63))
-        return (ch - 61890);
-    if (ch == 0xfc90)
-        return 2722;
-    if ((ch >= 0xfcf2) && (ch <= 0xfcf4))
-        return (ch - 62031);
-    if ((ch >= 0xfd3c) && (ch <= 0xfd3f))
-        return (ch - 62102);
-    if (ch == 0xfdf2)
-        return 2730;
-    if ((ch >= 0xfe50) && (ch <= 0xfe52))
-        return (ch - 62373);
-    if ((ch >= 0xfe54) && (ch <= 0xfe66))
-        return (ch - 62374);
-    if ((ch >= 0xfe68) && (ch <= 0xfe6b))
-        return (ch - 62375);
-    if ((ch >= 0xfe70) && (ch <= 0xfe72))
-        return (ch - 62379);
-    if (ch == 0xfe74)
-        return 2760;
-    if ((ch >= 0xfe76) && (ch <= 0xfefc))
-        return (ch - 62381);
-    if (ch == 0xfeff)
-        return 2896;
-    return 2898;
-}
+unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES] = {
-uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x18, 0x18, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x76, 0xdc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xde, 0xde, 0xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c, 0x0c, 0x0e, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00},
-    {0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xe6, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xa5, 0xa1, 0xa1, 0xa5, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x44, 0xba, 0xb2, 0xaa, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd8, 0x30, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xf6, 0xc0, 0xc0, 0xc0, 0x00},
-    {0x00, 0x00, 0x7f, 0xdb, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x30, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x0c, 0x18, 0x3e, 0x00, 0x00},
-    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
-    {0x30, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x3c, 0x42, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7a, 0xc4, 0xce, 0xce, 0xd6, 0xd6, 0xe6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x6c, 0x66, 0x66, 0x66, 0x66, 0xec, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0x1c, 0x3c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0xc4, 0xce, 0xd6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x7c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x0c, 0x18, 0x0e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x0c, 0x18, 0x0e, 0x00},
-    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x3e, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x18, 0x30, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x6c, 0x38, 0x10, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x6c, 0x38, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x18, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x18, 0x30, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x10, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xff, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7e, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7e, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0x3c, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x3c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x30, 0x1c, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x30, 0x1c, 0x00},
-    {0x18, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf7, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x7b, 0x7b, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x00, 0xee, 0x66, 0x66, 0x66, 0x66, 0x66, 0xf6, 0x06, 0x66, 0x3c, 0x00},
-    {0x08, 0x1c, 0x22, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x0e, 0x1b, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x30, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x30},
-    {0x6c, 0x38, 0x10, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x66, 0x66, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0x30, 0x30, 0x30, 0x36, 0x36, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x78, 0xe0, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x1e, 0x78, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x18, 0x18, 0x30},
-    {0x6c, 0x38, 0x10, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x60, 0x60, 0xc0, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0xcc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6e, 0xd8, 0xd8, 0xd8, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xd6, 0xd6, 0xde, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x30},
-    {0x6c, 0x38, 0x10, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x18, 0x0c, 0x38, 0x00},
-    {0x6c, 0x38, 0x10, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x10, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x78, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x78, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x30, 0x60, 0x38, 0x00},
-    {0x10, 0x38, 0x44, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x66, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xb3, 0xb3, 0x33, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x64, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x62, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xe6, 0xe6, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xe0, 0xe0, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x06, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x03, 0x3e, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0x7e, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xb6, 0xb3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x4c, 0x0c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0x4c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x18, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0xfe, 0xcc, 0x8c, 0x2c, 0x3c, 0x2c, 0x0c, 0x8c, 0xcc, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc2, 0xc0, 0x78, 0xc0, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xc0, 0x00},
-    {0x00, 0x00, 0x1c, 0x36, 0x32, 0x30, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0xe0, 0x00},
-    {0x00, 0x03, 0x3e, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x38, 0x6c, 0x38, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x6d, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc8, 0x38, 0x70, 0xd0, 0x38, 0x38, 0x6c, 0x64, 0xc6, 0xc2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0xec, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0xc0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x73, 0xdf, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x03, 0x03, 0x03, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xdf, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x03, 0x03, 0x03, 0x00},
-    {0x00, 0x00, 0x7e, 0xb3, 0xb3, 0x33, 0x3e, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x6c, 0xe6, 0x06, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x38, 0x60, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x0c, 0x38, 0x60, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x62, 0x30, 0x18, 0x18, 0x30, 0x62, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x0c, 0x6c, 0x38, 0x00},
-    {0x00, 0x00, 0x7e, 0xfe, 0x9a, 0x58, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x36, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00},
-    {0x03, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0x6c, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x63, 0xb3, 0xb3, 0x33, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x0d, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x18, 0xf0, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x7e, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0xfc, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x30, 0x7c, 0x06, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0x60, 0x30, 0x78, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x7c, 0xc0, 0xc6, 0x7c, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0c, 0x7e, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x60, 0x60, 0x78, 0x0c, 0x06, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x60, 0x78, 0x0c, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x18, 0x4c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x70, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x1b, 0x0e, 0x04, 0xf7, 0xd9, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf5, 0xda, 0xd8, 0xdf, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3d, 0x1a, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xcb, 0xf6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf3, 0x63, 0x60, 0x67, 0x63, 0x63, 0x63, 0x67, 0x6f, 0xff, 0x03, 0x1b, 0x0e, 0x00},
-    {0x00, 0x00, 0xe3, 0x63, 0x60, 0x67, 0x63, 0x63, 0x63, 0x63, 0x63, 0xf3, 0x03, 0x33, 0x1e, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xfb, 0xfb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xf8, 0xff, 0xfb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x33, 0x1e, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x00, 0xb7, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x33, 0x1e, 0x00},
-    {0x6c, 0x38, 0x10, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x00, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x78, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x28, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x78, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x00, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x30, 0x30, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xdf, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x3e, 0xcc, 0x78, 0x00},
-    {0x6c, 0x38, 0x10, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x6c, 0x38, 0x10, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xe0, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x6c, 0x38, 0x10, 0xfe, 0x0c, 0x18, 0x30, 0x7c, 0x06, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
-    {0x00, 0x1b, 0x0e, 0x04, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0xf7, 0xd9, 0xd9, 0xda, 0xda, 0xda, 0xda, 0xdc, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0xd8, 0xd8, 0xdf, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xdb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x70, 0x60, 0x60, 0x60, 0x60, 0xe0, 0x00},
-    {0x60, 0x30, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x38, 0x6c, 0x38, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x38, 0x6c, 0x38, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7a, 0xc4, 0xce, 0xce, 0xd6, 0xe6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7a, 0xc4, 0xce, 0xd6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x3c, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x18, 0x18, 0x30},
-    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x1c, 0x74, 0x06, 0x06, 0x06, 0x06, 0x1c, 0xf0, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0e, 0x3c, 0x06, 0x06, 0x1c, 0xf0, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xfc, 0x06, 0x0c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc0, 0xfc, 0x06, 0x0c, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x7c, 0x00, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x00, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x00, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x3c, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xdc, 0xe6, 0x7c, 0x80, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0d, 0x06, 0x00},
-    {0x00, 0x00, 0x06, 0x0d, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6c, 0x8e, 0x16, 0x26, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0xcd, 0x0d, 0x38, 0x0c, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xdc, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x06, 0x06, 0x1f, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x0d, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x46, 0x6c, 0x2c, 0x2c, 0x38, 0x18, 0x18, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0x64, 0x28, 0x38, 0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xdc, 0x6c, 0x0c, 0x0c, 0x0e, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x7b, 0xde, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x78, 0x58, 0x3e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x7f, 0x63, 0x66, 0x6c, 0x7e, 0x63, 0xf3, 0x03, 0x33, 0x1e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6e, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0xc0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x03, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0xd8, 0xd8, 0xde, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x6c, 0x0c, 0x0d, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x6c, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x66, 0x6c, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xfc, 0xc0, 0xd8, 0x70, 0x00},
-    {0x00, 0x00, 0x0e, 0x1b, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x98, 0xd8, 0x70, 0x00},
-    {0x00, 0x00, 0x0e, 0x1b, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x98, 0xd8, 0x70, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0xd8, 0x70, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x3b, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xd6, 0xd6, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x60, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x06, 0x06, 0x03, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x66, 0xcb, 0xfe, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x7e, 0xc7, 0x7c, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0x70, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x76, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0x7e, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x0c, 0x00, 0x1c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x7e, 0xcc, 0x78, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xcc, 0x6c, 0x3c, 0x3c, 0x6c, 0xcc, 0x0c, 0x0c, 0x0e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x0d, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x1c, 0x18, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0x70, 0x30, 0xfc, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xdb, 0xdb, 0xde, 0xde, 0xdb, 0x6b, 0x03, 0x1b, 0x0e, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xdb, 0xdd, 0x6f, 0x04, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x60, 0x60, 0xf6, 0x6d, 0x6c, 0x66, 0x63, 0x6b, 0x36, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x26, 0x6d, 0x6c, 0xfc, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x3c, 0x0c, 0x2c, 0x18, 0x00},
-    {0x00, 0x00, 0x20, 0x60, 0x60, 0xf6, 0x6d, 0x6c, 0x6c, 0x6e, 0x6d, 0x36, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0xc0, 0xfe, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x03, 0x0e, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6d, 0x6c, 0x66, 0x63, 0x6b, 0xf6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6f, 0x6b, 0x63, 0x66, 0x6c, 0x6d, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xd6, 0x7c, 0x6c, 0x28, 0xc6, 0xd6, 0x7c, 0x6c, 0x28, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xf0, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xc0, 0xf0, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xb0, 0xd8, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0xd8, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0xd8, 0x68, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xd8, 0xd8, 0xf0, 0xd8, 0xd8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc6, 0xd6, 0x7c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0x78, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0xc0, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x70, 0xc0, 0x70, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0x70, 0x18, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x20, 0x20, 0x70, 0x70, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xd8, 0xd8, 0x70, 0x70, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x1c, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x6c, 0x6c, 0x6c, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x34, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00},
-    {0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x34, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x3e, 0x32, 0x30, 0x34, 0x3c, 0x34, 0x30, 0x30, 0x32, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x33, 0x33, 0x33, 0x33, 0x3f, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x36, 0x36, 0x36, 0x77, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x82, 0x44, 0x7c, 0x44, 0x00, 0x82, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x62, 0x30, 0x18, 0x18, 0x30, 0x62, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x92, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x6c, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x46, 0x6c, 0x2c, 0x2c, 0x38, 0x18, 0x18, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x30, 0x18, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x46, 0x7c, 0x18, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0x20, 0x30, 0x10, 0x38, 0x38, 0x6c, 0x64, 0xc6, 0xc2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xf6, 0xc0, 0xc0, 0xc0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x66, 0x6c, 0x3c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x3c, 0x30, 0x60, 0x3c, 0x60, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x46, 0x2c, 0x2c, 0x18, 0x30, 0x68, 0x68, 0xc4, 0xc2, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x6c, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x36, 0x1e, 0xc6, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc2, 0x65, 0x24, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0xc0, 0x21, 0x32, 0x12, 0x1c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc2, 0x65, 0x24, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0xa6, 0x2c, 0x38, 0x68, 0xca, 0xc4, 0x0c, 0x18, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0x60, 0x3c, 0x06, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x78, 0x68, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x32, 0x30, 0x30, 0x3c, 0x34, 0x30, 0x30, 0x30, 0x30, 0x00},
-    {0x00, 0x60, 0x30, 0x30, 0x60, 0x63, 0xff, 0xc6, 0x06, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x60, 0x60, 0xfe, 0xfe, 0x0c, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xac, 0x26, 0x26, 0x0b, 0x0b, 0x1b, 0x1b, 0x1b, 0x1b, 0x03, 0x02, 0x04, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x30, 0x18, 0x28, 0x4c, 0x14, 0x24, 0x06, 0x02, 0x02, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6d, 0x03, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6d, 0x03, 0x7e, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xd6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x36, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x76, 0x9c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x7c, 0xd6, 0x66, 0x06, 0x06, 0x66, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x3c, 0x60, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x26, 0x1c, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0x68, 0x38, 0x30, 0x38, 0x38, 0x4c, 0x4c, 0x86, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0xba, 0x30, 0x38, 0x28, 0x4c, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xc0, 0xcc, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xdc, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x7e, 0x99, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x1c, 0x18, 0x7e, 0x58, 0x18, 0x18, 0x18, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0xa6, 0x2c, 0x38, 0x68, 0xca, 0xc4, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0x60, 0x3c, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x30, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xb2, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x03, 0x06, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xf8, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xd8, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xb2, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x18, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0xc6, 0x82, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xfe, 0x06, 0x02, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xff, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xb0, 0xb0, 0x30, 0x3c, 0x36, 0x36, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x3e, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x9c, 0xb6, 0xb6, 0xb6, 0xf6, 0xb6, 0xb6, 0xb6, 0xb6, 0x9c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xcc, 0xcc, 0xcc, 0x7c, 0x6c, 0x6c, 0x6c, 0x6c, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x7c, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0xc6, 0x82, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xfe, 0x06, 0x02, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xff, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb0, 0x30, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0xb6, 0xb6, 0xf6, 0xb6, 0xb6, 0x9c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xcc, 0xcc, 0x7c, 0x6c, 0x6c, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x06, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xf8, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0xfc, 0xb4, 0x30, 0x3c, 0x36, 0x36, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x30, 0xfc, 0xb4, 0x30, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xce, 0xdb, 0xd9, 0xd8, 0xfe, 0xd8, 0xd8, 0xd9, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xdb, 0xd8, 0xfe, 0xd8, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0x6c, 0xfe, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x6c, 0x7c, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x88, 0x8c, 0x9c, 0x96, 0xf6, 0xb6, 0xbf, 0xab, 0xeb, 0xeb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x8c, 0x9c, 0xf6, 0xbe, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x6c, 0x6c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x6c, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xa3, 0xb2, 0x96, 0xfc, 0x9c, 0xbe, 0xaa, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xa3, 0x96, 0xfe, 0xab, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0x06, 0x06, 0x7c, 0x06, 0x06, 0x06, 0x7c, 0xc0, 0x7c, 0x00, 0x00},
-    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0x86, 0x06, 0x7c, 0x06, 0x06, 0x7c, 0xc0, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x96, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0x96, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc2, 0xc6, 0xc6, 0xc4, 0xcc, 0x6c, 0x68, 0x78, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x64, 0x6c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0x66, 0x00, 0xc2, 0xc6, 0xc4, 0xc4, 0x6c, 0x68, 0x78, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xc2, 0xc6, 0x64, 0x6c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd8, 0xd8, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6f, 0x03, 0x06, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6f, 0x03, 0x06, 0x1c, 0x00},
-    {0x00, 0x10, 0x7c, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xd6, 0xc6, 0xc6, 0xc6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00},
-    {0x04, 0x7c, 0x40, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x7c, 0x40, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0x54, 0x00, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0x54, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x60, 0x3c, 0x0c, 0x0c, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0x78, 0x18, 0x18, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x3c, 0x0f, 0x18, 0x18, 0xf0, 0x3c, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x24, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x40, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x7c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0xc3, 0x00, 0x66, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x50, 0x46, 0x00, 0x82, 0x41, 0x00, 0x62, 0x0a, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x6e, 0x64, 0x7a, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x6e, 0x64, 0x7a, 0x60, 0x60, 0xf0, 0x00},
-    {0x02, 0x06, 0xfe, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x02, 0x06, 0xfe, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0xf8, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0xf8, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xf6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x78, 0x6c, 0x66, 0xf6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xdc, 0xf8, 0xdc, 0xd6, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xdc, 0xf8, 0xdc, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0xf6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0xf0, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf3, 0xb3, 0xb3, 0x36, 0x3c, 0x3c, 0x36, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf3, 0xb6, 0xbc, 0x3c, 0x36, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xdf, 0xdb, 0xd9, 0xd8, 0xf8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, 0xdb, 0xd9, 0xf8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xd8, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x0b, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xdb, 0x03, 0x0b, 0x06, 0x00},
-    {0x00, 0x00, 0x7c, 0xc2, 0xcc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0x7a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc2, 0xcc, 0xd6, 0xd6, 0xcc, 0x7a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x0c, 0x04, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x0c, 0x04, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x3c, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xf6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7f, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7f, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0x7e, 0x16, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0x7e, 0x16, 0x16, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x33, 0xb3, 0xb3, 0x7f, 0x30, 0x30, 0x30, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0xb3, 0x7f, 0x30, 0x30, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x33, 0xb3, 0xb3, 0x7f, 0x30, 0x30, 0x30, 0x33, 0x1e, 0x0c, 0x18, 0x0e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0xb3, 0x7f, 0x30, 0x30, 0x33, 0x1e, 0x0c, 0x18, 0x0e, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x06, 0x16, 0x0c, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0e, 0x0c, 0x08, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x0e, 0x0c, 0x08, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
-    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x3e, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x7c, 0xcd, 0xcd, 0xcd, 0xcd, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcd, 0xcd, 0xcd, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x8c, 0x0c, 0x38, 0x0d, 0x0d, 0x0d, 0x0d, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0x0c, 0x39, 0x0d, 0x0d, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6d, 0x6d, 0x6d, 0x6d, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6d, 0x6d, 0x6d, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xfc, 0xcd, 0xcd, 0xcd, 0xcd, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xfd, 0xcd, 0xcd, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xce, 0xc6, 0xc6, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x1b, 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x64, 0x94, 0xba, 0x52, 0x4c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x7b, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x7e, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x0c, 0xd8, 0xfe, 0xc3, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x06, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xcf, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x06, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xf6, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0x7f, 0x24, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0xf0, 0x3c, 0x0e, 0x04, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x6c, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x0c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x30, 0x60, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcf, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x06, 0x06, 0x7c, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x6c, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x16, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x76, 0x1e, 0x0e, 0x0c, 0xd8, 0xfe, 0xc3, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x30, 0x18, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x63, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xfe, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd0, 0xd0, 0xd0, 0x7c, 0x16, 0x16, 0x16, 0xd6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x06, 0x3c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x0c, 0x0c, 0x0c, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x0c, 0x18, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xcf, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0xc0, 0x00},
-    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3e, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xca, 0xc0, 0xc0, 0xc0, 0x00},
-    {0x00, 0x00, 0x60, 0x38, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x1c, 0x0c, 0x18, 0x3c, 0x64, 0x66, 0x62, 0x63, 0x3d, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x0c, 0x0c, 0x0f, 0x00},
-    {0x00, 0x00, 0x0e, 0x18, 0x30, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0f, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x3e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x3e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7e, 0x06, 0x06, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x76, 0x1c, 0x18, 0x30, 0x60, 0x3e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0xdc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x76, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0xfe, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xd0, 0xd0, 0x7c, 0x16, 0x16, 0x16, 0x16, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xcc, 0xcc, 0xcc, 0x77, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x6c},
-    {0x18, 0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x38, 0x10, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x60, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x0c, 0x00},
-    {0x10, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x74, 0xd6, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xc0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x03, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x18, 0x30, 0x00},
-    {0x0c, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1b, 0x36, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x44, 0xaa, 0x6c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x0a, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x40, 0x50, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x3c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6c, 0xd8, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x08, 0x30},
-    {0x60, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x40, 0xa0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x10, 0x10},
-    {0x18, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x03, 0x00},
-    {0x48, 0xa8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x33, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x00, 0x06, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x60, 0x66, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18},
-    {0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x18, 0x03, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x7e, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x66, 0x76, 0xdc, 0xcc, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x0c, 0x0c, 0x1c, 0x36, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xcc, 0xd6, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x66, 0x66, 0x66, 0x2c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x4c, 0xcc, 0xcc, 0xec, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x46, 0xc6, 0xc6, 0xe6, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x6c, 0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x34, 0x18, 0x0c, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x66, 0x64, 0x6c, 0x6e, 0x60, 0x60, 0x60, 0x60, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xf6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x66, 0x66, 0xe6, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0xc6, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x22, 0x20, 0x10, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x02, 0x3c, 0x40, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x20, 0x1c, 0x20, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00, 0x00},
-    {0x00, 0x30, 0x40, 0x38, 0x40, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x28, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x40, 0x30, 0x4e, 0x49, 0x39, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x24, 0x00},
-    {0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x12, 0xca, 0x2c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00},
-    {0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x14, 0x0c, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00},
-    {0x0a, 0x2a, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x7e, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x10, 0x0c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x10, 0x0c, 0x10},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x70, 0x70, 0x38, 0x18, 0x18, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x44, 0xfc, 0xf8, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x4a, 0xfe, 0xf4, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x20, 0x40, 0x30, 0x10, 0x20, 0x42, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x2c, 0x44, 0x42, 0x82, 0x82, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xf8, 0x78, 0x08, 0x08, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x82, 0xc6, 0xc6, 0x6c, 0x28, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x28, 0x6c, 0xc6, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xf8, 0x88, 0xf8, 0x78, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x91, 0x92, 0x64, 0x08, 0x10, 0x26, 0x49, 0x89, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x18, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0xfe, 0x7c, 0x38, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x06, 0x28, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x06, 0x28, 0x5e, 0x00, 0x00, 0x00},
-    {0x00, 0x07, 0x08, 0x07, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x04, 0x03, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x04, 0x03, 0x04, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x23, 0x54, 0x33, 0x24, 0x40, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x04, 0x03, 0x04, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x08, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00},
-    {0x06, 0x08, 0x06, 0x08, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x08, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x94, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x88, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x94, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x08, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x00, 0x08, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x00, 0x14, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x1c, 0x6a, 0x04, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x14, 0x08, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x12, 0x04, 0x18, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x15, 0x88, 0x88, 0x8a, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x88, 0x90, 0x65, 0x00, 0x02, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x00, 0x0a, 0x00, 0x01, 0x15, 0x88, 0x88, 0x90, 0x65, 0x00, 0x02, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x90, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x2a, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x00, 0x50, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00},
-    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x01, 0x02, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x20, 0x40, 0x3e, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x01, 0x02, 0x05, 0x0b, 0x48, 0x84, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x00, 0x29, 0x01, 0x19, 0x21, 0x19, 0xa1, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x05, 0x0b, 0x48, 0x84, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x44, 0x09, 0xa2, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x08, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x02, 0x2a, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x14, 0x00, 0x08, 0x00},
-    {0x00, 0x08, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x04, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x08, 0x14, 0x08, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x38, 0x40, 0x38, 0x40, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x40, 0x38, 0x40, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x12, 0x2c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x18, 0x10, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x08, 0x08, 0x08, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x20, 0x47, 0x88, 0x08, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x50, 0x20, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x08, 0x00, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x14, 0x00, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x80, 0x60, 0x80, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x40, 0x40, 0x43, 0x55, 0x7e, 0x80, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x2a, 0x20, 0x26, 0x2a, 0x7c, 0x80, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x0e, 0x1c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x14, 0x08, 0x14, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x2c, 0x10, 0x28, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x15, 0x8a, 0x90, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x5a, 0xa5, 0x66, 0x5b, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x5a, 0x66, 0xa5, 0x5a, 0x00},
-    {0x00, 0x00, 0x18, 0x66, 0x42, 0x42, 0x81, 0x99, 0x99, 0x81, 0x42, 0x42, 0x66, 0x18, 0x00, 0x00},
-    {0x08, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x26, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x0c, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x8a, 0x90, 0x60},
-    {0x32, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x0c, 0x04, 0x08, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x40, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x30, 0x40, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x54, 0xaa, 0x92, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x82, 0xfe, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x14, 0x08},
-    {0x08, 0x14, 0x22, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x10, 0x10, 0x10},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x70, 0x70, 0x38, 0x18, 0x18, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x44, 0xfc, 0xf8, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x4a, 0xfe, 0xf4, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x4e, 0xf0, 0xfe, 0x7c, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x38, 0x2c, 0x44, 0x42, 0x82, 0x92, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x60, 0x7e, 0x3c, 0x30, 0x60, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x82, 0xc6, 0xc6, 0x6c, 0x28, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x28, 0x6c, 0xc6, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xf8, 0x88, 0xf8, 0x78, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x88, 0x88, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x54, 0x54, 0x54, 0x54, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x4c, 0x30, 0x4c, 0x02, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0xaa, 0xaa, 0xaa, 0x82, 0x82, 0x40, 0x30, 0x4c, 0x02, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x82, 0x82, 0x44, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x82, 0x82, 0x40, 0x30, 0x4c, 0x02, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x38, 0x6c, 0x38},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x38, 0x6c, 0x38},
-    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x0c, 0xec, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x7c, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x30, 0x30, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x60, 0x0c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x30, 0x18, 0x70, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x30, 0x18, 0x70, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x10, 0x38, 0x6c, 0x00},
-    {0x60, 0x30, 0x00, 0x7c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x76, 0xdc, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x76, 0xdc, 0x00},
-    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x18, 0x0c, 0x38, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
-    {0x18, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x38, 0x6c, 0x64, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
-    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x0c, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x60, 0x30, 0xe0, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x30, 0x18, 0x70, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x6c, 0x38, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x6c, 0x38, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x76, 0xdc, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x76, 0xdc, 0x00},
-    {0x0c, 0x18, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x0c, 0xec, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x7c, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x7c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x7e, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x10, 0x38, 0x6c, 0x00},
-    {0x0c, 0x18, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x30, 0x30, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x10, 0x38, 0x6c, 0x00},
-    {0x0c, 0x18, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x00, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
-    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x7c, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x7c, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x60, 0x6c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0x70, 0x1c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x60, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x44, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0x70, 0x1c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x44, 0x38, 0x10, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x18, 0x18, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x06, 0x16, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x7e, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x7e, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x08, 0x1c, 0x36, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x6c, 0x6c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x6c, 0x6c, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x76, 0xdc, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x76, 0xdc, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x10, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x10, 0x38, 0x6c, 0x00},
-    {0x0c, 0x18, 0x72, 0x9c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x76, 0xdc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xcc, 0xcc, 0x00, 0xfc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x18, 0x18, 0x00},
-    {0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x30, 0x30, 0x00},
-    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x10, 0x38, 0x44, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
-    {0x6c, 0x6c, 0x00, 0x10, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x18, 0x0c, 0x18, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x30, 0x00, 0x38, 0x6c, 0x64, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x38, 0x0c, 0x18, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x16, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x16, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0xc0, 0x68, 0x1c, 0x36, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0xc0, 0x68, 0x1c, 0x36, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x28, 0x54, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x0c, 0x18, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x18, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x30, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x08, 0x54, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x08, 0x54, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x72, 0x9c, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x72, 0x9c, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x38, 0x0c, 0x18, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x23, 0x76, 0x88, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x26, 0x70, 0xd8, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xc4, 0x6e, 0x11, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0xc0, 0x64, 0x0e, 0x1b, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x38, 0x44, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x38, 0x0c, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x38, 0x0c, 0x18, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x23, 0x76, 0x88, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x26, 0x70, 0xd8, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xc4, 0x6e, 0x11, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0xc0, 0x64, 0x0e, 0x1b, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x28, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x18, 0x33, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1b, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x33, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x63, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x70, 0x1b, 0x33, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0x1b, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x68, 0xb3, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x68, 0xb3, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x38, 0x0c, 0x18, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0x18, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x33, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1b, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x33, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x63, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x70, 0x1b, 0x33, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0x1b, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x68, 0xb3, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x68, 0xb3, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x03, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
-    {0x30, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x0c, 0x18, 0xf6, 0x06, 0x00},
-    {0x38, 0x0c, 0x18, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x38, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x3a, 0x5c, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
-    {0x00, 0x18, 0x18, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x60, 0x6c, 0xc6, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xcc, 0x66, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x60, 0x66, 0xcc, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc6, 0x6c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x34, 0x58, 0x0c, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x34, 0x58, 0x30, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0xfe, 0x00, 0xa4, 0xaa, 0xea, 0xea, 0xa6, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xa4, 0xea, 0xaa, 0xaa, 0xa6, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x8a, 0xce, 0x8e, 0xea, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x8e, 0xca, 0x8a, 0xea, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xca, 0x2e, 0x4a, 0x2a, 0xca, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xaa, 0xae, 0xea, 0x2a, 0x2a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0x6a, 0x8e, 0xca, 0xaa, 0x4a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0x38, 0x20, 0x30, 0x20, 0x20, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0x30, 0x28, 0x30, 0x20, 0x20, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x4a, 0x4e, 0x4a, 0x4a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0x28, 0x28, 0x38, 0x28, 0x28, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0xa2, 0xa2, 0xe2, 0xea, 0xa4, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0x08, 0x08, 0x08, 0x28, 0x10, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0x80, 0x80, 0x80, 0xf0, 0x28, 0x30, 0x28, 0x0a, 0x0e, 0x0e, 0x0a, 0x00, 0xfe, 0x00},
-    {0xfe, 0x00, 0xc0, 0xa0, 0xc0, 0xa0, 0x20, 0x20, 0x38, 0x0a, 0x0e, 0x0e, 0x0a, 0x00, 0xfe, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x9c, 0xd2, 0xbc, 0x92, 0x9c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00},
-    {0x00, 0x18, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x66, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
-    {0x00, 0xcc, 0xcc, 0xcc, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x38, 0x3c, 0x38, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x6b, 0x6b, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x92, 0x44, 0x28, 0x92, 0x28, 0x44, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xc3, 0xdb, 0x1b, 0x1e, 0x1c, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x7c, 0x00, 0x00},
-    {0x7c, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x38, 0x6c, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x28, 0x00, 0x00, 0x44, 0xee, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7b, 0xcf, 0xcf, 0x1b, 0x33, 0x33, 0x33, 0x00, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xde, 0xf3, 0xf3, 0xc6, 0xcc, 0xcc, 0xcc, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x06, 0x06, 0x0c, 0x0c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xdb, 0xdb, 0xdb, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x72, 0xf2, 0xf2, 0xf2, 0x72, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x9c, 0x9e, 0x9e, 0x9e, 0x9c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd8, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x18, 0x38, 0x78, 0xd8, 0xfc, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xf8, 0xc0, 0xf0, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x78, 0xc0, 0xf0, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xf8, 0xd8, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd8, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd8, 0xd8, 0x78, 0x18, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x60, 0x60, 0x60, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x60, 0x30, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xb0, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0xd8, 0xfc, 0x18, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xc0, 0xf0, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xc0, 0xf0, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd8, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xd8, 0x78, 0x18, 0xf0, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x60, 0x60, 0x60, 0x30, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0xc0, 0xcf, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x04, 0x7c, 0xce, 0xc8, 0xc8, 0xd0, 0xd0, 0xd0, 0xe0, 0xe6, 0x7c, 0x40, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xd6, 0xd8, 0xd8, 0xd8, 0xde, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xc0, 0xc0, 0xc0, 0xf0, 0xcd, 0xce, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x60, 0xf8, 0x60, 0xf8, 0x60, 0x60, 0xe6, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x02, 0xec, 0xd6, 0xde, 0xd6, 0xd6, 0xf6, 0xd6, 0x40, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x66, 0x76, 0xff, 0x76, 0x6e, 0xff, 0x6e, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x62, 0x66, 0x6f, 0x66, 0x66, 0xf3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xf8, 0xe0, 0xf3, 0xd6, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x81, 0x81, 0x81, 0x5a, 0xff, 0x5a, 0xff, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xf2, 0x8a, 0xaa, 0xaa, 0xaa, 0xaa, 0xa2, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x3e, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x7c, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x36, 0x60, 0xfc, 0x60, 0xf8, 0x60, 0x60, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x6c, 0x78, 0xfe, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x1e, 0x78, 0x1e, 0x78, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x7c, 0xb6, 0x36, 0x33, 0x33, 0x33, 0x63, 0x66, 0xf6, 0xdc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd0, 0xd2, 0xd6, 0x7c, 0x18, 0x30, 0x6e, 0xd8, 0x98, 0x18, 0x0e, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xd0, 0xd2, 0xd6, 0x7c, 0x18, 0x30, 0x6e, 0xd8, 0x8c, 0x06, 0x1c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x62, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0x62, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x4e, 0xb9, 0x58, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x7c, 0xda, 0xd8, 0xd8, 0xda, 0x7c, 0x19, 0x3f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x18, 0x30, 0x6e, 0xdb, 0x9b, 0x1b, 0x0e, 0x00, 0x00, 0x00},
-    {0x00, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x18, 0x30, 0x7b, 0xdb, 0x9b, 0x1b, 0x0d, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc2, 0xc0, 0x78, 0xc0, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x26, 0x3e, 0x26, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7f, 0xb9, 0x58, 0x1a, 0x1e, 0x1a, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x66, 0x46, 0x87, 0x8c, 0x8c, 0x7c, 0x98, 0x98, 0x70, 0x00},
-    {0x00, 0x00, 0x52, 0xb5, 0x15, 0x16, 0x2c, 0x34, 0x68, 0xa9, 0xaa, 0x4c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x48, 0xb0, 0x80, 0x48, 0x7c, 0x66, 0x26, 0x26, 0xa6, 0x46, 0x06, 0x34, 0x48, 0x00},
-    {0x00, 0x00, 0xe2, 0xa2, 0xa2, 0xa2, 0xbe, 0xa2, 0xa2, 0xa2, 0xa2, 0xe2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x36, 0x3b, 0x3b, 0x33, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x1e, 0x18, 0x76, 0x3b, 0x3b, 0x33, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x33, 0x4e, 0x06, 0x06, 0x0c, 0x0c, 0x1f, 0x6c, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x71, 0x8e, 0x04, 0x0c, 0x06, 0x03, 0x63, 0xc3, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x46, 0x49, 0x39, 0x1e, 0x18, 0x30, 0x70, 0xb1, 0xba, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0e, 0x19, 0x31, 0x32, 0x64, 0x68, 0x70, 0xe1, 0x66, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd8, 0xff, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe2, 0xa2, 0xb2, 0xb2, 0xaa, 0xaa, 0xa6, 0xa6, 0xa2, 0xe2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xcc, 0xcf, 0xed, 0xff, 0xfc, 0xdf, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0xb9, 0xa5, 0xa5, 0xb9, 0xa1, 0xa1, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x40, 0x8e, 0x93, 0xa3, 0x63, 0x4b, 0x6a, 0xa4, 0xb0, 0xb0, 0x60, 0x00},
-    {0x00, 0x00, 0xfc, 0xa2, 0xa2, 0xa2, 0xa2, 0xbc, 0xa0, 0xa0, 0xa0, 0xe0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xa2, 0xa2, 0xa2, 0xa2, 0xa2, 0xa2, 0xaa, 0xa6, 0x7e, 0x01, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x4d, 0x4d, 0x19, 0x1e, 0x1c, 0x34, 0x34, 0xb5, 0x62, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x58, 0xa6, 0xa3, 0x6c, 0xb8, 0x26, 0x26, 0x26, 0xa7, 0xc2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0xa2, 0xa2, 0xa2, 0xa2, 0xbc, 0xb0, 0xa8, 0xa4, 0xe2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x6d, 0x67, 0x66, 0xee, 0x08, 0x00, 0x00, 0x00},
-    {0x30, 0x0c, 0xfc, 0xc6, 0xc6, 0xc6, 0xfc, 0xd8, 0xdc, 0xdc, 0xe6, 0xe6, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x71, 0xdb, 0x35, 0xd1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x52, 0x5a, 0x52, 0x5f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf1, 0x5b, 0x55, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x18, 0xce, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6, 0x6c, 0x38, 0x50, 0x40, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x0a, 0x14, 0x14, 0x28, 0x28, 0x50, 0x50, 0xa0, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x9c, 0x30, 0xfe, 0x0c, 0x18, 0x38, 0x0c, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x00},
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0x6c, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x26, 0x03, 0x13, 0x0c, 0x13, 0x03, 0x03, 0x66, 0x98, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x6c, 0x38, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x2d, 0x2d, 0x1a, 0x1e, 0x1b, 0x31, 0x31, 0xb2, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x14, 0x6b, 0xc8, 0xcc, 0xc6, 0xc6, 0xcc, 0xc0, 0x63, 0x1c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0xe7, 0xff, 0xe0, 0x67, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x26, 0x44, 0xf8, 0xc0, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x4c, 0x52, 0x3c, 0x10, 0x3c, 0x60, 0xc0, 0xc3, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x73, 0xce, 0x18, 0x3a, 0x5c, 0x18, 0x30, 0x30, 0xb0, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x2c, 0x3c, 0x2c, 0x8c, 0xcc, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x12, 0x12, 0x12, 0x16, 0x36, 0x3e, 0x3a, 0x5a, 0x52, 0x91, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x26, 0x46, 0xc6, 0xc4, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x42, 0xc6, 0xe7, 0x7a, 0x38, 0x5c, 0xce, 0xe7, 0x63, 0xe2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xfc, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x7e, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x40, 0x78, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x7e, 0xf2, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xfe, 0x7e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x38, 0x00, 0x78, 0x38, 0x38, 0x38, 0x38, 0x38, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0xff, 0x83, 0x86, 0x82, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0xe0, 0x30, 0x62, 0xc6, 0xfc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0xe0, 0x30, 0x62, 0xc6, 0xfc, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0x30, 0x70, 0xb2, 0xf6, 0x3c, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0xb0, 0x3c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xf0, 0xc0, 0xe2, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb0, 0x3c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xf0, 0x80, 0xe2, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xf0, 0x30, 0x62, 0x66, 0x6c, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0xce, 0xc4, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x73, 0x23, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x65, 0x65, 0x65, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xb5, 0xb5, 0xb5, 0xb5, 0xb5, 0xb5, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xce, 0xce, 0xce, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0x73, 0x73, 0x73, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x95, 0x95, 0x95, 0x65, 0x65, 0x65, 0x95, 0x95, 0x95, 0x95, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0xc4, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x23, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x05, 0x05, 0x00, 0x95, 0x95, 0x95, 0x95, 0x95, 0x65, 0x65, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x15, 0x15, 0x00, 0xb5, 0xb5, 0xb5, 0xb5, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0xdb, 0xdb, 0xce, 0xce, 0xce, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x00, 0xdb, 0xdb, 0x73, 0x73, 0x73, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x05, 0x05, 0x00, 0x95, 0x95, 0x65, 0x65, 0x95, 0x95, 0x95, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x5a, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xcc, 0xe6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6, 0xcc, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x5a, 0x99, 0xbd, 0xdb, 0xdb, 0xbd, 0x99, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x06, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xf0, 0xe0, 0xb0, 0x18, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x0f, 0x07, 0x0d, 0x18, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x30, 0x18, 0x0d, 0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x0c, 0x18, 0xb0, 0xe0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x62, 0xff, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x26, 0xff, 0x46, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x73, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xff, 0x6c, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0xff, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x66, 0xfc, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x3f, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x63, 0xff, 0x63, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xff, 0xc6, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x33, 0x63, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0xc6, 0x7f, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x3b, 0x6b, 0xfe, 0x68, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x60, 0xdc, 0xd6, 0x7f, 0x16, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x5a, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x6e, 0xff, 0x76, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x30, 0x60, 0x63, 0xff, 0xc6, 0x16, 0x1c, 0x1c, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0x66, 0x36, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x0c, 0xfe, 0xcc, 0xd8, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x36, 0x66, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xd8, 0xcc, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0x0c, 0x3f, 0x1e, 0x0c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x36, 0x66, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x30, 0xfc, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0x0c, 0x3f, 0x1e, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x00, 0xf0, 0xe0, 0xb0, 0x18, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x98, 0xb0, 0xff, 0xb0, 0x98, 0x19, 0x0d, 0xff, 0x0d, 0x19, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x1e, 0x1c, 0x16, 0x03, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x78, 0x38, 0x68, 0xc0, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1e, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x30, 0x60, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x2e, 0x3f, 0x24, 0x24, 0x24, 0x24, 0xfc, 0x74, 0x24, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x60, 0xff, 0x60, 0x30, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x7e, 0xff, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0xff, 0x7e, 0x24, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x00, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x00, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7f, 0xc4, 0x7f, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x7e, 0xcb, 0x7e, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0xfe, 0x23, 0xfe, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x7f, 0xc0, 0x7f, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x7c, 0xee, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xfe, 0x03, 0xfe, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x7e, 0xc3, 0x7e, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x7c, 0xee, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xf0, 0xe0, 0xb0, 0xd8, 0xec, 0xb6, 0x1b, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x0f, 0x07, 0x0d, 0x1b, 0x37, 0x6d, 0xd8, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x20, 0x30, 0xd8, 0x6d, 0x37, 0x1b, 0x0d, 0x07, 0x0f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x0c, 0x1b, 0xb6, 0xec, 0xd8, 0xb0, 0xe0, 0xf0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x60, 0xff, 0x60, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0x06, 0xff, 0x06, 0xfc, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x6a, 0xff, 0x65, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xa6, 0xff, 0x56, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xd5, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0x66, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xab, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xb0, 0xff, 0xb0, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0d, 0xff, 0x0d, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x41, 0x81, 0x41, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0x82, 0x81, 0x82, 0xfc, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0x44, 0x44, 0x44, 0x44, 0x44, 0xc6, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x7c, 0x00, 0x7c, 0x44, 0x7c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x7c, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x54, 0xd6, 0x54, 0x54, 0x54, 0xd6, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x28, 0x54, 0xee, 0x44, 0xc6, 0x44, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x28, 0x54, 0xee, 0x44, 0xc6, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xe8, 0xbc, 0x82, 0x81, 0x82, 0xbc, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x80, 0xbc, 0xb8, 0xac, 0x86, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x01, 0x81, 0xc1, 0x61, 0x35, 0x1d, 0x3d, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0xfe, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x06, 0x06, 0x3e, 0x66, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x7e, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0xfe, 0x16, 0x16, 0x16, 0x7e, 0x16, 0x26, 0x26, 0x26, 0xfe, 0x40, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x3e, 0x66, 0xcf, 0xdb, 0xdb, 0xf3, 0x66, 0x7c, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x3e, 0x60, 0xc0, 0xc0, 0xfe, 0xc0, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x3e, 0x64, 0xc8, 0xc8, 0xfe, 0xc8, 0xd0, 0x70, 0x3e, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x60, 0xc0, 0xfe, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xf8, 0x0c, 0x06, 0x06, 0xfe, 0x06, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0xf8, 0x1c, 0x16, 0x26, 0xfe, 0x26, 0x26, 0x4c, 0xf8, 0x40, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x0c, 0x06, 0xfe, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xe7, 0x00, 0x00},
-    {0x00, 0x00, 0xe7, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x18, 0x30, 0x60, 0xc1, 0xff, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0x00, 0x00, 0x00},
-    {0x00, 0xc0, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x7e, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x06, 0x06, 0x06, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe3, 0x33, 0x66, 0x36, 0xe6, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x33, 0x73, 0xb6, 0xf6, 0x36, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdb, 0xdb, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x16, 0x0c, 0x1c, 0x34, 0x62, 0xff, 0x02, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x1a, 0x1c, 0x38, 0x58, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6e, 0x7c, 0xec, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x1a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
-    {0x33, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
-    {0x2a, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0xa8, 0x00, 0x00},
-    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0x99, 0x99, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
-    {0x33, 0x66, 0x66, 0x66, 0x7e, 0xe7, 0xe7, 0xe7, 0xe7, 0x7e, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
-    {0x2a, 0x54, 0x54, 0x54, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x54, 0x54, 0x54, 0xa8, 0x00, 0x00},
-    {0x18, 0x34, 0x30, 0x30, 0x38, 0x35, 0x33, 0x37, 0x30, 0x30, 0x30, 0x30, 0xb0, 0x60, 0x00, 0x00},
-    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0xfa, 0x5a, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
-    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0x5f, 0x5a, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0xfc, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x7e, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x76, 0xdc, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xdb, 0xdb, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xdb, 0xdb, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x1c, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x10, 0x76, 0xdc, 0x10, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0xfe, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0xfe, 0x20, 0xfe, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0x76, 0xdc, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x7c, 0x00, 0x7c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0x00, 0x66, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0x60, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x06, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc0, 0xdf, 0x00, 0x00, 0xdf, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x00, 0x00, 0xfb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x28, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x10, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x44, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x44, 0x28, 0x10, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x10, 0x7c, 0x28, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x10, 0x28, 0x44, 0x7c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x26, 0x7c, 0xb4, 0x6c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x68, 0x54, 0x54, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x08, 0x10, 0x00, 0x10, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x08, 0x7e, 0x08, 0x10, 0x7e, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x08, 0xfe, 0x08, 0x10, 0xfe, 0x10, 0x20, 0xfe, 0x20, 0x40, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36, 0x1b, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x66, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x66, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0xce, 0x7c, 0x10, 0x7c, 0xe6, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x76, 0xdc, 0x20, 0x20, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0x76, 0xdc, 0x80, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x0e, 0x38, 0xe8, 0x38, 0x1e, 0xf0, 0x38, 0x2e, 0x38, 0xe0, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0xe8, 0x38, 0x0e, 0x38, 0xf0, 0x1e, 0x38, 0xe0, 0x38, 0x2e, 0x20, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0xf2, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x9e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x06, 0x0c, 0x38, 0xe8, 0x38, 0x1c, 0x16, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0xd0, 0x70, 0x38, 0x2e, 0x38, 0x60, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x7e, 0xc8, 0xc8, 0xd0, 0xd0, 0x7e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0xfc, 0x16, 0x16, 0x26, 0x26, 0xfc, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x7e, 0xc8, 0xc8, 0xd0, 0xd0, 0x7e, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0xfc, 0x16, 0x16, 0x26, 0x26, 0xfc, 0x40, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x08, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0x92, 0xa2, 0xfa, 0xa2, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0xba, 0xba, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0xba, 0x92, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x54, 0x92, 0xfe, 0x92, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xfe, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0xaa, 0x92, 0xaa, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x8a, 0x92, 0xa2, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xba, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xaa, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x54, 0xd6, 0xba, 0xd6, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0xba, 0x82, 0xba, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xba, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0xfe, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0xfe, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x92, 0xba, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x7e, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xd8, 0xdf, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xa8, 0xa8, 0xa8, 0xa8, 0xaf, 0xa8, 0xa8, 0xa8, 0xa8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xdf, 0xd8, 0xdf, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc2, 0xc4, 0xc4, 0xff, 0xc8, 0xc8, 0xd0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xc4, 0xc4, 0xff, 0xc8, 0xff, 0xd0, 0xd0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xd8, 0xd9, 0xda, 0xda, 0xdf, 0xda, 0xda, 0xdc, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xd8, 0xd9, 0xda, 0xdf, 0xda, 0xdf, 0xda, 0xdc, 0xd8, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x0c, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x60, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x06, 0x1e, 0x76, 0xc6, 0x76, 0x1e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc0, 0xf0, 0xdc, 0xc6, 0xdc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x1e, 0x76, 0xc6, 0x76, 0x1e, 0x06, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xf0, 0xdc, 0xc6, 0xdc, 0xf0, 0xc0, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xbf, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xfd, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0xc6, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf0, 0xc8, 0xc4, 0xc4, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0b, 0x13, 0x23, 0x43, 0x83, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x38, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x92, 0x44, 0x28, 0x92, 0x28, 0x44, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0xc4, 0xa8, 0x90, 0xa8, 0xc4, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x82, 0x46, 0x2a, 0x12, 0x2a, 0x46, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x3e, 0x60, 0xce, 0xd8, 0xd8, 0xce, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xf8, 0x0c, 0xe6, 0x36, 0x36, 0xe6, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x10, 0x38, 0x54, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x64, 0xce, 0x64, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x4c, 0xe6, 0x4c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x15, 0x2a, 0x54, 0xa8, 0x54, 0x2a, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xa8, 0x54, 0x2a, 0x15, 0x2a, 0x54, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00},
-    {0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf2, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x9e, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0a, 0x0e, 0x1c, 0xf0, 0x1c, 0x16, 0xf2, 0x1c, 0x26, 0x22, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x88, 0xc8, 0x70, 0x1e, 0x70, 0xd0, 0x9e, 0x70, 0xe0, 0xa0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0xfe, 0xc8, 0xc8, 0xd0, 0xd0, 0xfe, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0xfe, 0x16, 0x16, 0x26, 0x26, 0xfe, 0x40, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x08, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x0e, 0x1e, 0x76, 0xd6, 0x76, 0x1e, 0x26, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0xc8, 0xf0, 0xdc, 0xd6, 0xdc, 0xf0, 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x0e, 0x1e, 0x76, 0xd6, 0x76, 0x1e, 0x26, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0xc8, 0xf0, 0xdc, 0xd6, 0xdc, 0xf0, 0xe0, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x3d, 0x66, 0xc7, 0xcb, 0xd3, 0xe3, 0x66, 0xbc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x42, 0xa5, 0x7e, 0x24, 0x24, 0x7e, 0xa5, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x38, 0x54, 0x8a, 0xf6, 0x82, 0x54, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0xfe, 0xfe, 0x44, 0x44, 0x28, 0x10, 0x28, 0x44, 0x44, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x00, 0x00},
-    {0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00},
-    {0x00, 0x03, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
-    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
-    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x03, 0x00, 0x00},
-    {0x00, 0xc0, 0x60, 0x30, 0x30, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
-    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
-    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x30, 0x30, 0x60, 0xc0, 0x00, 0x00},
-    {0x00, 0x3f, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
-    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
-    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3f, 0x00, 0x00},
-    {0x00, 0xfc, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
-    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
-    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xfc, 0x00, 0x00},
-    {0x00, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0},
-    {0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07},
-    {0x00, 0x00, 0xff, 0xc1, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x30, 0x30, 0x30, 0x30, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xc0, 0xc1, 0xff, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xff, 0x00, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0x78, 0x78, 0x38, 0x38, 0x18, 0x18, 0x00, 0x00},
-    {0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
-    {0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03},
-    {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x07, 0x05, 0x05, 0x05, 0x05, 0x25, 0x79, 0xc2, 0x7c, 0x20, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd8, 0xd8, 0xf8, 0xd8, 0xd8, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xf0, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd8, 0xd8, 0xf8, 0x70, 0x20, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xf0, 0xc0, 0xe0, 0xc0, 0xc0, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0xc0, 0xc0, 0xc0, 0x70, 0x1e, 0x1b, 0x1e, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x98, 0xd8, 0xf8, 0xd8, 0xd8, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7c, 0xfe, 0xc6, 0xc6, 0x60, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0e, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x70, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80},
-    {0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01},
-    {0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe},
-    {0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc},
-    {0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8},
-    {0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0},
-    {0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0},
-    {0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
-    {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},
-    {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f},
-    {0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44},
-    {0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa},
-    {0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77},
-    {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
-    {0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x82, 0xba, 0xba, 0xba, 0xba, 0xba, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x8a, 0xc6, 0xa2, 0x92, 0x8a, 0xc6, 0xa2, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xa2, 0xc6, 0x8a, 0x92, 0xa2, 0xc6, 0x8a, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x42, 0x84, 0x84, 0xfc, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x44, 0x44, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x80, 0xc0, 0xa0, 0x90, 0x88, 0x84, 0x88, 0x90, 0xa0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70, 0x78, 0x70, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70, 0x48, 0x70, 0x40, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x98, 0x86, 0x98, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0x82, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x02, 0x06, 0x0a, 0x12, 0x22, 0x42, 0x22, 0x12, 0x0a, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0x78, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0x48, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x3e, 0xfe, 0x3e, 0x0e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x32, 0xc2, 0x32, 0x0e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0x44, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x44, 0x54, 0xba, 0xba, 0x54, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xbd, 0xbd, 0xbd, 0xbd, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x28, 0x28, 0x44, 0x82, 0x82, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x14, 0x40, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x02, 0x28, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xa5, 0xa5, 0xa5, 0xa5, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x72, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0x72, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x4e, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x7e, 0xff, 0xff, 0xff, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xc3, 0xbd, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0xbd, 0xc3, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xc3, 0xbd, 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0xbd, 0xc3, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x30, 0x40, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0c, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x30, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff},
-    {0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff},
-    {0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80},
-    {0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0xff, 0xfd, 0xf9, 0xf1, 0xf1, 0xe1, 0xc1, 0x81, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x81, 0x83, 0x87, 0x8f, 0x8f, 0x9f, 0xbf, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xff, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x28, 0x28, 0x44, 0x44, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x74, 0x74, 0xf2, 0xf2, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x5c, 0x5c, 0x9e, 0x9e, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0x92, 0xf2, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0xf2, 0x92, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x9e, 0x92, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0x92, 0x9e, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x4a, 0x89, 0x89, 0x89, 0xf9, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0xf9, 0x89, 0x89, 0x89, 0x4a, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x9f, 0x91, 0x91, 0x91, 0x52, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x52, 0x91, 0x91, 0x91, 0x9f, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x54, 0x38, 0xfe, 0x38, 0x54, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x30, 0x7c, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0xfe, 0x7c, 0x38, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x28, 0xee, 0x44, 0x54, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x34, 0x1c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcd, 0xc7, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0x92, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0xa5, 0xa5, 0x42, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x42, 0xa5, 0xa5, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x18, 0x30, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x86, 0x8a, 0xba, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0xee, 0xba, 0xba, 0xee, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x82, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x7c, 0x82, 0xaa, 0x82, 0x44, 0x7c, 0x44, 0x38, 0x00, 0x44, 0xc6, 0x38, 0xc6, 0x44, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x44, 0xee, 0xfe, 0x92, 0xba, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x7e, 0x18, 0x18, 0xff, 0x18, 0x1e, 0x78, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x7e, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x38, 0x10, 0x10, 0x92, 0xfe, 0x92, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x72, 0xe0, 0xc4, 0xdf, 0xce, 0xca, 0xe0, 0x72, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x54, 0x28, 0x54, 0xaa, 0xaa, 0xaa, 0xaa, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x5a, 0x99, 0x99, 0x99, 0xbd, 0xff, 0xdb, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x85, 0xb1, 0xf9, 0xff, 0xdf, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0x81, 0x99, 0xa5, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xa5, 0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xdb, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x54, 0x28, 0xc6, 0x28, 0x54, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x78, 0x14, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x14, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x28, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x28, 0x1e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x06, 0x0e, 0x1a, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x03, 0x03, 0x7b, 0xcf, 0xcf, 0xcf, 0x0f, 0x1b, 0x33, 0xff, 0x03, 0x03, 0x03, 0x00, 0x00},
-    {0x00, 0x00, 0x60, 0xf0, 0x60, 0x6e, 0x73, 0x63, 0x63, 0x66, 0x66, 0x63, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xd6, 0x54, 0x54, 0x7c, 0x54, 0x54, 0xd6, 0x38, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x3c, 0xdb, 0xdb, 0xdb, 0xdb, 0x7e, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x00, 0x00},
-    {0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xf8, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x42, 0xa5, 0xa5, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0xc3, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00},
-    {0x00, 0x00, 0xc3, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7e, 0xc3, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7e, 0xdb, 0xd8, 0x70, 0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x33, 0x1b, 0x7b, 0xdb, 0xdb, 0x73, 0x03, 0x01, 0x00, 0x00},
-    {0x00, 0x00, 0x94, 0x7c, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x06, 0x0b, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x24, 0xe7, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x94, 0x7c, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x04, 0x03, 0x00, 0x00},
-    {0x00, 0x00, 0x1f, 0x07, 0x8f, 0xdb, 0x73, 0x70, 0xd8, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x90, 0x50, 0x70, 0x68, 0x48, 0x48, 0x4e, 0x49, 0x09, 0x0e, 0x10, 0x20, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x2a, 0x7e, 0xaa, 0x00, 0x00, 0x2a, 0x7e, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc3, 0x66, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x44, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x24, 0x42, 0x81, 0x81, 0x66, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x18, 0x24, 0x3c, 0xe7, 0xa5, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x38, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x30, 0x3c, 0x3e, 0x32, 0x30, 0x30, 0x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0x7f, 0x6f, 0x63, 0x63, 0x63, 0x63, 0xe3, 0xe7, 0xc7, 0x06, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x7f, 0x63, 0x7f, 0x63, 0x63, 0x63, 0x63, 0x63, 0xe7, 0xe7, 0xc6, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xde, 0xe6, 0xc4, 0xd8, 0xe0, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x40, 0x40, 0x44, 0x5c, 0x74, 0x44, 0x44, 0x5c, 0x74, 0x44, 0x04, 0x04, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x04, 0x46, 0x5c, 0x74, 0xc4, 0x46, 0x5c, 0x74, 0xc4, 0x40, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x3b, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3c, 0x6e, 0x66, 0x60, 0xfe, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x3e, 0x6e, 0x66, 0x66, 0xfe, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6e, 0xdb, 0xdb, 0xd8, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x6f, 0xdb, 0xdb, 0xdb, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x38, 0x6c, 0x6c, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6d, 0xf6, 0x00, 0x00, 0x00, 0x00},
-    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x14, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x88, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x88, 0x80, 0x88, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x94, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x94, 0x80, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x94, 0x80, 0x88, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x94, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x94, 0x80, 0x94, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x28, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x28, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x00, 0x28, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x00, 0x28, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x38, 0x28, 0x70, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x01, 0x02, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x01, 0x02, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
-    {0x04, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
-    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
-    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xa2, 0x0c, 0x13, 0x0c, 0x10, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xa2, 0x0c, 0x13, 0x0c, 0x10, 0x10, 0x08, 0x04, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x00, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x38, 0x40, 0x38, 0x40, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x70, 0x80, 0x70, 0x80, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf0, 0x10, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf7, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x3f, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x70, 0x80, 0x70, 0x80, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x00, 0x07, 0x18, 0x20, 0x3f, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x00, 0x29, 0x01, 0x19, 0x21, 0x19, 0xa1, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x00, 0x2a, 0x02, 0x32, 0x42, 0x32, 0xc6, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x40, 0x00, 0xa3, 0x0c, 0x10, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x40, 0x00, 0xa3, 0x0c, 0x10, 0x10, 0x08, 0x04, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x18, 0x10, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x18, 0x10, 0x20, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x08, 0x08, 0x08, 0x08, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x23, 0x54, 0x33, 0x24, 0x40, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x10, 0x00, 0x10},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x10, 0x00, 0x10},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x20, 0x20, 0x20, 0x20, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x10, 0x10, 0x10, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x10, 0x10, 0x10, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x98, 0x60, 0xc2, 0x12, 0x92, 0x9c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x02, 0x92, 0x9c, 0x60, 0x0e, 0x70, 0x0e, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x60, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x10, 0x60, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x04, 0x54, 0x58, 0x20, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x10, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
-    {0x0e, 0xf0, 0x02, 0x92, 0x9c, 0x60, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x18, 0x60, 0x02, 0x92, 0x9c, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x02, 0x12, 0x9c, 0x60, 0x0e, 0x70, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x28, 0x50, 0x28, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x14, 0x28, 0x14, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x08, 0x10, 0x54, 0x38, 0x54, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x10, 0x08, 0x2a, 0x1c, 0x2a, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x2a, 0x14, 0x00, 0x21, 0x69, 0xa9, 0x69, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x08, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x20, 0x10, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x08, 0x08, 0x04, 0x08, 0x08, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x7c, 0x28, 0x7c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x10, 0x2a, 0x24, 0x1a, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x38, 0x38, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x54, 0x30, 0x18, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x08, 0x08, 0x10, 0x10, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x54, 0x58, 0x40, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x06, 0x18, 0x60, 0x06, 0x18, 0x60, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x12, 0xca, 0x2c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00},
-    {0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x06, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x08, 0x14, 0x0c, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x14, 0x18, 0x60, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x06, 0x18, 0x60, 0x00, 0x00},
-    {0x0a, 0x2a, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x02, 0x12, 0x92, 0x9c, 0x60, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x02, 0x3c, 0x40, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x3e, 0x40, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x18, 0x20, 0x1c, 0x20, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x0c, 0x10, 0x0e, 0x10, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x0c, 0x10, 0x0e, 0x10, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x0c, 0x10, 0x0e, 0x10, 0x00, 0x00},
-    {0x00, 0x30, 0x40, 0x38, 0x40, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x30, 0x40, 0x38, 0x40, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x28, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x50, 0x00, 0x10, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x88, 0x80, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x80, 0x80, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x80, 0x80, 0x40, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x15, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0x22, 0x41, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x10, 0x10, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x08, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0x22, 0x41, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
-    {0x00, 0x00, 0x10, 0x00, 0x00, 0x0e, 0x10, 0x10, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x0a, 0x00, 0x00, 0x06, 0x09, 0x49, 0x87, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x32, 0x42, 0x32, 0x42, 0x02, 0x86, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x06, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3c, 0x4b, 0x4a, 0x44, 0x40, 0x40, 0x40, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x32, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x32, 0xcd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x10, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x40, 0x30, 0x4e, 0x49, 0x39, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x24, 0x28, 0xf3, 0x24, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x24, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x24, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
-    {0x68, 0x90, 0x02, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x68, 0x90, 0x02, 0x32, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x60, 0x80, 0x72, 0xa2, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x30, 0x40, 0x3a, 0x52, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x42, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00},
-    {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00},
-    {0x00, 0x00, 0x42, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8},
-    {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00},
-    /* Special glyph for unknown character */
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00}
+    /* 0 0x00 '^@' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 1 0x01 '^A' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x81, /* 10000001 */
+xa5, /* 10100101 */
+x81, /* 10000001 */
+x81, /* 10000001 */
+xbd, /* 10111101 */
+x99, /* 10011001 */
+x81, /* 10000001 */
+x81, /* 10000001 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 2 0x02 '^B' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+xff, /* 11111111 */
+xdb, /* 11011011 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xc3, /* 11000011 */
+xe7, /* 11100111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 3 0x03 '^C' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x6c, /* 01101100 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+x7c, /* 01111100 */
+x38, /* 00111000 */
+x10, /* 00010000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 4 0x04 '^D' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x7c, /* 01111100 */
+xfe, /* 11111110 */
+x7c, /* 01111100 */
+x38, /* 00111000 */
+x10, /* 00010000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 5 0x05 '^E' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+xe7, /* 11100111 */
+xe7, /* 11100111 */
+xe7, /* 11100111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 6 0x06 '^F' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x7e, /* 01111110 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 7 0x07 '^G' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 8 0x08 '^H' */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xe7, /* 11100111 */
+xc3, /* 11000011 */
+xc3, /* 11000011 */
+xe7, /* 11100111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+    /* 9 0x09 '^I' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x42, /* 01000010 */
+x42, /* 01000010 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 10 0x0a '^J' */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xc3, /* 11000011 */
+x99, /* 10011001 */
+xbd, /* 10111101 */
+xbd, /* 10111101 */
+x99, /* 10011001 */
+xc3, /* 11000011 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+    /* 11 0x0b '^K' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1e, /* 00011110 */
+x0e, /* 00001110 */
+x1a, /* 00011010 */
+x32, /* 00110010 */
+x78, /* 01111000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 12 0x0c '^L' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 13 0x0d '^M' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3f, /* 00111111 */
+x33, /* 00110011 */
+x3f, /* 00111111 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x70, /* 01110000 */
+xf0, /* 11110000 */
+xe0, /* 11100000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 14 0x0e '^N' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7f, /* 01111111 */
+x63, /* 01100011 */
+x7f, /* 01111111 */
+x63, /* 01100011 */
+x63, /* 01100011 */
+x63, /* 01100011 */
+x63, /* 01100011 */
+x67, /* 01100111 */
+xe7, /* 11100111 */
+xe6, /* 11100110 */
+xc0, /* 11000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 15 0x0f '^O' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xdb, /* 11011011 */
+x3c, /* 00111100 */
+xe7, /* 11100111 */
+x3c, /* 00111100 */
+xdb, /* 11011011 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 16 0x10 '^P' */
+x00, /* 00000000 */
+x80, /* 10000000 */
+xc0, /* 11000000 */
+xe0, /* 11100000 */
+xf0, /* 11110000 */
+xf8, /* 11111000 */
+xfe, /* 11111110 */
+xf8, /* 11111000 */
+xf0, /* 11110000 */
+xe0, /* 11100000 */
+xc0, /* 11000000 */
+x80, /* 10000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 17 0x11 '^Q' */
+x00, /* 00000000 */
+x02, /* 00000010 */
+x06, /* 00000110 */
+x0e, /* 00001110 */
+x1e, /* 00011110 */
+x3e, /* 00111110 */
+xfe, /* 11111110 */
+x3e, /* 00111110 */
+x1e, /* 00011110 */
+x0e, /* 00001110 */
+x06, /* 00000110 */
+x02, /* 00000010 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 18 0x12 '^R' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 19 0x13 '^S' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 20 0x14 '^T' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7f, /* 01111111 */
+xdb, /* 11011011 */
+xdb, /* 11011011 */
+xdb, /* 11011011 */
+x7b, /* 01111011 */
+x1b, /* 00011011 */
+x1b, /* 00011011 */
+x1b, /* 00011011 */
+x1b, /* 00011011 */
+x1b, /* 00011011 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 21 0x15 '^U' */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+x60, /* 01100000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x0c, /* 00001100 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 22 0x16 '^V' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 23 0x17 '^W' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 24 0x18 '^X' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 25 0x19 '^Y' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 26 0x1a '^Z' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+xfe, /* 11111110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 27 0x1b '^[' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xfe, /* 11111110 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 28 0x1c '^\' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 29 0x1d '^]' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x28, /* 00101000 */
+x6c, /* 01101100 */
+xfe, /* 11111110 */
+x6c, /* 01101100 */
+x28, /* 00101000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 30 0x1e '^^' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x38, /* 00111000 */
+x7c, /* 01111100 */
+x7c, /* 01111100 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 31 0x1f '^_' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+x7c, /* 01111100 */
+x7c, /* 01111100 */
+x38, /* 00111000 */
+x38, /* 00111000 */
+x10, /* 00010000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 32 0x20 ' ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 33 0x21 '!' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 34 0x22 '"' */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x24, /* 00100100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 35 0x23 '#' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+xfe, /* 11111110 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+xfe, /* 11111110 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 36 0x24 '$' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc2, /* 11000010 */
+xc0, /* 11000000 */
+x7c, /* 01111100 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x86, /* 10000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 37 0x25 '%' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc2, /* 11000010 */
+xc6, /* 11000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc6, /* 11000110 */
+x86, /* 10000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 38 0x26 '&' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 39 0x27 ''' */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 40 0x28 '(' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 41 0x29 ')' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 42 0x2a '*' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+xff, /* 11111111 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 43 0x2b '+' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 44 0x2c ',' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 45 0x2d '-' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 46 0x2e '.' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 47 0x2f '/' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x02, /* 00000010 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+x80, /* 10000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 48 0x30 '0' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 49 0x31 '1' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x38, /* 00111000 */
+x78, /* 01111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 50 0x32 '2' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 51 0x33 '3' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x3c, /* 00111100 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 52 0x34 '4' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x0c, /* 00001100 */
+x1c, /* 00011100 */
+x3c, /* 00111100 */
+x6c, /* 01101100 */
+xcc, /* 11001100 */
+xfe, /* 11111110 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x1e, /* 00011110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 53 0x35 '5' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xfc, /* 11111100 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 54 0x36 '6' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xfc, /* 11111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 55 0x37 '7' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 56 0x38 '8' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 57 0x39 '9' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7e, /* 01111110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 58 0x3a ':' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 59 0x3b ';' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 60 0x3c '<' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x06, /* 00000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 61 0x3d '=' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 62 0x3e '>' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 63 0x3f '?' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 64 0x40 '@' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xde, /* 11011110 */
+xde, /* 11011110 */
+xde, /* 11011110 */
+xdc, /* 11011100 */
+xc0, /* 11000000 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 65 0x41 'A' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 66 0x42 'B' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfc, /* 11111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+xfc, /* 11111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 67 0x43 'C' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+xc2, /* 11000010 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc2, /* 11000010 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 68 0x44 'D' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xf8, /* 11111000 */
+x6c, /* 01101100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x6c, /* 01101100 */
+xf8, /* 11111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 69 0x45 'E' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x66, /* 01100110 */
+x62, /* 01100010 */
+x68, /* 01101000 */
+x78, /* 01111000 */
+x68, /* 01101000 */
+x60, /* 01100000 */
+x62, /* 01100010 */
+x66, /* 01100110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 70 0x46 'F' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x66, /* 01100110 */
+x62, /* 01100010 */
+x68, /* 01101000 */
+x78, /* 01111000 */
+x68, /* 01101000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xf0, /* 11110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 71 0x47 'G' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+xc2, /* 11000010 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xde, /* 11011110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x66, /* 01100110 */
+x3a, /* 00111010 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 72 0x48 'H' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 73 0x49 'I' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 74 0x4a 'J' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1e, /* 00011110 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 75 0x4b 'K' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xe6, /* 11100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x6c, /* 01101100 */
+x78, /* 01111000 */
+x78, /* 01111000 */
+x6c, /* 01101100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+xe6, /* 11100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 76 0x4c 'L' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xf0, /* 11110000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x62, /* 01100010 */
+x66, /* 01100110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 77 0x4d 'M' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xee, /* 11101110 */
+xfe, /* 11111110 */
+xfe, /* 11111110 */
+xd6, /* 11010110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 78 0x4e 'N' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xe6, /* 11100110 */
+xf6, /* 11110110 */
+xfe, /* 11111110 */
+xde, /* 11011110 */
+xce, /* 11001110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 79 0x4f 'O' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 80 0x50 'P' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfc, /* 11111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xf0, /* 11110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 81 0x51 'Q' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xd6, /* 11010110 */
+xde, /* 11011110 */
+x7c, /* 01111100 */
+x0c, /* 00001100 */
+x0e, /* 00001110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 82 0x52 'R' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfc, /* 11111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x6c, /* 01101100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+xe6, /* 11100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 83 0x53 'S' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x60, /* 01100000 */
+x38, /* 00111000 */
+x0c, /* 00001100 */
+x06, /* 00000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 84 0x54 'T' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x5a, /* 01011010 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 85 0x55 'U' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 86 0x56 'V' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x10, /* 00010000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 87 0x57 'W' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xfe, /* 11111110 */
+xee, /* 11101110 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 88 0x58 'X' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x7c, /* 01111100 */
+x38, /* 00111000 */
+x38, /* 00111000 */
+x7c, /* 01111100 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 89 0x59 'Y' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 90 0x5a 'Z' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+x86, /* 10000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc2, /* 11000010 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 91 0x5b '[' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 92 0x5c '\' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x80, /* 10000000 */
+xc0, /* 11000000 */
+xe0, /* 11100000 */
+x70, /* 01110000 */
+x38, /* 00111000 */
+x1c, /* 00011100 */
+x0e, /* 00001110 */
+x06, /* 00000110 */
+x02, /* 00000010 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 93 0x5d ']' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 94 0x5e '^' */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 95 0x5f '_' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 96 0x60 '`' */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 97 0x61 'a' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 98 0x62 'b' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xe0, /* 11100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x78, /* 01111000 */
+x6c, /* 01101100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 99 0x63 'c' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 100 0x64 'd' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1c, /* 00011100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x3c, /* 00111100 */
+x6c, /* 01101100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 101 0x65 'e' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 102 0x66 'f' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1c, /* 00011100 */
+x36, /* 00110110 */
+x32, /* 00110010 */
+x30, /* 00110000 */
+x78, /* 01111000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 103 0x67 'g' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x7c, /* 01111100 */
+x0c, /* 00001100 */
+xcc, /* 11001100 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+    /* 104 0x68 'h' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xe0, /* 11100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x6c, /* 01101100 */
+x76, /* 01110110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+xe6, /* 11100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 105 0x69 'i' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 106 0x6a 'j' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x00, /* 00000000 */
+x0e, /* 00001110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+    /* 107 0x6b 'k' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xe0, /* 11100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x66, /* 01100110 */
+x6c, /* 01101100 */
+x78, /* 01111000 */
+x78, /* 01111000 */
+x6c, /* 01101100 */
+x66, /* 01100110 */
+xe6, /* 11100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 108 0x6c 'l' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 109 0x6d 'm' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xec, /* 11101100 */
+xfe, /* 11111110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 110 0x6e 'n' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xdc, /* 11011100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 111 0x6f 'o' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 112 0x70 'p' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xdc, /* 11011100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xf0, /* 11110000 */
+x00, /* 00000000 */
+    /* 113 0x71 'q' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x7c, /* 01111100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x1e, /* 00011110 */
+x00, /* 00000000 */
+    /* 114 0x72 'r' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xdc, /* 11011100 */
+x76, /* 01110110 */
+x66, /* 01100110 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xf0, /* 11110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 115 0x73 's' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+x60, /* 01100000 */
+x38, /* 00111000 */
+x0c, /* 00001100 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 116 0x74 't' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+xfc, /* 11111100 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x36, /* 00110110 */
+x1c, /* 00011100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 117 0x75 'u' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 118 0x76 'v' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 119 0x77 'w' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xd6, /* 11010110 */
+xfe, /* 11111110 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 120 0x78 'x' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x38, /* 00111000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 121 0x79 'y' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7e, /* 01111110 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+xf8, /* 11111000 */
+x00, /* 00000000 */
+    /* 122 0x7a 'z' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xcc, /* 11001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 123 0x7b '{' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x0e, /* 00001110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x70, /* 01110000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x0e, /* 00001110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 124 0x7c '|' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 125 0x7d '}' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x70, /* 01110000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x0e, /* 00001110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 126 0x7e '~' */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 127 0x7f '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 128 0x80 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+xc2, /* 11000010 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc2, /* 11000010 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 129 0x81 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 130 0x82 '' */
+x00, /* 00000000 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 131 0x83 '' */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 132 0x84 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 133 0x85 '' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 134 0x86 '' */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 135 0x87 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x18, /* 00011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 136 0x88 '' */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 137 0x89 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 138 0x8a '' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 139 0x8b '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 140 0x8c '' */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 141 0x8d '' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 142 0x8e '' */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 143 0x8f '' */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 144 0x90 '' */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x66, /* 01100110 */
+x62, /* 01100010 */
+x68, /* 01101000 */
+x78, /* 01111000 */
+x68, /* 01101000 */
+x62, /* 01100010 */
+x66, /* 01100110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 145 0x91 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xec, /* 11101100 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x7e, /* 01111110 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+x6e, /* 01101110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 146 0x92 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3e, /* 00111110 */
+x6c, /* 01101100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xfe, /* 11111110 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xce, /* 11001110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 147 0x93 '' */
+x00, /* 00000000 */
+x10, /* 00010000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 148 0x94 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 149 0x95 '' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 150 0x96 '' */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x78, /* 01111000 */
+xcc, /* 11001100 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 151 0x97 '' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 152 0x98 '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7e, /* 01111110 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x78, /* 01111000 */
+x00, /* 00000000 */
+    /* 153 0x99 '' */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 154 0x9a '' */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 155 0x9b '' */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 156 0x9c '' */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x64, /* 01100100 */
+x60, /* 01100000 */
+xf0, /* 11110000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xe6, /* 11100110 */
+xfc, /* 11111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 157 0x9d '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 158 0x9e '' */
+x00, /* 00000000 */
+xf8, /* 11111000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xf8, /* 11111000 */
+xc4, /* 11000100 */
+xcc, /* 11001100 */
+xde, /* 11011110 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 159 0x9f '' */
+x00, /* 00000000 */
+x0e, /* 00001110 */
+x1b, /* 00011011 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xd8, /* 11011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 160 0xa0 ' ' */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+x0c, /* 00001100 */
+x7c, /* 01111100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 161 0xa1 '¡' */
+x00, /* 00000000 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 162 0xa2 '¢' */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 163 0xa3 '£' */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x00, /* 00000000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 164 0xa4 '¤' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x00, /* 00000000 */
+xdc, /* 11011100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 165 0xa5 '¥' */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x00, /* 00000000 */
+xc6, /* 11000110 */
+xe6, /* 11100110 */
+xf6, /* 11110110 */
+xfe, /* 11111110 */
+xde, /* 11011110 */
+xce, /* 11001110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 166 0xa6 '¦' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x3e, /* 00111110 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 167 0xa7 '§' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 168 0xa8 '¨' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x7c, /* 01111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 169 0xa9 '©' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 170 0xaa 'ª' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 171 0xab '«' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+xe0, /* 11100000 */
+x62, /* 01100010 */
+x66, /* 01100110 */
+x6c, /* 01101100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xdc, /* 11011100 */
+x86, /* 10000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x3e, /* 00111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 172 0xac '¬' */
+x00, /* 00000000 */
+x60, /* 01100000 */
+xe0, /* 11100000 */
+x62, /* 01100010 */
+x66, /* 01100110 */
+x6c, /* 01101100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x66, /* 01100110 */
+xce, /* 11001110 */
+x9a, /* 10011010 */
+x3f, /* 00111111 */
+x06, /* 00000110 */
+x06, /* 00000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 173 0xad '' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 174 0xae '®' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x36, /* 00110110 */
+x6c, /* 01101100 */
+xd8, /* 11011000 */
+x6c, /* 01101100 */
+x36, /* 00110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 175 0xaf '¯' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xd8, /* 11011000 */
+x6c, /* 01101100 */
+x36, /* 00110110 */
+x6c, /* 01101100 */
+xd8, /* 11011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 176 0xb0 '°' */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+x11, /* 00010001 */
+x44, /* 01000100 */
+    /* 177 0xb1 '±' */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+x55, /* 01010101 */
+xaa, /* 10101010 */
+    /* 178 0xb2 '²' */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+xdd, /* 11011101 */
+x77, /* 01110111 */
+    /* 179 0xb3 '³' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 180 0xb4 '´' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 181 0xb5 'µ' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 182 0xb6 '¶' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xf6, /* 11110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 183 0xb7 '·' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 184 0xb8 '¸' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 185 0xb9 '¹' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xf6, /* 11110110 */
+x06, /* 00000110 */
+xf6, /* 11110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 186 0xba 'º' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 187 0xbb '»' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x06, /* 00000110 */
+xf6, /* 11110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 188 0xbc '¼' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xf6, /* 11110110 */
+x06, /* 00000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 189 0xbd '½' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 190 0xbe '¾' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 191 0xbf '¿' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xf8, /* 11111000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 192 0xc0 'À' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 193 0xc1 'Á' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 194 0xc2 'Â' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 195 0xc3 'Ã' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 196 0xc4 'Ä' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 197 0xc5 'Å' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xff, /* 11111111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 198 0xc6 'Æ' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 199 0xc7 'Ç' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x37, /* 00110111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 200 0xc8 'È' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x37, /* 00110111 */
+x30, /* 00110000 */
+x3f, /* 00111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 201 0xc9 'É' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3f, /* 00111111 */
+x30, /* 00110000 */
+x37, /* 00110111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 202 0xca 'Ê' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xf7, /* 11110111 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 203 0xcb 'Ë' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+xf7, /* 11110111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 204 0xcc 'Ì' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x37, /* 00110111 */
+x30, /* 00110000 */
+x37, /* 00110111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 205 0xcd 'Í' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 206 0xce 'Î' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xf7, /* 11110111 */
+x00, /* 00000000 */
+xf7, /* 11110111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 207 0xcf 'Ï' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 208 0xd0 'Ð' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 209 0xd1 'Ñ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 210 0xd2 'Ò' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 211 0xd3 'Ó' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x3f, /* 00111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 212 0xd4 'Ô' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 213 0xd5 'Õ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 214 0xd6 'Ö' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x3f, /* 00111111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 215 0xd7 '×' */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+xff, /* 11111111 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+    /* 216 0xd8 'Ø' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xff, /* 11111111 */
+x18, /* 00011000 */
+xff, /* 11111111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 217 0xd9 'Ù' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xf8, /* 11111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 218 0xda 'Ú' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1f, /* 00011111 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 219 0xdb 'Û' */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+    /* 220 0xdc 'Ü' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+    /* 221 0xdd 'Ý' */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+xf0, /* 11110000 */
+    /* 222 0xde 'Þ' */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+x0f, /* 00001111 */
+    /* 223 0xdf 'ß' */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+xff, /* 11111111 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 224 0xe0 'à' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xdc, /* 11011100 */
+x76, /* 01110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 225 0xe1 'á' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x78, /* 01111000 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xcc, /* 11001100 */
+xd8, /* 11011000 */
+xcc, /* 11001100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xcc, /* 11001100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 226 0xe2 'â' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+xc0, /* 11000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 227 0xe3 'ã' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 228 0xe4 'ä' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 229 0xe5 'å' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 230 0xe6 'æ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x7c, /* 01111100 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+x00, /* 00000000 */
+    /* 231 0xe7 'ç' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 232 0xe8 'è' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 233 0xe9 'é' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xfe, /* 11111110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 234 0xea 'ê' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+xee, /* 11101110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 235 0xeb 'ë' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1e, /* 00011110 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x3e, /* 00111110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x66, /* 01100110 */
+x3c, /* 00111100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 236 0xec 'ì' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+xdb, /* 11011011 */
+xdb, /* 11011011 */
+xdb, /* 11011011 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 237 0xed 'í' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x03, /* 00000011 */
+x06, /* 00000110 */
+x7e, /* 01111110 */
+xdb, /* 11011011 */
+xdb, /* 11011011 */
+xf3, /* 11110011 */
+x7e, /* 01111110 */
+x60, /* 01100000 */
+xc0, /* 11000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 238 0xee 'î' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x1c, /* 00011100 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x7c, /* 01111100 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x1c, /* 00011100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 239 0xef 'ï' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7c, /* 01111100 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+xc6, /* 11000110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 240 0xf0 'ð' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+xfe, /* 11111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 241 0xf1 'ñ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x7e, /* 01111110 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 242 0xf2 'ò' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x06, /* 00000110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 243 0xf3 'ó' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x30, /* 00110000 */
+x60, /* 01100000 */
+x30, /* 00110000 */
+x18, /* 00011000 */
+x0c, /* 00001100 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 244 0xf4 'ô' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x0e, /* 00001110 */
+x1b, /* 00011011 */
+x1b, /* 00011011 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+    /* 245 0xf5 'õ' */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+xd8, /* 11011000 */
+x70, /* 01110000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 246 0xf6 'ö' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 247 0xf7 '÷' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x00, /* 00000000 */
+x76, /* 01110110 */
+xdc, /* 11011100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 248 0xf8 'ø' */
+x00, /* 00000000 */
+x38, /* 00111000 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x38, /* 00111000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 249 0xf9 'ù' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 250 0xfa 'ú' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x18, /* 00011000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 251 0xfb 'û' */
+x00, /* 00000000 */
+x0f, /* 00001111 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+x0c, /* 00001100 */
+xec, /* 11101100 */
+x6c, /* 01101100 */
+x6c, /* 01101100 */
+x3c, /* 00111100 */
+x1c, /* 00011100 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 252 0xfc 'ü' */
+x00, /* 00000000 */
+x6c, /* 01101100 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x36, /* 00110110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 253 0xfd 'ý' */
+x00, /* 00000000 */
+x3c, /* 00111100 */
+x66, /* 01100110 */
+x0c, /* 00001100 */
+x18, /* 00011000 */
+x32, /* 00110010 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 254 0xfe 'þ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x7e, /* 01111110 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+    /* 255 0xff 'ÿ' */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
+x00, /* 00000000 */
 };
-/** @}
- */

 /trunk/uspace/srv/kbd/generic/kbd.c
 ,139 → 28,57
 /**
  * @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
  * @{
- */
+ */
 /** @file
  */
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <sysinfo.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ipc/ns.h>
-#include <async.h>
 #include <errno.h>
-#include <adt/fifo.h>
-#include <io/console.h>
-#include <io/keycode.h>
+#include <arch/kbd.h>
 #include <kbd.h>
-#include <keybuffer.h>
-#include <kbd_port.h>
-#include <kbd_ctl.h>
-#include <layout.h>
+#include <libadt/fifo.h>
+#include <key_buffer.h>
+#include <async.h>
+#include <keys.h>
-#define NAME "kbd"
+#define NAME "KBD"
 int cons_connected = 0;
 int phone2cons = -1;
-keybuffer_t keybuffer;
+keybuffer_t keybuffer;
-/** Currently active modifiers. */
-static unsigned mods = KM_NUM_LOCK;
-/** Currently pressed lock keys. We track these to tackle autorepeat. */
-static unsigned lock_keys;
-int cir_service = 0;
-int cir_phone = -1;
-#define NUM_LAYOUTS 3
-static layout_op_t *layout[NUM_LAYOUTS] = {
-    &us_qwerty_op,
-    &us_dvorak_op,
-    &cz_op
-};
-static int active_layout = 0;
-void kbd_push_scancode(int scancode)
+static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
-/*  printf("scancode: 0x%x\n", scancode);*/
-    kbd_ctl_parse_scancode(scancode);
-}
+    int chr;
-void kbd_push_ev(int type, unsigned int key)
-{
-    console_event_t ev;
-    unsigned mod_mask;
+#ifdef MOUSE_ENABLED
+    if (mouse_arch_process(phone2cons, call))
+        return;
+#endif
+    kbd_arch_process(&keybuffer, call);
-    switch (key) {
-    case KC_LCTRL: mod_mask = KM_LCTRL; break;
-    case KC_RCTRL: mod_mask = KM_RCTRL; break;
-    case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
-    case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
-    case KC_LALT: mod_mask = KM_LALT; break;
-    case KC_RALT: mod_mask = KM_RALT; break;
-    default: mod_mask = 0; break;
-    }
+    if (cons_connected && phone2cons != -1) {
+        /*
+         * recode to ASCII - one interrupt can produce more than one
+         * code so result is stored in fifo
+         */
+        while (!keybuffer_empty(&keybuffer)) {
+            if (!keybuffer_pop(&keybuffer, (int *)&chr))
+                break;
-    if (mod_mask != 0) {
-        if (type == KEY_PRESS)
-            mods = mods | mod_mask;
-        else
-            mods = mods & ~mod_mask;
-    }
-    switch (key) {
-    case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
-    case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
-    case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
-    default: mod_mask = 0; break;
-    }
-    if (mod_mask != 0) {
-        if (type == KEY_PRESS) {
-            /*
-             * Only change lock state on transition from released
-             * to pressed. This prevents autorepeat from messing
-             * up the lock state.
-             */
-            mods = mods ^ (mod_mask & ~lock_keys);
-            lock_keys = lock_keys | mod_mask;
-        } else {
-            lock_keys = lock_keys & ~mod_mask;
+            async_msg_1(phone2cons, KBD_PUSHCHAR, chr);
         }
     }
-/*
-    printf("type: %d\n", type);
-    printf("mods: 0x%x\n", mods);
-    printf("keycode: %u\n", key);
-*/
-    if (type == KEY_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F1) {
-        active_layout = 0;
-        layout[active_layout]->reset();
-        return;
-    }
-    if (type == KEY_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F2) {
-        active_layout = 1;
-        layout[active_layout]->reset();
-        return;
-    }
-    if (type == KEY_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F3) {
-        active_layout = 2;
-        layout[active_layout]->reset();
-        return;
-    }
-    ev.type = type;
-    ev.key = key;
-    ev.mods = mods;
-    ev.c = layout[active_layout]->parse_ev(&ev);
-    async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }
 static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
 ,14 → 111,6
             phone2cons = IPC_GET_ARG5(call);
             retval = 0;
             break;
-        case KBD_YIELD:
-            kbd_port_yield();
-            retval = 0;
-            break;
-        case KBD_RECLAIM:
-            kbd_port_reclaim();
-            retval = 0;
-            break;
         default:
             retval = EINVAL;
         }
 ,46 → 121,24
 int main(int argc, char **argv)
 {
-    printf(NAME ": HelenOS Keyboard service\n");
     ipcarg_t phonead;
-    if (sysinfo_value("kbd.cir.fhc") == 1)
-        cir_service = SERVICE_FHC;
-    else if (sysinfo_value("kbd.cir.obio") == 1)
-        cir_service = SERVICE_OBIO;
-    if (cir_service) {
-        while (cir_phone < 0) {
-            cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
-, 0);
-        }
-    }
-    /* Initialize port driver. */
-    if (kbd_port_init() != 0)
+    /* Initialize arch dependent parts */
+    if (kbd_arch_init())
         return -1;
-    /* Initialize controller driver. */
-    if (kbd_ctl_init() != 0)
-        return -1;
-    /* Initialize (reset) layout. */
-    layout[active_layout]->reset();
     /* Initialize key buffer */
     keybuffer_init(&keybuffer);
     async_set_client_connection(console_connection);
-    /* Register service at nameserver. */
+    async_set_interrupt_received(irq_handler);
+    /* Register service at nameserver */
     if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
         return -1;
-    printf(NAME ": Accepting connections\n");
     async_manager();
-    /* Not reached. */
+    /* Never reached */
     return 0;
 }
 ,3 → 145,4
 /**
  * @}
  */

 /trunk/uspace/srv/kbd/generic/key_buffer.c
 ,0 → 1,113
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <key_buffer.h>
+#include <futex.h>
+atomic_t keybuffer_futex = FUTEX_INITIALIZER;
+/** Clear key buffer.
+ */
+void keybuffer_free(keybuffer_t *keybuffer)
+{
+    futex_down(&keybuffer_futex);
+    keybuffer->head = 0;
+    keybuffer->tail = 0;
+    keybuffer->items = 0;
+    futex_up(&keybuffer_futex);
+}
+/** Key buffer initialization.
+ *
+ */
+void keybuffer_init(keybuffer_t *keybuffer)
+{
+    keybuffer_free(keybuffer);
+}
+/** Get free space in buffer.
+ * This function is useful for processing some scancodes that are translated
+ * to more than one character.
+ * @return empty buffer space
+ */
+int keybuffer_available(keybuffer_t *keybuffer)
+{
+    return KEYBUFFER_SIZE - keybuffer->items;
+}
+/**
+ * @return nonzero, if buffer is not empty.
+ */
+int keybuffer_empty(keybuffer_t *keybuffer)
+{
+    return (keybuffer->items == 0);
+}
+/** Push key to key buffer.
+ * If buffer is full, character is ignored.
+ * @param key code of stored key
+ */
+void keybuffer_push(keybuffer_t *keybuffer, int key)
+{
+    futex_down(&keybuffer_futex);
+    if (keybuffer->items < KEYBUFFER_SIZE) {
+        keybuffer->fifo[keybuffer->tail] = key;
+        keybuffer->tail = (keybuffer->tail + 1) % KEYBUFFER_SIZE;
+        keybuffer->items++;
+    }
+    futex_up(&keybuffer_futex);
+}
+/** Pop character from buffer.
+ * @param c pointer to space where to store character from buffer.
+ * @return zero on empty buffer, nonzero else
+ */
+int keybuffer_pop(keybuffer_t *keybuffer, int *c)
+{
+    futex_down(&keybuffer_futex);
+    if (keybuffer->items > 0) {
+        keybuffer->items--;
+        *c = (keybuffer->fifo[keybuffer->head]) ;
+        keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
+        futex_up(&keybuffer_futex);
+        return 1;
+    }
+    futex_up(&keybuffer_futex);
+    return 0;
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ia32/src/mouse.c
 ,0 → 1,117
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <kbd.h>
+#include <keys.h>
+#define i8042_MOUSE_DATA   0x20
+#define BUFSIZE 3
+typedef struct {
+    union {
+        unsigned char data[BUFSIZE];
+        struct {
+            unsigned leftbtn : 1;
+            unsigned rightbtn : 1;
+            unsigned middlebtn : 1;
+            unsigned isone : 1; /* Always one */
+            unsigned xsign : 1;
+            unsigned ysign : 1;
+            unsigned xovfl : 1;
+            unsigned yovfl : 1;
+            unsigned char x;
+            unsigned char y;
+        } val;
+    }u;
+}ps2packet_t;
+static ps2packet_t buf;
+static int bufpos = 0;
+static int leftbtn = 0;
+static int rightbtn = 0;
+static int middlebtn = 0;
+/** Convert 9-bit 2-complement signed number to integer */
+static int bit9toint(int sign, unsigned char data)
+{
+    int tmp;
+    if (!sign)
+        return data;
+    tmp = ((unsigned char)~data) + 1;
+    return -tmp;
+}
+/** Process mouse data
+ *
+ * @return True if mouse command was recognized and processed
+ */
+int mouse_arch_process(int phoneid, ipc_call_t *call)
+{
+    int status = IPC_GET_ARG1(*call);
+    int data = IPC_GET_ARG2(*call);
+    int x,y;
+    if (!(status & i8042_MOUSE_DATA))
+        return 0;
+    /* Check that we have not lost synchronization */
+    if (bufpos == 0 && !(data & 0x8))
+        return 1; /* Synchro lost, ignore byte */
+    buf.u.data[bufpos++] = data;
+    if (bufpos == BUFSIZE) {
+        bufpos = 0;
+        if (phoneid != -1) {
+            if (buf.u.val.leftbtn ^ leftbtn) {
+                leftbtn = buf.u.val.leftbtn;
+                async_msg_1(phoneid, KBD_MS_LEFT, leftbtn);
+            }
+            if (buf.u.val.rightbtn & rightbtn) {
+                rightbtn = buf.u.val.middlebtn;
+                async_msg_1(phoneid, KBD_MS_RIGHT, rightbtn);
+            }
+            if (buf.u.val.rightbtn & rightbtn) {
+                middlebtn = buf.u.val.middlebtn;
+                async_msg_1(phoneid, KBD_MS_MIDDLE, middlebtn);
+            }
+            x = bit9toint(buf.u.val.xsign, buf.u.val.x);
+            y = bit9toint(buf.u.val.ysign, buf.u.val.y);
+            if (x || y)
+                async_msg_2(phoneid, KBD_MS_MOVE, (ipcarg_t)x,
+                    (ipcarg_t)(-y));
+        }
+    }
+    return 1;
+}

 /trunk/uspace/srv/kbd/arch/ia32/src/kbd.c
 ,0 → 1,166
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdia32 ia32
+ * @brief   HelenOS ia32 / amd64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @ingroup kbdamd64
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <unistd.h>
+#include <kbd.h>
+#include <keys.h>
+#include <genarch/kbd.h>
+#include <sysinfo.h>
+/* Interesting bits for status register */
+#define i8042_OUTPUT_FULL  0x1
+#define i8042_INPUT_FULL   0x2
+#define i8042_MOUSE_DATA   0x20
+/* Command constants */
+#define i8042_CMD_KBD 0x60
+#define i8042_CMD_MOUSE  0xd4
+/* Keyboard cmd byte */
+#define i8042_KBD_IE        0x1
+#define i8042_MOUSE_IE      0x2
+#define i8042_KBD_DISABLE   0x10
+#define i8042_MOUSE_DISABLE 0x20
+#define i8042_KBD_TRANSLATE 0x40
+/* Mouse constants */
+#define MOUSE_OUT_INIT  0xf4
+#define MOUSE_ACK       0xfa
+#define KEY_RELEASE 0x80
+static volatile int keyflags;       /**< Tracking of multiple keypresses. */
+static volatile int lockflags;      /**< Tracking of multiple keys lockings. */
+irq_cmd_t i8042_cmds[2] = {
+    { CMD_PORT_READ_1, (void *) 0x64, 0, 1 },
+    { CMD_PORT_READ_1, (void *) 0x60, 0, 2 }
+};
+irq_code_t i8042_kbd = {
+,
+    i8042_cmds
+};
+static void wait_ready(void) {
+    while (i8042_status_read() & i8042_INPUT_FULL)
+        ;
+}
+/** Register uspace irq handler
+ * @return
+ */
+int kbd_arch_init(void)
+{
+    int i;
+    int mouseenabled = 0;
+    iospace_enable(task_get_id(), (void *) i8042_DATA, 5);
+    /* Disable kbd, enable mouse */
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_data_write(i8042_KBD_DISABLE);
+    wait_ready();
+    /* Flush all current IO */
+    while (i8042_status_read() & i8042_OUTPUT_FULL)
+        i8042_data_read();
+    /* Initialize mouse */
+    i8042_command_write(i8042_CMD_MOUSE);
+    wait_ready();
+    i8042_data_write(MOUSE_OUT_INIT);
+    wait_ready();
+    int mouseanswer = 0;
+    for (i=0;i < 1000; i++) {
+        int status = i8042_status_read();
+        if (status & i8042_OUTPUT_FULL) {
+            int data = i8042_data_read();
+            if (status & i8042_MOUSE_DATA) {
+                mouseanswer = data;
+                break;
+            }
+        }
+        usleep(1000);
+    }
+    if (mouseanswer == MOUSE_ACK) {
+        /* enable mouse */
+        mouseenabled = 1;
+        ipc_register_irq(sysinfo_value("mouse.inr"), sysinfo_value("mouse.devno"), 0, &i8042_kbd);
+    }
+    /* Enable kbd */
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &i8042_kbd);
+    int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;
+    if (mouseenabled)
+        newcontrol |= i8042_MOUSE_IE;
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_data_write(newcontrol);
+    wait_ready();
+    return 0;
+}
+/** Process keyboard & mouse events */
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    int status = IPC_GET_ARG1(*call);
+    if ((status & i8042_MOUSE_DATA))
+        return 0;
+    int scan_code = IPC_GET_ARG2(*call);
+    if (scan_code & KEY_RELEASE)
+        key_released(keybuffer, scan_code ^ KEY_RELEASE);
+    else
+        key_pressed(keybuffer, scan_code);
+    return  1;
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ia32/src/scanc.c
 ,0 → 1,202
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdia32
+ * @brief   Scancodes for PC keyboards.
+ * @{
+ */
+/** @file
+ * @ingroup kbdamd64
+ */
+#include <genarch/scanc.h>
+/** Primary meaning of scancodes. */
+int sc_primary_map[] = {
+    SPECIAL, /* 0x00 */
+    SPECIAL, /* 0x01 - Esc */
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',
+    '\b', /* 0x0e - Backspace */
+    '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
+    SPECIAL, /* 0x1d - LCtrl */
+    'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',
+    '`',
+    SPECIAL, /* 0x2a - LShift */
+    '\\',
+    'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
+    SPECIAL, /* 0x36 - RShift */
+    '*',
+    SPECIAL, /* 0x38 - LAlt */
+    ' ',
+    SPECIAL, /* 0x3a - CapsLock */
+    (FUNCTION_KEYS | 1), /* 0x3b - F1 */
+    (FUNCTION_KEYS | 2), /* 0x3c - F2 */
+    (FUNCTION_KEYS | 3), /* 0x3d - F3 */
+    (FUNCTION_KEYS | 4), /* 0x3e - F4 */
+    (FUNCTION_KEYS | 5), /* 0x3f - F5 */
+    (FUNCTION_KEYS | 6), /* 0x40 - F6 */
+    (FUNCTION_KEYS | 7), /* 0x41 - F7 */
+    (FUNCTION_KEYS | 8), /* 0x42 - F8 */
+    (FUNCTION_KEYS | 9), /* 0x43 - F9 */
+    (FUNCTION_KEYS | 10), /* 0x44 - F10 */
+    SPECIAL, /* 0x45 - NumLock */
+    SPECIAL, /* 0x46 - ScrollLock */
+    '7', '8', '9', '-',
+    '4', '5', '6', '+',
+    '1', '2', '3',
+    '0', '.',
+    SPECIAL, /* 0x54 - Alt-SysRq */
+    SPECIAL, /* 0x55 - F11/F12/PF1/FN */
+    SPECIAL, /* 0x56 - unlabelled key next to LAlt */
+    (FUNCTION_KEYS | 11), /* 0x57 - F11 */
+    (FUNCTION_KEYS | 12), /* 0x58 - F12 */
+    SPECIAL, /* 0x59 */
+    SPECIAL, /* 0x5a */
+    SPECIAL, /* 0x5b */
+    SPECIAL, /* 0x5c */
+    SPECIAL, /* 0x5d */
+    SPECIAL, /* 0x5e */
+    SPECIAL, /* 0x5f */
+    SPECIAL, /* 0x60 */
+    SPECIAL, /* 0x61 */
+    SPECIAL, /* 0x62 */
+    SPECIAL, /* 0x63 */
+    SPECIAL, /* 0x64 */
+    SPECIAL, /* 0x65 */
+    SPECIAL, /* 0x66 */
+    SPECIAL, /* 0x67 */
+    SPECIAL, /* 0x68 */
+    SPECIAL, /* 0x69 */
+    SPECIAL, /* 0x6a */
+    SPECIAL, /* 0x6b */
+    SPECIAL, /* 0x6c */
+    SPECIAL, /* 0x6d */
+    SPECIAL, /* 0x6e */
+    SPECIAL, /* 0x6f */
+    SPECIAL, /* 0x70 */
+    SPECIAL, /* 0x71 */
+    SPECIAL, /* 0x72 */
+    SPECIAL, /* 0x73 */
+    SPECIAL, /* 0x74 */
+    SPECIAL, /* 0x75 */
+    SPECIAL, /* 0x76 */
+    SPECIAL, /* 0x77 */
+    SPECIAL, /* 0x78 */
+    SPECIAL, /* 0x79 */
+    SPECIAL, /* 0x7a */
+    SPECIAL, /* 0x7b */
+    SPECIAL, /* 0x7c */
+    SPECIAL, /* 0x7d */
+    SPECIAL, /* 0x7e */
+    SPECIAL, /* 0x7f */
+};
+/** Secondary meaning of scancodes. */
+int sc_secondary_map[] = {
+    SPECIAL, /* 0x00 */
+x1b, /* 0x01 - Esc */
+    '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',
+    SPECIAL, /* 0x0e - Backspace */
+    '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
+    SPECIAL, /* 0x1d - LCtrl */
+    'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',
+    '~',
+    SPECIAL, /* 0x2a - LShift */
+    '|',
+    'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',
+    SPECIAL, /* 0x36 - RShift */
+    '*',
+    SPECIAL, /* 0x38 - LAlt */
+    ' ',
+    SPECIAL, /* 0x3a - CapsLock */
+    SPECIAL, /* 0x3b - F1 */
+    SPECIAL, /* 0x3c - F2 */
+    SPECIAL, /* 0x3d - F3 */
+    SPECIAL, /* 0x3e - F4 */
+    SPECIAL, /* 0x3f - F5 */
+    SPECIAL, /* 0x40 - F6 */
+    SPECIAL, /* 0x41 - F7 */
+    SPECIAL, /* 0x42 - F8 */
+    SPECIAL, /* 0x43 - F9 */
+    SPECIAL, /* 0x44 - F10 */
+    SPECIAL, /* 0x45 - NumLock */
+    SPECIAL, /* 0x46 - ScrollLock */
+    '7', '8', '9', '-',
+    '4', '5', '6', '+',
+    '1', '2', '3',
+    '0', '.',
+    SPECIAL, /* 0x54 - Alt-SysRq */
+    SPECIAL, /* 0x55 - F11/F12/PF1/FN */
+    SPECIAL, /* 0x56 - unlabelled key next to LAlt */
+    SPECIAL, /* 0x57 - F11 */
+    SPECIAL, /* 0x58 - F12 */
+    SPECIAL, /* 0x59 */
+    SPECIAL, /* 0x5a */
+    SPECIAL, /* 0x5b */
+    SPECIAL, /* 0x5c */
+    SPECIAL, /* 0x5d */
+    SPECIAL, /* 0x5e */
+    SPECIAL, /* 0x5f */
+    SPECIAL, /* 0x60 */
+    SPECIAL, /* 0x61 */
+    SPECIAL, /* 0x62 */
+    SPECIAL, /* 0x63 */
+    SPECIAL, /* 0x64 */
+    SPECIAL, /* 0x65 */
+    SPECIAL, /* 0x66 */
+    SPECIAL, /* 0x67 */
+    SPECIAL, /* 0x68 */
+    SPECIAL, /* 0x69 */
+    SPECIAL, /* 0x6a */
+    SPECIAL, /* 0x6b */
+    SPECIAL, /* 0x6c */
+    SPECIAL, /* 0x6d */
+    SPECIAL, /* 0x6e */
+    SPECIAL, /* 0x6f */
+    SPECIAL, /* 0x70 */
+    SPECIAL, /* 0x71 */
+    SPECIAL, /* 0x72 */
+    SPECIAL, /* 0x73 */
+    SPECIAL, /* 0x74 */
+    SPECIAL, /* 0x75 */
+    SPECIAL, /* 0x76 */
+    SPECIAL, /* 0x77 */
+    SPECIAL, /* 0x78 */
+    SPECIAL, /* 0x79 */
+    SPECIAL, /* 0x7a */
+    SPECIAL, /* 0x7b */
+    SPECIAL, /* 0x7c */
+    SPECIAL, /* 0x7d */
+    SPECIAL, /* 0x7e */
+    SPECIAL, /* 0x7f */
+};
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ia32/include/kbd.h
 ,0 → 1,76
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdamd64 amd64
+ * @brief   HelenOS ia32 / amd64 arch dependent parts of uspace keyboard and mouse handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @ingroup kbdia32
+ */
+#ifndef KBD_ia32_KBD_H_
+#define KBD_ia32_KBD_H_
+#include <ddi.h>
+#include <libarch/ddi.h>
+#define i8042_DATA      0x60
+#define i8042_STATUS    0X64
+typedef unsigned char u8;
+typedef short u16;
+static inline void i8042_data_write(u8 data)
+{
+    outb(i8042_DATA, data);
+}
+static inline u8 i8042_data_read(void)
+{
+    return inb(i8042_DATA);
+}
+static inline u8 i8042_status_read(void)
+{
+    return inb(i8042_STATUS);
+}
+static inline void i8042_command_write(u8 command)
+{
+    outb(i8042_STATUS, command);
+}
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ia32/include/scanc.h
 ,0 → 1,59
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdia32
+ * @{
+ */
+/** @file
+ * @ingroup kbdamd64
+ */
+#ifndef KBD_ia32_SCANC_H_
+#define KBD_ia32_SCANC_H_
+/** Scancodes. */
+#define SC_ESC      0x01
+#define SC_BACKSPACE    0x0e
+#define SC_LSHIFT   0x2a
+#define SC_RSHIFT   0x36
+#define SC_CAPSLOCK 0x3a
+#define SC_SPEC_ESCAPE  0xe0
+#define SC_LEFTARR      0x4b
+#define SC_RIGHTARR     0x4d
+#define SC_UPARR        0x48
+#define SC_DOWNARR      0x50
+#define SC_DELETE       0x53
+#define SC_HOME         0x47
+#define SC_END          0x4f
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/sparc64/src/kbd.c
 ,0 → 1,117
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdsparc64 sparc64
+ * @brief   HelenOS sparc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <genarch/kbd.h>
+#define KBD_KEY_RELEASE     0x80
+#define KBD_ALL_KEYS_UP     0x7f
+/** Top-half pseudocode for z8530. */
+irq_cmd_t z8530_cmds[] = {
+    {
+        CMD_MEM_READ_1,
+,          /**< Address. Will be patched in run-time. */
+,          /**< Value. Not used. */
+/**< Arg 1 will contain the result. */
+    }
+};
+irq_code_t z8530_kbd = {
+,
+    z8530_cmds
+};
+/** Top-half pseudocode for ns16550. */
+irq_cmd_t ns16550_cmds[] = {
+    {
+        CMD_MEM_READ_1,
+,          /**< Address. Will be patched in run-time. */
+,          /**< Value. Not used. */
+/**< Arg 1 will contain the result. */
+    }
+};
+irq_code_t ns16550_kbd = {
+,
+    ns16550_cmds
+};
+#define KBD_Z8530   1
+#define KBD_NS16550 2
+int kbd_arch_init(void)
+{
+    int type = sysinfo_value("kbd.type");
+    switch (type) {
+    case KBD_Z8530:
+        z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual") + 6;
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &z8530_kbd);
+        break;
+    case KBD_NS16550:
+        ns16550_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ns16550_kbd);
+        break;
+    default:
+        break;
+    }
+    return 0;
+}
+/** Process keyboard events */
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG1(*call);
+    if (scan_code == KBD_ALL_KEYS_UP)
+        return 1;
+    if (scan_code & KBD_KEY_RELEASE)
+        key_released(keybuffer, scan_code ^ KBD_KEY_RELEASE);
+    else
+        key_pressed(keybuffer, scan_code);
+    return 1;
+}
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/sparc64/src/scanc.c
 ,0 → 1,304
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup genarch
+ * @{
+ */
+/**
+ * @file
+ * @brief   Scan codes for Sun keyboards.
+ */
+#include <genarch/scanc.h>
+/** Primary meaning of scancodes. */
+int sc_primary_map[] = {
+    [0x00] = SPECIAL,
+    [0x01] = SPECIAL,
+    [0x02] = SPECIAL,
+    [0x03] = SPECIAL,
+    [0x04] = SPECIAL,
+    [0x05] = FUNCTION_KEYS + 1, /* F1 */
+    [0x06] = FUNCTION_KEYS + 2, /* F2 */
+    [0x07] = FUNCTION_KEYS + 10,    /* F10 */
+    [0x08] = FUNCTION_KEYS + 3, /* F3 */
+    [0x09] = FUNCTION_KEYS + 11,    /* F11 */
+    [0x0a] = FUNCTION_KEYS + 4, /* F4 */
+    [0x0b] = FUNCTION_KEYS + 12,    /* F12 */
+    [0x0c] = FUNCTION_KEYS + 5, /* F5 */
+    [0x0d] = SPECIAL,   /* RAlt */
+    [0x0e] = FUNCTION_KEYS + 6, /* F6 */
+    [0x0f] = SPECIAL,
+    [0x10] = FUNCTION_KEYS + 7, /* F7 */
+    [0x11] = FUNCTION_KEYS + 8, /* F8 */
+    [0x12] = FUNCTION_KEYS + 9, /* F9 */
+    [0x13] = SPECIAL,   /* LAlt */
+    [0x14] = SPECIAL,   /* Up Arrow */
+    [0x15] = SPECIAL,   /* Pause */
+    [0x16] = SPECIAL,
+    [0x17] = SPECIAL,   /* Scroll Lock */
+    [0x18] = SPECIAL,   /* Left Arrow */
+    [0x19] = SPECIAL,
+    [0x1a] = SPECIAL,
+    [0x1b] = SPECIAL,   /* Down Arrow */
+    [0x1c] = SPECIAL,   /* Right Arrow */
+    [0x1d] = SPECIAL,   /* Esc */
+    [0x1e] = '1',
+    [0x1f] = '2',
+    [0x20] = '3',
+    [0x21] = '4',
+    [0x22] = '5',
+    [0x23] = '6',
+    [0x24] = '7',
+    [0x25] = '8',
+    [0x26] = '9',
+    [0x27] = '0',
+    [0x28] = '-',
+    [0x29] = '=',
+    [0x2a] = '`',
+    [0x2b] = '\b',      /* Backspace */
+    [0x2c] = SPECIAL,   /* Insert */
+    [0x2d] = SPECIAL,
+    [0x2e] = '/',       /* numeric keypad */
+    [0x2f] = '*',       /* numeric keypad */
+    [0x30] = SPECIAL,
+    [0x31] = SPECIAL,
+    [0x32] = '.',       /* numeric keypad */
+    [0x33] = SPECIAL,
+    [0x34] = SPECIAL,   /* Home */
+    [0x35] = '\t',      /* Tab */
+    [0x36] = 'q',
+    [0x37] = 'w',
+    [0x38] = 'e',
+    [0x39] = 'r',
+    [0x3a] = 't',
+    [0x3b] = 'y',
+    [0x3c] = 'u',
+    [0x3d] = 'i',
+    [0x3e] = 'o',
+    [0x3f] = 'p',
+    [0x40] = '[',
+    [0x41] = ']',
+    [0x42] = SPECIAL,   /* Del */
+    [0x43] = SPECIAL,
+    [0x44] = '7',       /* numeric keypad */
+    [0x45] = '8',       /* numeric keypad */
+    [0x46] = '9',       /* numeric keypad */
+    [0x47] = '-',       /* numeric keypad */
+    [0x48] = SPECIAL,
+    [0x49] = SPECIAL,
+    [0x4a] = SPECIAL,   /* End */
+    [0x4b] = SPECIAL,
+    [0x4c] = SPECIAL,   /* Control */
+    [0x4d] = 'a',
+    [0x4e] = 's',
+    [0x4f] = 'd',
+    [0x50] = 'f',
+    [0x51] = 'g',
+    [0x52] = 'h',
+    [0x53] = 'j',
+    [0x54] = 'k',
+    [0x55] = 'l',
+    [0x56] = ';',
+    [0x57] = '\'',
+    [0x58] = '\\',
+    [0x59] = '\n',      /* Enter */
+    [0x5a] = '\n',      /* Enter on numeric keypad */
+    [0x5b] = '4',       /* numeric keypad */
+    [0x5c] = '5',       /* numeric keypad */
+    [0x5d] = '6',       /* numeric keypad */
+    [0x5e] = '0',        /* numeric keypad */
+    [0x5f] = SPECIAL,
+    [0x60] = SPECIAL,   /* Page Up */
+    [0x61] = SPECIAL,
+    [0x62] = SPECIAL,   /* Num Lock */
+    [0x63] = SPECIAL,   /* LShift */
+    [0x64] = 'z',
+    [0x65] = 'x',
+    [0x66] = 'c',
+    [0x67] = 'v',
+    [0x68] = 'b',
+    [0x69] = 'n',
+    [0x6a] = 'm',
+    [0x6b] = ',',
+    [0x6c] = '.',
+    [0x6d] = '/',
+    [0x6e] = SPECIAL,   /* RShift */
+    [0x6f] = SPECIAL,
+    [0x70] = '1',       /* numeric keypad */
+    [0x71] = '2',       /* numeric keypad */
+    [0x72] = '3',       /* numeric keypad */
+    [0x73] = SPECIAL,
+    [0x74] = SPECIAL,
+    [0x75] = SPECIAL,
+    [0x76] = SPECIAL,
+    [0x77] = SPECIAL,   /* Caps Lock */
+    [0x78] = SPECIAL,
+    [0x79] = ' ',
+    [0x7a] = SPECIAL,
+    [0x7b] = SPECIAL,   /* Page Down */
+    [0x7c] = SPECIAL,
+    [0x7d] = '+',       /* numeric key pad */
+    [0x7e] = SPECIAL,
+    [0x7f] = SPECIAL
+};
+/** Secondary meaning of scancodes. */
+int sc_secondary_map[] = {
+    [0x00] = SPECIAL,
+    [0x01] = SPECIAL,
+    [0x02] = SPECIAL,
+    [0x03] = SPECIAL,
+    [0x04] = SPECIAL,
+    [0x05] = SPECIAL,   /* F1 */
+    [0x06] = SPECIAL,   /* F2 */
+    [0x07] = SPECIAL,   /* F10 */
+    [0x08] = SPECIAL,   /* F3 */
+    [0x09] = SPECIAL,   /* F11 */
+    [0x0a] = SPECIAL,   /* F4 */
+    [0x0b] = SPECIAL,   /* F12 */
+    [0x0c] = SPECIAL,   /* F5 */
+    [0x0d] = SPECIAL,   /* RAlt */
+    [0x0e] = SPECIAL,   /* F6 */
+    [0x0f] = SPECIAL,
+    [0x10] = SPECIAL,   /* F7 */
+    [0x11] = SPECIAL,   /* F8 */
+    [0x12] = SPECIAL,   /* F9 */
+    [0x13] = SPECIAL,   /* LAlt */
+    [0x14] = SPECIAL,   /* Up Arrow */
+    [0x15] = SPECIAL,   /* Pause */
+    [0x16] = SPECIAL,
+    [0x17] = SPECIAL,   /* Scroll Lock */
+    [0x18] = SPECIAL,   /* Left Arrow */
+    [0x19] = SPECIAL,
+    [0x1a] = SPECIAL,
+    [0x1b] = SPECIAL,   /* Down Arrow */
+    [0x1c] = SPECIAL,   /* Right Arrow */
+    [0x1d] = SPECIAL,   /* Esc */
+    [0x1e] = '!',
+    [0x1f] = '@',
+    [0x20] = '#',
+    [0x21] = '$',
+    [0x22] = '%',
+    [0x23] = '^',
+    [0x24] = '&',
+    [0x25] = '*',
+    [0x26] = '(',
+    [0x27] = ')',
+    [0x28] = '_',
+    [0x29] = '+',
+    [0x2a] = '~',
+    [0x2b] = SPECIAL,   /* Backspace */
+    [0x2c] = SPECIAL,   /* Insert */
+    [0x2d] = SPECIAL,
+    [0x2e] = '/',       /* numeric keypad */
+    [0x2f] = '*',       /* numeric keypad */
+    [0x30] = SPECIAL,
+    [0x31] = SPECIAL,
+    [0x32] = '.',       /* numeric keypad */
+    [0x33] = SPECIAL,
+    [0x34] = SPECIAL,   /* Home */
+    [0x35] = SPECIAL,   /* Tab */
+    [0x36] = 'Q',
+    [0x37] = 'W',
+    [0x38] = 'E',
+    [0x39] = 'R',
+    [0x3a] = 'T',
+    [0x3b] = 'Y',
+    [0x3c] = 'U',
+    [0x3d] = 'I',
+    [0x3e] = 'O',
+    [0x3f] = 'P',
+    [0x40] = '{',
+    [0x41] = '}',
+    [0x42] = SPECIAL,   /* Del */
+    [0x43] = SPECIAL,
+    [0x44] = '7',       /* numeric keypad */
+    [0x45] = '8',       /* numeric keypad */
+    [0x46] = '9',       /* numeric keypad */
+    [0x47] = '-',       /* numeric keypad */
+    [0x48] = SPECIAL,
+    [0x49] = SPECIAL,
+    [0x4a] = SPECIAL,   /* End */
+    [0x4b] = SPECIAL,
+    [0x4c] = SPECIAL,   /* Control */
+    [0x4d] = 'A',
+    [0x4e] = 'S',
+    [0x4f] = 'D',
+    [0x50] = 'F',
+    [0x51] = 'G',
+    [0x52] = 'H',
+    [0x53] = 'J',
+    [0x54] = 'K',
+    [0x55] = 'L',
+    [0x56] = ':',
+    [0x57] = '"',
+    [0x58] = '|',
+    [0x59] = SPECIAL,   /* Enter */
+    [0x5a] = SPECIAL,   /* Enter on numeric keypad */
+    [0x5b] = '4',       /* numeric keypad */
+    [0x5c] = '5',       /* numeric keypad */
+    [0x5d] = '6',       /* numeric keypad */
+    [0x5e] = '0',        /* numeric keypad */
+    [0x5f] = SPECIAL,
+    [0x60] = SPECIAL,   /* Page Up */
+    [0x61] = SPECIAL,
+    [0x62] = SPECIAL,   /* Num Lock */
+    [0x63] = SPECIAL,   /* LShift */
+    [0x64] = 'Z',
+    [0x65] = 'X',
+    [0x66] = 'C',
+    [0x67] = 'V',
+    [0x68] = 'B',
+    [0x69] = 'N',
+    [0x6a] = 'M',
+    [0x6b] = '<',
+    [0x6c] = '>',
+    [0x6d] = '?',
+    [0x6e] = SPECIAL,   /* RShift */
+    [0x6f] = SPECIAL,
+    [0x70] = '1',       /* numeric keypad */
+    [0x71] = '2',       /* numeric keypad */
+    [0x72] = '3',       /* numeric keypad */
+    [0x73] = SPECIAL,
+    [0x74] = SPECIAL,
+    [0x75] = SPECIAL,
+    [0x76] = SPECIAL,
+    [0x77] = SPECIAL,   /* Caps Lock */
+    [0x78] = SPECIAL,
+    [0x79] = ' ',
+    [0x7a] = SPECIAL,
+    [0x7b] = SPECIAL,   /* Page Down */
+    [0x7c] = SPECIAL,
+    [0x7d] = '+',       /* numeric key pad */
+    [0x7e] = SPECIAL,
+    [0x7f] = SPECIAL
+};
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/sparc64/include/kbd.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdsparc64 sparc64
+ * @brief   HelenOS sparc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_sparc64_KBD_H_
+#define KBD_sparc64_KBD_H_
+#endif
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/sparc64/include/scanc.h
 ,0 → 1,57
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup genarch
+ * @{
+ */
+/**
+ * @file
+ * @brief   Scan codes for sun keyboards.
+ */
+#ifndef KBD_SCANC_SUN_H_
+#define KBD_SCANC_SUN_H_
+#define SC_ESC      0x1d
+#define SC_BACKSPACE    0x2b
+#define SC_LSHIFT       0x63
+#define SC_RSHIFT       0x6e
+#define SC_CAPSLOCK     0x77
+#define SC_SPEC_ESCAPE  0xe0    /* ??? */
+#define SC_LEFTARR      0x18
+#define SC_RIGHTARR     0x1c
+#define SC_UPARR        0x14
+#define SC_DOWNARR      0x1b
+#define SC_DELETE       0x42
+#define SC_HOME         0x34
+#define SC_END          0x4a
+#endif
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/arm32/include/kbd.h
 ,0 → 1,42
+/*
+ * Copyright (c) 2007 Michal Kebrt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdarm32
+ * @{
+ */
+/** @file
+ *  @brief Empty.
+ */
+#ifndef KBD_arm32_KBD_H_
+#define KBD_arm32_KBD_H_
+#endif
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/arm32/src/kbd.c
 ,0 → 1,40
+/*
+ * Copyright (c) 2007 Michal Kebrt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdarm32 arm32
+ * @brief   HelenOS arm32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ *  @brief Empty, required by generic Makefile.
+ */
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/arm32/src/kbd_gxemul.c
 ,0 → 1,424
+/*
+ * Copyright (c) 2007 Michal Kebrt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdarm32gxemul GXemul
+ * @brief   HelenOS arm32 GXEmul uspace keyboard handler.
+ * @ingroup  kbdarm32
+ * @{
+ */
+/** @file
+ *  @brief GXemul uspace keyboard handler.
+ */
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+#include <bool.h>
+/* GXemul key codes in no-framebuffer mode. */
+#define GXEMUL_KEY_F1  0x504f1bL
+#define GXEMUL_KEY_F2  0x514f1bL
+#define GXEMUL_KEY_F3  0x524f1bL
+#define GXEMUL_KEY_F4  0x534f1bL
+#define GXEMUL_KEY_F5  0x35315b1bL
+#define GXEMUL_KEY_F6  0x37315b1bL
+#define GXEMUL_KEY_F7  0x38315b1bL
+#define GXEMUL_KEY_F8  0x39315b1bL
+#define GXEMUL_KEY_F9  0x30325b1bL
+#define GXEMUL_KEY_F10 0x31325b1bL
+#define GXEMUL_KEY_F11 0x33325d1bL
+#define GXEMUL_KEY_F12 0x34325b1bL
+/** Start code of F5-F12 keys. */
+#define GXEMUL_KEY_F5_F12_START_CODE 0x7e
+/* GXemul key codes in framebuffer mode. */
+#define GXEMUL_FB_KEY_F1 0x504f5b1bL
+#define GXEMUL_FB_KEY_F2 0x514f5b1bL
+#define GXEMUL_FB_KEY_F3 0x524f5b1bL
+#define GXEMUL_FB_KEY_F4 0x534f5b1bL
+#define GXEMUL_FB_KEY_F5 0x35315b1bL
+#define GXEMUL_FB_KEY_F6 0x37315b1bL
+#define GXEMUL_FB_KEY_F7 0x38315b1bL
+#define GXEMUL_FB_KEY_F8 0x39315b1bL
+#define GXEMUL_FB_KEY_F9 0x38325b1bL
+#define GXEMUL_FB_KEY_F10 0x39325b1bL
+#define GXEMUL_FB_KEY_F11 0x33325b1bL
+#define GXEMUL_FB_KEY_F12 0x34325b1bL
+/** Function keys start code (F1=0x101) */
+#define FUNCTION_KEYS 0x100
+static irq_cmd_t gxemul_cmds[] = {
+    {
+        CMD_MEM_READ_1,
+        (void *) 0,
+,
+    }
+};
+static irq_code_t gxemul_kbd = {
+,
+    gxemul_cmds
+};
+/** Framebuffer switched on. */
+static bool fb;
+/*
+// Please preserve this code (it can be used to determine scancodes)
+int to_hex(int v)
+{
+        return "0123456789ABCDEF"[v];
+}
+*/
+/** Process data sent when a key is pressed (in no-framebuffer mode).
+ *
+ *  @param keybuffer Buffer of pressed key.
+ *  @param scan_code Scan code.
+ *
+ *  @return Always 1.
+ */
+static int gxemul_kbd_process_no_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    // holds at most 4 latest scan codes
+    static unsigned long buf = 0;
+    // number of scan codes in #buf
+    static int count = 0;
+    /*
+    // Preserve for detecting scan codes.
+    keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    keybuffer_push(keybuffer, 'X');
+    keybuffer_push(keybuffer, 'Y');
+    return 1;
+    */
+    if (scan_code == '\r') {
+        scan_code = '\n';
+    }
+    if (scan_code == GXEMUL_KEY_F5_F12_START_CODE) {
+        switch (buf) {
+        case GXEMUL_KEY_F5:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 5);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F6:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 6);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F7:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 7);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F8:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 8);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F9:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 9);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F10:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 10);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F11:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 11);
+            buf = count = 0;
+            return 1;
+        case GXEMUL_KEY_F12:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 12);
+            buf = count = 0;
+            return 1;
+        default:
+            keybuffer_push(keybuffer, buf & 0xff);
+            keybuffer_push(keybuffer, (buf >> 8)  & 0xff);
+            keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+            keybuffer_push(keybuffer, (buf >> 24) & 0xff);
+            keybuffer_push(keybuffer, scan_code);
+            buf = count = 0;
+            return 1;
+        }
+    }
+    // add to buffer
+    buf |= ((unsigned long) scan_code) << (8 * (count++));
+    if ((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) {
+        keybuffer_push(keybuffer, buf);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 1) {
+        return 1;
+    }
+    if ((buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff)
+        && (buf & 0xffff) != (GXEMUL_KEY_F5 & 0xffff) ) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 2) {
+        return 1;
+    }
+    switch (buf) {
+    case GXEMUL_KEY_F1:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 1);
+        buf = count = 0;
+        return 1;
+    case GXEMUL_KEY_F2:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 2);
+        buf = count = 0;
+        return 1;
+    case GXEMUL_KEY_F3:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 3);
+        buf = count = 0;
+        return 1;
+    case GXEMUL_KEY_F4:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 4);
+        buf = count = 0;
+        return 1;
+    }
+    if ((buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff)
+        && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 3) {
+        return 1;
+    }
+    switch (buf) {
+    case GXEMUL_KEY_F5:
+    case GXEMUL_KEY_F6:
+    case GXEMUL_KEY_F7:
+    case GXEMUL_KEY_F8:
+    case GXEMUL_KEY_F9:
+    case GXEMUL_KEY_F10:
+    case GXEMUL_KEY_F11:
+    case GXEMUL_KEY_F12:
+        return 1;
+    default:
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8)  & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 24) & 0xff);
+        buf = count = 0;
+        return 1;
+    }
+    return 1;
+}
+/** Process data sent when a key is pressed (in framebuffer mode).
+ *
+ *  @param keybuffer Buffer of pressed keys.
+ *  @param scan_code Scan code.
+ *
+ *  @return Always 1.
+ */
+static int gxemul_kbd_process_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    // holds at most 4 latest scan codes
+    static unsigned long buf = 0;
+    // number of scan codes in #buf
+    static int count = 0;
+    /*
+    // Please preserve this code (it can be used to determine scancodes)
+    keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    keybuffer_push(keybuffer, ' ');
+    keybuffer_push(keybuffer, ' ');
+    return 1;
+    */
+    if (scan_code == '\r') {
+        scan_code = '\n';
+    }
+    // add to buffer
+    buf |= ((unsigned long) scan_code) << (8*(count++));
+    if ((buf & 0xff) != (GXEMUL_FB_KEY_F1 & 0xff)) {
+        keybuffer_push(keybuffer, buf);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 1) {
+        return 1;
+    }
+    if ((buf & 0xffff) != (GXEMUL_FB_KEY_F1 & 0xffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 2) {
+        return 1;
+    }
+    if ((buf & 0xffffff) != (GXEMUL_FB_KEY_F1 & 0xffffff)
+        && (buf & 0xffffff) != (GXEMUL_FB_KEY_F5 & 0xffffff)
+        && (buf & 0xffffff) != (GXEMUL_FB_KEY_F9 & 0xffffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 3) {
+        return 1;
+    }
+    switch (buf) {
+    case GXEMUL_FB_KEY_F1:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 1 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F2:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 2 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F3:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 3 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F4:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 4 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F5:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 5 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F6:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 6 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F7:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 7 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F8:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 8 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F9:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 9 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F10:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 10 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F11:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 11 );
+        buf = count = 0;
+        return 1;
+    case GXEMUL_FB_KEY_F12:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 12 );
+        buf = count = 0;
+        return 1;
+    default:
+        keybuffer_push(keybuffer, buf & 0xff );
+        keybuffer_push(keybuffer, (buf >> 8)  & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 24) & 0xff);
+        buf = count = 0;
+        return 1;
+    }
+    return 1;
+}
+/** Initializes keyboard handler. */
+int kbd_arch_init(void)
+{
+    fb = (sysinfo_value("fb.kind") == 1);
+    gxemul_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &gxemul_kbd);
+    return 0;
+}
+/** Process data sent when a key is pressed.
+ *
+ *  @param keybuffer Buffer of pressed keys.
+ *  @param call      IPC call.
+ *
+ *  @return Always 1.
+ */
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    if (fb) {
+        return gxemul_kbd_process_fb(keybuffer, scan_code);
+    } else {
+        return gxemul_kbd_process_no_fb(keybuffer, scan_code);
+    }
+}
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/ia64/include/kbd.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdia64 ia64
+ * @brief   HelenOS ia64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_ia64_KBD_H_
+#define KBD_ia64_KBD_H_
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ia64/src/kbd.c
 ,0 → 1,164
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdia64 ia64
+ * @brief   HelenOS ia64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+#define KEY_F1 0x504f1b
+#define KEY_F2 0x514f1b
+#define KEY_F3 0x524f1b
+#define KEY_F4 0x534f1b
+#define KEY_F5 0x7e35315b1b
+#define KEY_F6 0x7e37315b1b
+#define KEY_F7 0x7e38315b1b
+#define KEY_F8 0x7e39315b1b
+#define KEY_F9 0x7e30325b1b
+#define KEY_F10 0x7e31325b1b
+#define KEY_F11 0x7e33325b1b
+#define KEY_F12 0x7e34325b1b
+#define FUNCTION_KEYS 0x100
+irq_cmd_t ski_cmds[1] = {
+    { CMD_IA64_GETCHAR, 0, 0, 2 }
+};
+irq_code_t ski_kbd = {
+,
+    ski_cmds
+};
+int kbd_arch_init(void)
+{
+    if (sysinfo_value("kbd")) {
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ski_kbd);
+        return 0;
+    }
+    return 1;
+}
+/*
+* Please preserve this code (it can be used to determine scancodes)
+*
+int to_hex(int v)
+{
+    return "0123456789ABCDEF"[v];
+}
+*/
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    static unsigned long long buf = 0;
+    static int count = 0;
+    static int esc_count = 0;
+    int scan_code = IPC_GET_ARG2(*call);
+    /*
+     * Please preserve this code (it can be used to determine scancodes)
+     */
+    //keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    //keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    //keybuffer_push(keybuffer, ' ');
+    //keybuffer_push(keybuffer, ' ');
+    //*/
+    if (scan_code) {
+        buf |= (unsigned long long) scan_code<<(8*(count++));
+    } else {
+        if (buf == 0x1b) {
+            esc_count++;
+            if (esc_count == 3) {
+                __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+            }
+        } else {
+            esc_count = 0;
+        }
+        if (!(buf & 0xff00)) {
+            keybuffer_push(keybuffer, buf);
+        } else {
+            switch (buf) {
+            case KEY_F1:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 1);
+                break;
+            case KEY_F2:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 2);
+                break;
+            case KEY_F3:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 3);
+                break;
+            case KEY_F4:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 4);
+                break;
+            case KEY_F5:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 5);
+                break;
+            case KEY_F6:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 6);
+                break;
+            case KEY_F7:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 7);
+                break;
+            case KEY_F8:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 8);
+                break;
+            case KEY_F9:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 9);
+                break;
+            case KEY_F10:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 10);
+                break;
+            case KEY_F11:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 11);
+                break;
+            case KEY_F12:
+                keybuffer_push(keybuffer, FUNCTION_KEYS | 12);
+                break;
+            }
+        }
+        buf = count = 0;
+    }
+    return  1;
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/ppc32/include/kbd.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdppc32 ppc32
+ * @brief   HelenOS ppc32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_ppc32_KBD_H_
+#define KBD_ppc32_KBD_H_
+#endif
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/ppc32/src/kbd.c
 ,0 → 1,209
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdppc32 ppc32
+ * @brief   HelenOS ppc32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+irq_cmd_t cuda_cmds[1] = {
+    { CMD_PPC32_GETCHAR, 0, 0, 2 }
+};
+irq_code_t cuda_kbd = {
+,
+    cuda_cmds
+};
+#define SPECIAL     255
+#define FUNCTION_KEYS 0x100
+static int lchars[0x80] = {
+    'a',
+    's',
+    'd',
+    'f',
+    'h',
+    'g',
+    'z',
+    'x',
+    'c',
+    'v',
+    SPECIAL,
+    'b',
+    'q',
+    'w',
+    'e',
+    'r',
+    'y',
+    't',
+    '1',
+    '2',
+    '3',
+    '4',
+    '6',
+    '5',
+    '=',
+    '9',
+    '7',
+    '-',
+    '8',
+    '0',
+    ']',
+    'o',
+    'u',
+    '[',
+    'i',
+    'p',
+    '\n',                 /* Enter */
+    'l',
+    'j',
+    '\'',
+    'k',
+    ';',
+    '\\',
+    ',',
+    '/',
+    'n',
+    'm',
+    '.',
+    '\t',                 /* Tab */
+    ' ',
+    '`',
+    '\b',                 /* Backspace */
+    SPECIAL,
+    SPECIAL,              /* Escape */
+    SPECIAL,              /* Ctrl */
+    SPECIAL,              /* Alt */
+    SPECIAL,              /* Shift */
+    SPECIAL,              /* Caps-Lock */
+    SPECIAL,              /* RAlt */
+    SPECIAL,              /* Left */
+    SPECIAL,              /* Right */
+    SPECIAL,              /* Down */
+    SPECIAL,              /* Up */
+    SPECIAL,
+    SPECIAL,
+    '.',                  /* Keypad . */
+    SPECIAL,
+    '*',                  /* Keypad * */
+    SPECIAL,
+    '+',                  /* Keypad + */
+    SPECIAL,
+    SPECIAL,              /* NumLock */
+    SPECIAL,
+    SPECIAL,
+    SPECIAL,
+    '/',                  /* Keypad / */
+    '\n',                 /* Keypad Enter */
+    SPECIAL,
+    '-',                  /* Keypad - */
+    SPECIAL,
+    SPECIAL,
+    SPECIAL,
+    '0',                  /* Keypad 0 */
+    '1',                  /* Keypad 1 */
+    '2',                  /* Keypad 2 */
+    '3',                  /* Keypad 3 */
+    '4',                  /* Keypad 4 */
+    '5',                  /* Keypad 5 */
+    '6',                  /* Keypad 6 */
+    '7',                  /* Keypad 7 */
+    SPECIAL,
+    '8',                  /* Keypad 8 */
+    '9',                  /* Keypad 9 */
+    SPECIAL,
+    SPECIAL,
+    SPECIAL,
+    (FUNCTION_KEYS | 5),  /* F5 */
+    (FUNCTION_KEYS | 6),  /* F6 */
+    (FUNCTION_KEYS | 7),  /* F7 */
+    (FUNCTION_KEYS | 3),  /* F3 */
+    (FUNCTION_KEYS | 8),  /* F8 */
+    (FUNCTION_KEYS | 9),  /* F9 */
+    SPECIAL,
+    (FUNCTION_KEYS | 11), /* F11 */
+    SPECIAL,
+    (FUNCTION_KEYS | 13), /* F13 */
+    SPECIAL,
+    SPECIAL,              /* ScrollLock */
+    SPECIAL,
+    (FUNCTION_KEYS | 10), /* F10 */
+    SPECIAL,
+    (FUNCTION_KEYS | 12), /* F12 */
+    SPECIAL,
+    SPECIAL,              /* Pause */
+    SPECIAL,              /* Insert */
+    SPECIAL,              /* Home */
+    SPECIAL,              /* PageUp */
+    SPECIAL,              /* Delete */
+    (FUNCTION_KEYS | 4),  /* F4 */
+    SPECIAL,              /* End */
+    (FUNCTION_KEYS | 2),  /* F2 */
+    SPECIAL,              /* PageDown */
+    (FUNCTION_KEYS | 1)   /* F1 */
+};
+int kbd_arch_init(void)
+{
+    return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &cuda_kbd);
+}
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    int param = IPC_GET_ARG2(*call);
+    if (param != -1) {
+        uint8_t scancode = (uint8_t) param;
+        if ((scancode & 0x80) != 0x80) {
+            int key = lchars[scancode & 0x7f];
+            if (key != SPECIAL)
+                keybuffer_push(keybuffer, key);
+        }
+    }
+    return 1;
+}
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/ppc64/include/kbd.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdppc64 ppc64
+ * @brief   HelenOS ppc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_ppc64_KBD_H_
+#define KBD_ppc64_KBD_H_
+#endif
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/ppc64/src/kbd.c
 ,0 → 1,56
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdppc64 ppc64
+ * @brief   HelenOS ppc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+int kbd_arch_init(void)
+{
+    return 0;
+}
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    return 1;
+}
+/** @}
+ */

 /trunk/uspace/srv/kbd/arch/mips32/include/kbd.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdmips32 mips32
+ * @brief   HelenOS mips32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_mips32_KBD_H_
+#define KBD_mips32_KBD_H_
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/arch/mips32/src/kbd.c
 ,0 → 1,377
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdmips32 mips32
+ * @brief   HelenOS mips32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+#define MSIM_KEY_F1 0x504f1bL
+#define MSIM_KEY_F2 0x514f1bL
+#define MSIM_KEY_F3 0x524f1bL
+#define MSIM_KEY_F4 0x534f1bL
+#define MSIM_KEY_F5 0x35315b1bL
+#define MSIM_KEY_F6 0x37315b1bL
+#define MSIM_KEY_F7 0x38315b1bL
+#define MSIM_KEY_F8 0x39315b1bL
+#define MSIM_KEY_F9 0x30325b1bL
+#define MSIM_KEY_F10 0x31325b1bL
+#define MSIM_KEY_F11 0x33325b1bL
+#define MSIM_KEY_F12 0x34325b1bL
+#define GXEMUL_KEY_F1 0x504f5b1bL
+#define GXEMUL_KEY_F2 0x514f5b1bL
+#define GXEMUL_KEY_F3 0x524f5b1bL
+#define GXEMUL_KEY_F4 0x534f5b1bL
+#define GXEMUL_KEY_F5 0x35315b1bL
+#define GXEMUL_KEY_F6 0x37315b1bL
+#define GXEMUL_KEY_F7 0x38315b1bL
+#define GXEMUL_KEY_F8 0x39315b1bL
+#define GXEMUL_KEY_F9 0x38325b1bL
+#define GXEMUL_KEY_F10 0x39325b1bL
+#define GXEMUL_KEY_F11 0x33325b1bL
+#define GXEMUL_KEY_F12 0x34325b1bL
+#define FUNCTION_KEYS 0x100
+irq_cmd_t msim_cmds[1] = {
+    { CMD_MEM_READ_1, (void *) 0, 0, 2 }
+};
+irq_code_t msim_kbd = {
+,
+    msim_cmds
+};
+static int msim,gxemul;
+static int fb_fb;
+int kbd_arch_init(void)
+{
+    fb_fb = (sysinfo_value("fb.kind") == 1);
+    msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &msim_kbd);
+    return 0;
+}
+/*
+//*
+//* Please preserve this code (it can be used to determine scancodes)
+//*
+int to_hex(int v)
+{
+        return "0123456789ABCDEF"[v];
+}
+*/
+static int kbd_arch_process_no_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    static unsigned long buf = 0;
+    static int count = 0;
+    /* Please preserve this code (it can be used to determine scancodes)
+    keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    keybuffer_push(keybuffer, ' ');
+    keybuffer_push(keybuffer, ' ');
+    return 1;
+    */
+    if(scan_code == 0x7e) {
+        switch (buf) {
+        case MSIM_KEY_F5:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 5);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F6:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 6);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F7:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 7);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F8:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 8);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F9:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 9);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F10:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 10);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F11:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 11);
+            buf = count = 0;
+            return 1;
+        case MSIM_KEY_F12:
+            keybuffer_push(keybuffer,FUNCTION_KEYS | 12);
+            buf = count = 0;
+            return 1;
+        default:
+            keybuffer_push(keybuffer, buf & 0xff);
+            keybuffer_push(keybuffer, (buf >> 8) &0xff);
+            keybuffer_push(keybuffer, (buf >> 16) &0xff);
+            keybuffer_push(keybuffer, (buf >> 24) &0xff);
+            keybuffer_push(keybuffer, scan_code);
+            buf = count = 0;
+            return 1;
+        }
+    }
+    buf |= ((unsigned long) scan_code)<<(8*(count++));
+    if((buf & 0xff) != (MSIM_KEY_F1 & 0xff)) {
+        keybuffer_push(keybuffer, buf);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 1)
+        return 1;
+    if ((buf & 0xffff) != (MSIM_KEY_F1 & 0xffff)
+        && (buf & 0xffff) != (MSIM_KEY_F5 & 0xffff) ) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 2)
+        return 1;
+    switch (buf) {
+    case MSIM_KEY_F1:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 1);
+        buf = count = 0;
+        return 1;
+    case MSIM_KEY_F2:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 2);
+        buf = count = 0;
+        return 1;
+    case MSIM_KEY_F3:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 3);
+        buf = count = 0;
+        return 1;
+    case MSIM_KEY_F4:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 4);
+        buf = count = 0;
+        return 1;
+    }
+    if((buf & 0xffffff) != (MSIM_KEY_F5 & 0xffffff)
+        && (buf & 0xffffff) != (MSIM_KEY_F9 & 0xffffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        buf=count=0;
+        return 1;
+    }
+    if (count <= 3)
+        return 1;
+    switch (buf) {
+    case MSIM_KEY_F5:
+    case MSIM_KEY_F6:
+    case MSIM_KEY_F7:
+    case MSIM_KEY_F8:
+    case MSIM_KEY_F9:
+    case MSIM_KEY_F10:
+    case MSIM_KEY_F11:
+    case MSIM_KEY_F12:
+        return 1;
+    default:
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        keybuffer_push(keybuffer, (buf >> 16) &0xff);
+        keybuffer_push(keybuffer, (buf >> 24) &0xff);
+        buf = count = 0;
+        return 1;
+    }
+    return 1;
+}
+static int kbd_arch_process_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    static unsigned long buf = 0;
+    static int count = 0;
+    /* Please preserve this code (it can be used to determine scancodes)
+    keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    keybuffer_push(keybuffer, ' ');
+    keybuffer_push(keybuffer, ' ');
+    return 1;
+    */
+    if (scan_code == '\r')
+        scan_code = '\n';
+    buf |= ((unsigned long) scan_code)<<(8*(count++));
+    if ((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) {
+        keybuffer_push(keybuffer, buf);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 1)
+        return 1;
+    if ((buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if (count <= 2)
+        return 1;
+    if ((buf & 0xffffff) != (GXEMUL_KEY_F1 & 0xffffff)
+        && (buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff)
+        && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff)) {
+        keybuffer_push(keybuffer, buf & 0xff);
+        keybuffer_push(keybuffer, (buf >> 8) & 0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+        buf = count = 0;
+        return 1;
+    }
+    if ( count <= 3 )
+        return 1;
+    switch (buf) {
+    case GXEMUL_KEY_F1:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 1 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F2:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 2 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F3:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 3 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F4:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 4 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F5:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 5 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F6:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 6 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F7:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 7 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F8:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 8 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F9:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 9 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F10:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 10 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F11:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 11 );
+        buf=count=0;
+        return 1;
+    case GXEMUL_KEY_F12:
+        keybuffer_push(keybuffer,FUNCTION_KEYS | 12 );
+        buf=count=0;
+        return 1;
+    default:
+        keybuffer_push(keybuffer, buf & 0xff );
+        keybuffer_push(keybuffer, (buf >> 8) &0xff );
+        keybuffer_push(keybuffer, (buf >> 16) &0xff );
+        keybuffer_push(keybuffer, (buf >> 24) &0xff );
+        buf=count=0;
+        return 1;
+    }
+    return 1;
+}
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    static int esc_count=0;
+    if (scan_code == 0x1b) {
+        esc_count++;
+        if (esc_count == 3)
+            __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+    } else {
+        esc_count=0;
+    }
+    if (fb_fb)
+        return kbd_arch_process_fb(keybuffer, scan_code);
+    return kbd_arch_process_no_fb(keybuffer, scan_code);
+}
+/** @}
+*/

/trunk/uspace/srv/kbd/arch/amd64
0,0 → 1,0
link ia32
Property changes:
Added: svn:special
+*
\ No newline at end of property

/trunk/uspace/srv/kbd/arch/mips32eb
0,0 → 1,0
link mips32
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /trunk/uspace/srv/kbd/include/key_buffer.h
 ,0 → 1,64
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef __KEY_BUFFER_H__
+#define __KEY_BUFFER_H__
+#include <sys/types.h>
+/** Size of buffer for pressed keys */
+#define KEYBUFFER_SIZE 128
+typedef struct {
+    int fifo[KEYBUFFER_SIZE];
+    unsigned long head;
+    unsigned long tail;
+    unsigned long items;
+} keybuffer_t;
+void keybuffer_free(keybuffer_t *keybuffer);
+void keybuffer_init(keybuffer_t *keybuffer);
+int keybuffer_available(keybuffer_t *keybuffer);
+int keybuffer_empty(keybuffer_t *keybuffer);
+void keybuffer_push(keybuffer_t *keybuffer, int key);
+int keybuffer_pop(keybuffer_t *keybuffer, int *c);
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/include/keys.h
 ,0 → 1,62
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/**
+ * @addtogroup kbdgen
+ * @{
+ */
+/**
+ * @file
+ */
+#ifndef _KBD_KEYS_H_
+#define _KBD_KEYS_H_
+#define KBD_PUSHCHAR    1024
+#define KBD_MS_LEFT     1025
+#define KBD_MS_RIGHT    1026
+#define KBD_MS_MIDDLE   1027
+#define KBD_MS_MOVE     1028
+#define KBD_KEY_F1  0x3b
+#define KBD_KEY_F2  0x3c
+#define KBD_KEY_F3  0x3d
+#define KBD_KEY_F4  0x3e
+#define KBD_KEY_F5  0x3f
+#define KBD_KEY_F6  0x40
+#define KBD_KEY_F7  0x41
+#define KBD_KEY_F8  0x42
+#define KBD_KEY_F9  0x43
+#define KBD_KEY_F10 0x44
+#define KBD_KEY_F11 0x45
+#define KBD_KEY_F12 0x46
+#endif
+/** @}
+*/

 /trunk/uspace/srv/kbd/include/kbd.h
 ,10 → 27,10
  */
 /** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
  * @{
- */
+ */
 /** @file
  */
 ,28 → 37,15
 #ifndef KBD_KBD_H_
 #define KBD_KBD_H_
-#include <keybuffer.h>
-#include <ipc/ipc.h>
+#include <key_buffer.h>
-#define KBD_EVENT      1024
-#define KBD_MS_LEFT    1025
-#define KBD_MS_RIGHT   1026
-#define KBD_MS_MIDDLE  1027
-#define KBD_MS_MOVE    1028
+extern int kbd_arch_init(void);
+extern int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call);
+extern int mouse_arch_process(int phoneid, ipc_call_t *call);
-typedef enum {
-    KBD_YIELD = IPC_FIRST_USER_METHOD,
-    KBD_RECLAIM
-} kbd_request_t;
-extern int cir_service;
-extern int cir_phone;
-extern void kbd_push_scancode(int);
-extern void kbd_push_ev(int, unsigned int);
 #endif
 /**
  * @}
- */
+ */

 /trunk/uspace/srv/kbd/Makefile
 ,11 → 31,11
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+include ../../../Makefile.config
-include $(LIBC_PREFIX)/Makefile.toolchain
+CFLAGS += -Iinclude -I../libadt/include
-CFLAGS += -Iinclude
 LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 ,138 → 44,67
 OUTPUT = kbd
 GENERIC_SOURCES = \
     generic/kbd.c \
-    genarch/gsp.c \
-    genarch/stroke.c \
-    generic/keybuffer.c
+    generic/key_buffer.c
-ARCH_SOURCES =
-GENARCH_SOURCES = \
-    layout/cz.c \
-    layout/us_qwerty.c \
-    layout/us_dvorak.c
+ARCH_SOURCES = \
+    arch/$(ARCH)/src/kbd.c
-ifeq ($(UARCH), amd64)
-    GENARCH_SOURCES += \
-        port/i8042.c \
-        ctl/pc.c
+ifeq ($(ARCH), ia32)
+    ARCH_SOURCES += \
+        arch/$(ARCH)/src/mouse.c \
+        arch/$(ARCH)/src/scanc.c
+    GENARCH_SOURCES = \
+        genarch/src/kbd.c
+    CFLAGS += -DMOUSE_ENABLED
 endif
-ifeq ($(UARCH), arm32)
-ifeq ($(MACHINE), testarm)
-    GENARCH_SOURCES += \
-        port/gxemul.c
-    ifeq ($(CONFIG_FB), y)
-        GENARCH_SOURCES += \
-            ctl/gxe_fb.c
-    else
-        GENARCH_SOURCES += \
-            ctl/stty.c
-    endif
+ifeq ($(ARCH), amd64)
+    ARCH_SOURCES += \
+        arch/$(ARCH)/src/mouse.c \
+        arch/$(ARCH)/src/scanc.c
+    GENARCH_SOURCES = \
+        genarch/src/kbd.c
+    CFLAGS += -DMOUSE_ENABLED
 endif
-ifeq ($(MACHINE), integratorcp)
-     GENARCH_SOURCES += \
-        port/pl050.c \
-        ctl/pl050.c
+ifeq ($(ARCH), sparc64)
+    ARCH_SOURCES += \
+        arch/$(ARCH)/src/scanc.c
+    GENARCH_SOURCES = \
+        genarch/src/kbd.c
 endif
+ifeq ($(ARCH), arm32)
+ifeq ($(MACHINE), gxemul_testarm)
+    ARCH_SOURCES += \
+        arch/$(ARCH)/src/kbd_gxemul.c
 endif
-ifeq ($(UARCH), ia32)
-    GENARCH_SOURCES += \
-        port/i8042.c \
-        ctl/pc.c
 endif
-ifeq ($(MACHINE), i460GX)
-    GENARCH_SOURCES += \
-        port/i8042.c \
-        ctl/pc.c
-endif
-ifeq ($(MACHINE), ski)
-    GENARCH_SOURCES += \
-        port/ski.c \
-        ctl/stty.c
-endif
-ifeq ($(MACHINE), msim)
-    GENARCH_SOURCES += \
-        port/msim.c \
-        ctl/stty.c
-endif
-ifeq ($(MACHINE), lgxemul)
-    GENARCH_SOURCES += \
-        port/gxemul.c
-    ifeq ($(CONFIG_FB), y)
-        GENARCH_SOURCES += \
-            ctl/gxe_fb.c
-    else
-        GENARCH_SOURCES += \
-            ctl/stty.c
-    endif
-endif
-ifeq ($(MACHINE), bgxemul)
-    GENARCH_SOURCES += \
-        port/gxemul.c
-    ifeq ($(CONFIG_FB), y)
-        GENARCH_SOURCES += \
-            ctl/gxe_fb.c
-    else
-        GENARCH_SOURCES += \
-            ctl/stty.c
-    endif
-endif
-ifeq ($(UARCH), ppc32)
-    GENARCH_SOURCES += \
-        port/dummy.c \
-        ctl/stty.c
-endif
-ifeq ($(UARCH), sparc64)
-    ifeq ($(MACHINE),serengeti)
-        GENARCH_SOURCES += \
-            port/sgcn.c \
-            ctl/stty.c
-    else
-        GENARCH_SOURCES += \
-            port/sun.c \
-            port/z8530.c \
-            port/ns16550.c \
-            ctl/sun.c
-    endif
-endif
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
-OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS)
 .PHONY: all clean depend disasm links
-all: $(OUTPUT) $(OUTPUT).disasm
+all: links $(OUTPUT) disasm
 -include Makefile.depend
+links:
+    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../genarch/include include/genarch
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend include/arch include/genarch
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/srv/kbd/genarch/include/kbd.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_genarch_KBD_H_
+#define KBD_genarch_KBD_H_
+#include <key_buffer.h>
+extern void key_released(keybuffer_t *keybuffer, unsigned char key);
+extern void key_pressed(keybuffer_t *keybuffer, unsigned char key);
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/genarch/include/scanc.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_SCANC_H_
+#define KBD_SCANC_H_
+#define FUNCTION_KEYS 0x100
+#define SPECIAL     255
+extern int sc_primary_map[];
+extern int sc_secondary_map[];
+#endif
+/**
+ * @}
+ */

 /trunk/uspace/srv/kbd/genarch/src/kbd.c
 ,0 → 1,113
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @brief   Handling of keyboard IRQ notifications for several architectures.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <key_buffer.h>
+#include <arch/scanc.h>
+#include <genarch/scanc.h>
+#include <genarch/kbd.h>
+#include <libc.h>
+#define PRESSED_SHIFT       (1<<0)
+#define PRESSED_CAPSLOCK    (1<<1)
+#define LOCKED_CAPSLOCK     (1<<0)
+static volatile int keyflags;       /**< Tracking of multiple keypresses. */
+static volatile int lockflags;      /**< Tracking of multiple keys lockings. */
+void key_released(keybuffer_t *keybuffer, unsigned char key)
+{
+    switch (key) {
+    case SC_LSHIFT:
+    case SC_RSHIFT:
+        keyflags &= ~PRESSED_SHIFT;
+        break;
+    case SC_CAPSLOCK:
+        keyflags &= ~PRESSED_CAPSLOCK;
+        if (lockflags & LOCKED_CAPSLOCK)
+            lockflags &= ~LOCKED_CAPSLOCK;
+        else
+            lockflags |= LOCKED_CAPSLOCK;
+        break;
+    default:
+        break;
+    }
+}
+void key_pressed(keybuffer_t *keybuffer, unsigned char key)
+{
+    int *map = sc_primary_map;
+    int ascii = sc_primary_map[key];
+    int shift, capslock;
+    int letter = 0;
+    static int esc_count = 0;
+    if (key == SC_ESC) {
+        esc_count++;
+        if (esc_count == 3)
+            __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+    } else {
+        esc_count = 0;
+    }
+    switch (key) {
+    case SC_LSHIFT:
+    case SC_RSHIFT:
+            keyflags |= PRESSED_SHIFT;
+        break;
+    case SC_CAPSLOCK:
+        keyflags |= PRESSED_CAPSLOCK;
+        break;
+    case SC_SPEC_ESCAPE:
+        break;
+    default:
+            letter = ((ascii >= 'a') && (ascii <= 'z'));
+        capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
+        shift = keyflags & PRESSED_SHIFT;
+        if (letter && capslock)
+            shift = !shift;
+        if (shift)
+            map = sc_secondary_map;
+        if (map[key] != SPECIAL)
+            keybuffer_push(keybuffer, map[key]);
+        break;
+    }
+}
+/**
+ * @}
+ */

 /trunk/uspace/srv/pci/libpci/i386-ports.c
 ,14 → 79,14
     d.func = 0;
     for (d.dev = 0; d.dev < 32; d.dev++) {
         u16 class, vendor;
-        if ((m->read(&d, PCI_CLASS_DEVICE, (byte *) & class,
+        if (m->read(&d, PCI_CLASS_DEVICE, (byte *) & class,
              sizeof(class))
             && (class == cpu_to_le16(PCI_CLASS_BRIDGE_HOST)
-            || class == cpu_to_le16(PCI_CLASS_DISPLAY_VGA)))
-            || (m->read(&d, PCI_VENDOR_ID, (byte *) & vendor,
+            || class == cpu_to_le16(PCI_CLASS_DISPLAY_VGA))
+            || m->read(&d, PCI_VENDOR_ID, (byte *) & vendor,
                    sizeof(vendor))
             && (vendor == cpu_to_le16(PCI_VENDOR_ID_INTEL)
-            || vendor == cpu_to_le16(PCI_VENDOR_ID_COMPAQ)))) {
+            || vendor == cpu_to_le16(PCI_VENDOR_ID_COMPAQ))) {
             a->debug("...outside the Asylum at 0/%02x/0",
                  d.dev);
             return 1;

 /trunk/uspace/srv/pci/libpci/names.c
 ,7 → 103,7
     u32 id34 = id_pair(id3, id4);
     unsigned int h = id_hash(cat, id12, id34);
     struct id_entry *n = a->id_hash[h];
-    int len = str_size((char *) text);
+    int len = strlen((char *) text);
     while (n && (n->id12 != id12 || n->id34 != id34 || n->cat != cat))
         n = n->next;
 ,7 → 150,7
     int cat = -1;
     int nest;
     static const char parse_error[] = "Parse error";
-    size_t i;
+    int i;
     *lino = 0;
     for (i = 0; i < sizeof(pci_ids) / sizeof(char *); i++) {
 ,7 → 330,7
         iv = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%04x", iv);
-        else if ((v = id_lookup(a, ID_VENDOR, iv, 0, 0, 0)) != 0)
+        else if (v = id_lookup(a, ID_VENDOR, iv, 0, 0, 0))
             return (char *) v->name;
         else
             res = snprintf(buf, size, "Unknown vendor %04x", iv);
 ,7 → 340,7
         id = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%04x", id);
-        else if ((d = id_lookup(a, ID_DEVICE, iv, id, 0, 0)) != 0)
+        else if (d = id_lookup(a, ID_DEVICE, iv, id, 0, 0))
             return (char *) d->name;
         else if (synth)
             res = snprintf(buf, size, "Unknown device %04x", id);
 ,7 → 370,7
         isv = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%04x", isv);
-        else if ((v = id_lookup(a, ID_VENDOR, isv, 0, 0, 0)) != 0)
+        else if (v = id_lookup(a, ID_VENDOR, isv, 0, 0, 0))
             return (char *) v->name;
         else if (synth)
             res = snprintf(buf, size, "Unknown vendor %04x", isv);
 ,7 → 384,7
         isd = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%04x", isd);
-        else if ((d = id_lookup_subsys(a, iv, id, isv, isd)) != 0)
+        else if (d = id_lookup_subsys(a, iv, id, isv, isd))
             return (char *) d->name;
         else if (synth)
             res = snprintf(buf, size, "Unknown device %04x", isd);
 ,9 → 415,9
         icls = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%04x", icls);
-        else if ((cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0)) != 0)
+        else if (cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0))
             return (char *) cls->name;
-        else if ((cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0)) != 0)
+        else if (cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0))
             res = snprintf(buf, size, "%s [%04x]", cls->name, icls);
         else if (synth)
             res = snprintf(buf, size, "Class %04x", icls);
 ,7 → 429,7
         ipif = va_arg(args, int);
         if (num)
             res = snprintf(buf, size, "%02x", ipif);
-        else if ((pif = id_lookup(a, ID_PROGIF, icls >> 8, icls & 0xff, ipif, 0)) != 0)
+        else if (pif = id_lookup(a, ID_PROGIF, icls >> 8, icls & 0xff, ipif, 0))
             return (char *) pif->name;
         else if (icls == 0x0101 && !(ipif & 0x70)) {
             /* IDE controllers have complex prog-if semantics */

 /trunk/uspace/srv/pci/libpci/generic.c
 ,7 → 29,7
     for (dev = 0; dev < 32; dev++) {
         t->dev = dev;
         multi = 0;
-        for (t->func = 0; !t->func || (multi && t->func < 8);
+        for (t->func = 0; !t->func || multi && t->func < 8;
              t->func++) {
             u32 vd = pci_read_long(t, PCI_VENDOR_ID);
             struct pci_dev *d;

 /trunk/uspace/srv/pci/libpci/pci_ids.h
 ,7 → 386,7
 "       1043 c01b  A9600XT/TD (Secondary)",
 "       174b 7c28  Sapphire Radeon 9600XT (Secondary)",
 "       1787 4003  Radeon 9600 XT (Secondary)",
-"   4173  RV350 \?\? [Radeon 9550] (Secondary)",
+"   4173  RV350 ?? [Radeon 9550] (Secondary)",
 "   4237  Radeon 7000 IGP",
 "   4242  R200 BB [Radeon All in Wonder 8500DV]",
 "       1002 02aa  Radeon 8500 AIW DV Edition",
 ,7 → 668,7
 "       1002 002a  Rage 128 Pro AIW AGP",
 "       1002 0048  Rage Fury Pro",
 "       1002 2000  Rage Fury MAXX AGP 4x (TMDS) (VGA device)",
-"       1002 2001  Rage Fury MAXX AGP 4x (TMDS) (Extra device\?!)",
+"       1002 2001  Rage Fury MAXX AGP 4x (TMDS) (Extra device?!)",
 "   5047  Rage 128 PG/PRO",
 "   5048  Rage 128 PH/PRO AGP 2x",
 "   5049  Rage 128 PI/PRO AGP 4x",
 ,7 → 1635,7
 "       1028 0106  PowerEdge 4600",
 "       1028 0121  PowerEdge 2650",
 "102b  Matrox Graphics, Inc.",
-"   0010  MGA-I [Impression\?]",
+"   0010  MGA-I [Impression?]",
 "   0100  MGA 1064SG [Mystique]",
 "   0518  MGA-II [Athena]",
 "   0519  MGA 2064W [Millennium]",
 ,7 → 2437,7
 "   9922  W99200F/W9922PF MPEG-1/2 Video Encoder",
 "   9970  W9970CF",
 "1051  Anigma, Inc.",
-"1052  \?Young Micro Systems",
+"1052  ?Young Micro Systems",
 "1053  Young Micro Systems",
 "1054  Hitachi, Ltd",
 "1055  Efar Microsystems",
 ,7 → 3048,7
 "   0369  Bt878 Video Capture",
 "       1002 0001  TV-Wonder",
 "       1002 0003  TV-Wonder/VE",
-"   036c  Bt879(\?\?) Video Capture",
+"   036c  Bt879(??) Video Capture",
 "       13e9 0070  Win/TV (Video Section)",
 "   036e  Bt878 Video Capture",
 "       0070 13eb  WinTV Series",
 ,7 → 4123,7
 "   01de  Quadro FX 350",
 "       10de 01dc  Quadro  FX Go350M",
 "   01df  GeForce 7300 GS",
-"   01e0  nForce2 AGP (different version\?)",
+"   01e0  nForce2 AGP (different version?)",
 "       147b 1c09  NV7 Motherboard",
 "   01e8  nForce2 AGP",
 "   01ea  nForce2 Memory Controller 0",
 ,7 → 5096,7
 "       1113 1211  EN-1207D Fast Ethernet Adapter",
 "   1216  EN-1216 Ethernet Adapter",
 "       1113 2242  EN2242 10/100 Ethernet Mini-PCI Card",
-"       111a 1020  SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX \?]",
+"       111a 1020  SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX ?]",
 "   1217  EN-1217 Ethernet Adapter",
 "   5105  10Mbps Network card",
 "   9211  EN-1207D Fast Ethernet Adapter",
 ,7 → 6556,7
 "123e  Simutech, Inc.",
 "123f  C-Cube Microsystems",
 "   00e4  MPEG",
-"   8120  E4\?",
+"   8120  E4?",
 "       11bd 0006  DV500 E4",
 "       11bd 000a  DV500 E4",
 "       11bd 000f  DV500 E4",
 ,7 → 6632,7
 "   0640  Aries 16000P",
 "125d  ESS Technology",
 "   0000  ES336H Fax Modem (Early Model)",
-"   1948  Solo\?",
+"   1948  Solo?",
 "   1968  ES1968 Maestro 2",
 "       1028 0085  ES1968 Maestro-2 PCI",
 "       1033 8051  ES1968 Maestro-2 Audiodrive",
 ,7 → 6922,7
 "       122d 4056  MSP3880SP-U",
 "       122d 4057  MSP3880SP-A",
 "   4311  Riptide HSF 56k PCI Modem",
-"       127a 4311  Ring Modular\? Riptide HSF RT HP Dom",
+"       127a 4311  Ring Modular? Riptide HSF RT HP Dom",
 "       13e0 0210  HP-GVC",
 "   4320  Riptide PCI Audio Controller",
 "       1235 4320  Riptide PCI Audio Controller",
 ,7 → 8382,7
 "   4325  BCM43xG 802.11b/g",
 "       1414 0003  Wireless Notebook Adapter MN-720",
 "       1414 0004  Wireless PCI Adapter MN-730",
-"   4326  BCM4307 Chipcommon I/O Controller\?",
+"   4326  BCM4307 Chipcommon I/O Controller?",
 "   4401  BCM4401 100Base-T",
 "       1043 80a8  A7V8X motherboard",
 "   4402  BCM4402 Integrated 10/100BaseT",
 ,7 → 8691,7
 "1504  KAISER Electronics",
 "1505  ITA INGENIEURBURO FUR TESTAUFGABEN GmbH",
 "1506  CHAMELEON Systems Inc",
-"1507  Motorola \?\? / HTEC",
+"1507  Motorola ?? / HTEC",
 "   0001  MPC105 [Eagle]",
 "   0002  MPC106 [Grackle]",
 "   0003  MPC8240 [Kahlua]",
 ,7 → 9467,7
 "270b  Xantel Corporation",
 "270f  Chaintech Computer Co. Ltd",
 "2711  AVID Technology Inc.",
-"2a15  3D Vision(\?\?\?)",
+"2a15  3D Vision(???)",
 "3000  Hansol Electronics Inc.",
 "3142  Post Impression Systems.",
 "3388  Hint Corp",

 /trunk/uspace/srv/pci/Makefile
 ,7 → 31,6
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 ,7 → 52,7
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
     $(MAKE) -C libpci clean
 depend:
 ,7 → 60,7
 $(OUTPUT): $(OBJECTS) $(LIBS)
     $(MAKE) -C libpci
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /trunk/uspace/srv/pci/update-ids
 ,16 → 1,16
 #! /bin/bash
-wget -O pci.ids http://pciids.sourceforge.net/v2.2/pci.ids
+wget http://pciids.sourceforge.net/v2.2/pci.ids
-cat > pci_ids.h <<EOF
+cat >pci_ids.h <<EOF
 /* DO NOT EDIT, THIS FILE IS AUTOMATICALLY GENERATED */
 char *pci_ids[] = {
 EOF
-cat pci.ids | grep -v '^#.*' | grep -v '^$' | tr \" \' | \
-    sed -n 's/\(.*\)/"\1",/p' | sed 's/?/\\?/g' >> pci_ids.h
+cat pci.ids | grep -v '^#.*' | grep -v '^$' | tr \" \' | sed -n 's/\(.*\)/"\1",/p' >>pci_ids.h
-cat >> pci_ids.h <<EOF
+cat >>pci_ids.h <<EOF
 ""
 };
 EOF

 /trunk/uspace/lib/libc/arch/ia32/include/setjmp.h
 ,0 → 1,56
+/*
+ * Copyright (c) 2008 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcia32
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ia32_SETJMP_H_
+#define LIBC_ia32_SETJMP_H_
+#include <libarch/types.h>
+typedef struct {
+    uint32_t ebx;
+    uint32_t esi;
+    uint32_t edi;
+    uint32_t ebp;
+    uint32_t esp;
+    uint32_t pc;
+} jmp_buf;
+int setjmp(jmp_buf env);
+void longjmp(jmp_buf env,int val) __attribute__((__noreturn__));
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ia32/include/types.h
 ,9 → 47,6
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef int32_t ssize_t;
-typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/ia32/include/atomic.h
 ,11 → 36,11
 #define LIBC_ia32_ATOMIC_H_
 static inline void atomic_inc(atomic_t *val) {
-    asm volatile ("lock incl %0\n" : "+m" (val->count));
+    asm volatile ("lock incl %0\n" : "=m" (val->count));
 }
 static inline void atomic_dec(atomic_t *val) {
-    asm volatile ("lock decl %0\n" : "+m" (val->count));
+    asm volatile ("lock decl %0\n" : "=m" (val->count));
 }
 static inline long atomic_postinc(atomic_t *val)
 ,7 → 50,7
     asm volatile (
         "movl $1, %0\n"
         "lock xaddl %0, %1\n"
-        : "=r" (r), "+m" (val->count)
+        : "=r" (r), "=m" (val->count)
     );
     return r;
 ,14 → 63,14
     asm volatile (
         "movl $-1, %0\n"
         "lock xaddl %0, %1\n"
-        : "=r" (r), "+m" (val->count)
+        : "=r" (r), "=m" (val->count)
     );
     return r;
 }
-#define atomic_preinc(val) (atomic_postinc(val) + 1)
-#define atomic_predec(val) (atomic_postdec(val) - 1)
+#define atomic_preinc(val) (atomic_postinc(val)+1)
+#define atomic_predec(val) (atomic_postdec(val)-1)
 #endif

 /trunk/uspace/lib/libc/arch/ia32/include/syscall.h
 ,25 → 36,8
 #ifndef LIBC_ia32_SYSCALL_H_
 #define LIBC_ia32_SYSCALL_H_
-#include <sys/types.h>
-#include <kernel/syscall/syscall.h>
+#include <syscall.h>
-#define __syscall0  __syscall_sysenter
-#define __syscall1  __syscall_sysenter
-#define __syscall2  __syscall_sysenter
-#define __syscall3  __syscall_sysenter
-#define __syscall4  __syscall_sysenter
-#define __syscall5  __syscall_int
-#define __syscall6  __syscall_int
-extern sysarg_t
-__syscall_sysenter(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
-     const sysarg_t, const sysarg_t, const syscall_t);
-extern sysarg_t
-__syscall_int(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
-     const sysarg_t, const sysarg_t, const syscall_t);
 #endif
 /** @}

 /trunk/uspace/lib/libc/arch/ia32/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcia32
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ia32_ENDIAN_H_
+#define LIBC_ia32_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ia32/include/ddi.h
 ,72 → 33,43
 #ifndef LIBC_ia32_DDI_H_
 #define LIBC_ia32_DDI_H_
-#include <sys/types.h>
-#include <libarch/types.h>
+static inline void outb(int16_t port, uint8_t b)
+{
+    asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port));
+}
-#define IO_SPACE_BOUNDARY   ((void *) (64 * 1024))
-static inline uint8_t pio_read_8(ioport8_t *port)
+static inline void outw(int16_t port, int16_t w)
 {
-    uint8_t val;
-    asm volatile (
-        "inb %w[port], %b[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
-    return val;
+    asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port));
 }
-static inline uint16_t pio_read_16(ioport16_t *port)
+static inline void outl(int16_t port, uint32_t l)
 {
-    uint16_t val;
-    asm volatile (
-        "inw %w[port], %w[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
-    return val;
+    asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port));
 }
-static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint8_t inb(int16_t port)
 {
-    uint32_t val;
-    asm volatile (
-        "inl %w[port], %[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
+    uint8_t val;
+    asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port));
     return val;
 }
-static inline void pio_write_8(ioport8_t *port, uint8_t val)
+static inline int16_t inw(int16_t port)
 {
-    asm volatile (
-        "outb %b[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
+    int16_t val;
+    asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port));
+    return val;
 }
-static inline void pio_write_16(ioport16_t *port, uint16_t val)
+static inline uint32_t inl(int16_t port)
 {
-    asm volatile (
-        "outw %w[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
-}
+    uint32_t val;
-static inline void pio_write_32(ioport32_t *port, uint32_t val)
-{
-    asm volatile (
-        "outl %[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
+    asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port));
+    return val;
 }
 #endif

 /trunk/uspace/lib/libc/arch/ia32/include/config.h
 ,7 → 36,8
 #define LIBC_ia32_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
 #endif

 /trunk/uspace/lib/libc/arch/ia32/Makefile.inc
 ,16 → 30,14
 #
 TARGET = i686-pc-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
+TOOLCHAIN_DIR = /usr/local/i686/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c \
+        arch/$(ARCH)/src/setjmp.S
 LFLAGS += -N
-ENDIANESS = LE
 BFD_NAME = elf32-i386
 BFD_ARCH = i386

 /trunk/uspace/lib/libc/arch/ia32/src/setjmp.S
 ,8 → 26,6
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#include <kernel/arch/context_offset.h>
 .text
 .global setjmp
 .global longjmp
 ,13 → 32,18
 .type setjmp,@function
 setjmp:
-    movl 0(%esp),%eax   # save pc value into eax
-    movl 4(%esp),%edx   # address of the jmp_buf structure to save context to
+    movl    0(%esp), %ecx   # save current pc
+    leal    4(%esp), %edx   # save stack pointer
+    movl    (%edx), %eax    # get jmp_buf pointer
-        # save registers to the jmp_buf structure
-    CONTEXT_SAVE_ARCH_CORE %edx %eax
+        # Save registers
+    movl %ebx, 0(%eax)
+    movl %esi, 4(%eax)
+    movl %edi, 8(%eax)
+    movl %ebp, 12(%eax)
+    movl %edx, 16(%eax)
-    xorl %eax,%eax      # set_jmp returns 0
+    movl %ecx, 20(%eax) # save pc
     ret
 .type longjmp,@function
 ,9 → 52,12
     movl 4(%esp), %ecx  # put address of jmp_buf into ecx
     movl 8(%esp), %eax  # put return value into eax
-        # restore registers from the jmp_buf structure
-    CONTEXT_RESTORE_ARCH_CORE %ecx %edx
-    movl %edx,0(%esp)   # put saved pc on stack
-    ret
+        # restore all registers
+    movl 0(%ecx), %ebx
+    movl 4(%ecx), %esi
+    movl 8(%ecx), %edi
+    movl 12(%ecx), %ebp
+    movl 16(%ecx), %esp
+    movl 20(%ecx), %edx # saved return address
+    jmp *%edx

 /trunk/uspace/lib/libc/arch/ia32/src/fibril.S
 ,8 → 26,6
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#include <kernel/arch/context_offset.h>
 .text
 .global context_save
 ,12 → 41,16
     movl 0(%esp),%eax   # the caller's return %eip
     movl 4(%esp),%edx   # address of the context variable to save context to
-        # save registers to the context structure
-    CONTEXT_SAVE_ARCH_CORE %edx %eax
+    movl %esp,0(%edx)   # %esp -> ctx->sp
+    movl %eax,4(%edx)   # %eip -> ctx->pc
+    movl %ebx,8(%edx)   # %ebx -> ctx->ebx
+    movl %esi,12(%edx)  # %esi -> ctx->esi
+    movl %edi,16(%edx)  # %edi -> ctx->edi
+    movl %ebp,20(%edx)  # %ebp -> ctx->ebp
     # Save TLS
     movl %gs:0, %eax
-    movl %eax, OFFSET_TLS(%edx)     # tls -> ctx->tls
+    movl %eax, 24(%edx)     # tls -> ctx->tls
     xorl %eax,%eax      # context_save returns 1
     incl %eax
 ,15 → 64,18
 #
 context_restore:
     movl 4(%esp),%eax   # address of the context variable to restore context from
+    movl 0(%eax),%esp   # ctx->sp -> %esp
+    movl 4(%eax),%edx   # ctx->pc -> %edx
+    movl 8(%eax),%ebx   # ctx->ebx -> %ebx
+    movl 12(%eax),%esi  # ctx->esi -> %esi
+    movl 16(%eax),%edi  # ctx->edi -> %edi
+    movl 20(%eax),%ebp  # ctx->ebp -> %ebp
-        # restore registers from the context structure
-    CONTEXT_RESTORE_ARCH_CORE %eax %edx
     movl %edx,0(%esp)   # ctx->pc -> saver's return %eip
     # Set thread local storage
     pushl %edx
-    movl OFFSET_TLS(%eax), %edx   # Set arg1 to TLS addr
+    movl 24(%eax), %edx   # Set arg1 to TLS addr
     movl $1, %eax         # Syscall SYS_TLS_SET
     int $0x30
     popl %edx

 /trunk/uspace/lib/libc/arch/ia32/src/syscall.S
 ,14 → 28,14
 .text
-/** Syscall wrapper - INT $0x30 version.
+/** Syscall wrapper.
  *
  * Mind the order of arguments. First two arguments and the syscall number go to
  * scratch registers. An optimized version of this wrapper for fewer arguments
  * could benefit from this and not save unused registers on the stack.
  */
-.global __syscall_int
-__syscall_int:
+.global __syscall
+__syscall:
     pushl %ebx
     pushl %esi
     pushl %edi
 ,37 → 54,3
     popl %ebx
     ret
-/** Syscall wrapper - SYSENTER version.
- *
- * This is an optimized version of syscall for four or less arguments.  Note
- * that EBP and EDI are used to remember user stack address and the return
- * address. The kernel part doesn't save DS, ES and FS so the handler restores
- * these to the selector immediately following CS (it must be the flat data
- * segment, otherwise the SYSENTER wouldn't work in the first place).
- */
-.global __syscall_sysenter
-__syscall_sysenter:
-    pushl %ebx
-    pushl %esi
-    pushl %edi
-    pushl %ebp
-    mov %esp, %ebp
-    lea ra, %edi
-    movl 20(%esp), %edx # First argument.
-    movl 24(%esp), %ecx # Second argument.
-    movl 28(%esp), %ebx # Third argument.
-    movl 32(%esp), %esi # Fourth argument.
-    movl 44(%esp), %eax # Syscall number.
-    sysenter
-ra:
-    movw %cs, %cx
-    addw $8, %cx
-    movw %cx, %ds
-    movw %cx, %es
-    movw %cx, %fs
-    popl %ebp
-    popl %edi
-    popl %esi
-    popl %ebx
-    ret

 /trunk/uspace/lib/libc/arch/ia32/src/entry.s
 ,10 → 31,10
 .org 0
 .globl __entry
+.globl __entry_driver
 ## User-space task entry point
 #
-# %ebx contains the PCB pointer
 #
 __entry:
     mov %ss, %ax
 ,9 → 42,19
     mov %ax, %es
     mov %ax, %fs
     # Do not set %gs, it contains descriptor that can see TLS
-    # Pass the PCB pointer to __main as the first argument
-    pushl %ebx
     call __main
+    call __io_init
+    call main
     call __exit
+__entry_driver:
+    mov %ss, %ax
+    mov %ax, %ds
+    mov %ax, %es
+    mov %ax, %fs
+    # Do not set %gs, it contains descriptor that can see TLS
+    call __main
+    call main
+    call __exit

 /trunk/uspace/lib/libc/arch/ia32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x1000 + SIZEOF_HEADERS;
+    . = 0x1000;
-    .init : {
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.init);
     } :text
     .text : {
 ,10 → 16,8
         *(.text);
                 *(.rodata*);
     } :text
-    . = . + 0x1000;
-    .data : {
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.data);
     } :data
     .tdata : {
 ,11 → 24,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
                 *(COMMON);
                 *(.bss);

 /trunk/uspace/lib/libc/arch/arm32/src/entry.s
 ,14 → 31,19
 .org 0
 .global __entry
+.global __entry_driver
 ## User-space task entry point
 #
-# r1 contains the PCB pointer
 #
 __entry:
-    # Pass pcb_ptr to __main as the first argument (in r0)
-    mov r0, r1
     bl __main
+    bl __io_init
+    bl main
+    bl __exit
+__entry_driver:
+    bl __main
+    bl main
     bl __exit

 /trunk/uspace/lib/libc/arch/arm32/include/tls.h
 ,7 → 40,7
 #define CONFIG_TLS_VARIANT_1
-/** Offsets for accessing thread-local variables are shifted 8 bytes higher. */
+/** Offsets for accessing __thread variables are shifted 8 bytes higher. */
 #define ARM_TP_OFFSET  (-8)
 /** TCB (Thread Control Block) struct.

 /trunk/uspace/lib/libc/arch/arm32/include/types.h
 ,9 → 48,6
 typedef unsigned long int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef int32_t ssize_t;
-typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/arm32/include/fibril.h
 ,7 → 38,7
 #include <sys/types.h>
 #include <align.h>
-#include <thread.h>
+#include "thread.h"
 /** Size of a stack item */
 #define STACK_ITEM_SIZE     4

 /trunk/uspace/lib/libc/arch/arm32/include/syscall.h
 ,14 → 30,12
  * @{
  */
 /** @file
- *  @brief
+ *  @brief Empty.
  */
 #ifndef LIBC_arm32_SYSCALL_H_
 #define LIBC_arm32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /trunk/uspace/lib/libc/arch/arm32/include/endian.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcarm32
+ * @{
+ */
+/** @file
+ *  @brief Endianness definition.
+ */
+#ifndef LIBC_arm32_ENDIAN_H_
+#define LIBC_arm32_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+/** @}
+ */

/trunk/uspace/lib/libc/arch/arm32/include/config.h
38,6 → 38,7

#define PAGE_WIDTH 12
#define PAGE_SIZE (1 << PAGE_WIDTH)
#define PAGE_COLOR_BITS 0 /* dummy */

#endif

 /trunk/uspace/lib/libc/arch/arm32/Makefile.inc
 ,17 → 31,15
 #
 TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/eabi.S
-CFLAGS += -ffixed-r9 -mtp=soft
+TOOLCHAIN_DIR = /usr/local/arm/bin
+CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
+AFLAGS +=
-ENDIANESS = LE
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c \
+        arch/$(ARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /trunk/uspace/lib/libc/arch/arm32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x1000 + SIZEOF_HEADERS;
+    . = 0x1000;
-    .init : {
+    .init ALIGN(0x1000): SUBALIGN(0x1000) {
         *(.init);
     } : text
     .text : {
 ,10 → 16,8
         *(.text);
         *(.rodata*);
     } :text
-    . = . + 0x1000;
-    .data : {
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.opd);
         *(.data .data.*);
         *(.sdata);
 ,11 → 26,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
         *(.sbss);
         *(.scommon);

 /trunk/uspace/lib/libc/arch/sparc64/include/syscall.h
 ,14 → 38,6
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
-#define __syscall0  __syscall
-#define __syscall1  __syscall
-#define __syscall2  __syscall
-#define __syscall3  __syscall
-#define __syscall4  __syscall
-#define __syscall5  __syscall
-#define __syscall6  __syscall
 static inline sysarg_t
 __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
     const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)

 /trunk/uspace/lib/libc/arch/sparc64/include/types.h
 ,9 → 47,6
 typedef unsigned int uint32_t;
 typedef unsigned long int uint64_t;
-typedef int64_t ssize_t;
-typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/sparc64/include/fibril.h
 ,7 → 39,7
 #include <sys/types.h>
 #include <align.h>
-#define SP_DELTA    (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
+#define SP_DELTA    STACK_WINDOW_SAVE_AREA_SIZE
 #ifdef context_set
 #undef context_set

/trunk/uspace/lib/libc/arch/sparc64/include/config.h
37,6 → 37,7

#define PAGE_WIDTH 14
#define PAGE_SIZE (1 << PAGE_WIDTH)
#define PAGE_COLOR_BITS 0 /*< Only one page color. /

#endif

 /trunk/uspace/lib/libc/arch/sparc64/include/stack.h
 ,11 → 45,6
  */
 #define STACK_WINDOW_SAVE_AREA_SIZE (16 * STACK_ITEM_SIZE)
-/*
- * Six extended words for first six arguments.
- */
-#define STACK_ARG_SAVE_AREA_SIZE        (6 * STACK_ITEM_SIZE)
 /**
  * By convention, the actual top of the stack is %sp + STACK_BIAS.
  */

 /trunk/uspace/lib/libc/arch/sparc64/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcsparc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_sparc64_ENDIAN_H_
+#define LIBC_sparc64_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __BIG_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/sparc64/include/context_offset.h
 ,0 → 1,21
+/* This file is automatically generated by gencontext.c. */
+/* struct context */
+#define OFFSET_SP       0x0
+#define OFFSET_PC       0x8
+#define OFFSET_I0       0x10
+#define OFFSET_I1       0x18
+#define OFFSET_I2       0x20
+#define OFFSET_I3       0x28
+#define OFFSET_I4       0x30
+#define OFFSET_I5       0x38
+#define OFFSET_FP       0x40
+#define OFFSET_I7       0x48
+#define OFFSET_L0       0x50
+#define OFFSET_L1       0x58
+#define OFFSET_L2       0x60
+#define OFFSET_L3       0x68
+#define OFFSET_L4       0x70
+#define OFFSET_L5       0x78
+#define OFFSET_L6       0x80
+#define OFFSET_L7       0x88
+#define OFFSET_TP   0x90

 /trunk/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,15 → 30,13
 #
 TARGET = sparc64-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
+TOOLCHAIN_DIR = /usr/local/sparc64/bin
-ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N
-ENDIANESS = BE
 BFD_NAME = elf64-sparc
 BFD_ARCH = sparc

 /trunk/uspace/lib/libc/arch/sparc64/src/fibril.S
 ,7 → 26,7
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#include <kernel/arch/context_offset.h>
+#include <libarch/context_offset.h>
 .text
 ,8 → 33,52
 .global context_save
 .global context_restore
+.macro CONTEXT_STORE r
+    stx %sp, [\r + OFFSET_SP]
+    stx %o7, [\r + OFFSET_PC]
+    stx %i0, [\r + OFFSET_I0]
+    stx %i1, [\r + OFFSET_I1]
+    stx %i2, [\r + OFFSET_I2]
+    stx %i3, [\r + OFFSET_I3]
+    stx %i4, [\r + OFFSET_I4]
+    stx %i5, [\r + OFFSET_I5]
+    stx %fp, [\r + OFFSET_FP]
+    stx %i7, [\r + OFFSET_I7]
+    stx %l0, [\r + OFFSET_L0]
+    stx %l1, [\r + OFFSET_L1]
+    stx %l2, [\r + OFFSET_L2]
+    stx %l3, [\r + OFFSET_L3]
+    stx %l4, [\r + OFFSET_L4]
+    stx %l5, [\r + OFFSET_L5]
+    stx %l6, [\r + OFFSET_L6]
+    stx %l7, [\r + OFFSET_L7]
+    stx %g7, [\r + OFFSET_TP]
+.endm
+.macro CONTEXT_LOAD r
+    ldx [\r + OFFSET_SP], %sp
+    ldx [\r + OFFSET_PC], %o7
+    ldx [\r + OFFSET_I0], %i0
+    ldx [\r + OFFSET_I1], %i1
+    ldx [\r + OFFSET_I2], %i2
+    ldx [\r + OFFSET_I3], %i3
+    ldx [\r + OFFSET_I4], %i4
+    ldx [\r + OFFSET_I5], %i5
+    ldx [\r + OFFSET_FP], %fp
+    ldx [\r + OFFSET_I7], %i7
+    ldx [\r + OFFSET_L0], %l0
+    ldx [\r + OFFSET_L1], %l1
+    ldx [\r + OFFSET_L2], %l2
+    ldx [\r + OFFSET_L3], %l3
+    ldx [\r + OFFSET_L4], %l4
+    ldx [\r + OFFSET_L5], %l5
+    ldx [\r + OFFSET_L6], %l6
+    ldx [\r + OFFSET_L7], %l7
+    ldx [\r + OFFSET_TP], %g7
+.endm
 context_save:
-    CONTEXT_SAVE_ARCH_CORE %o0
+    CONTEXT_STORE %o0
     retl
     mov 1, %o0      ! context_save_arch returns 1
 ,6 → 92,6
     #
     flushw
-    CONTEXT_RESTORE_ARCH_CORE %o0
+    CONTEXT_LOAD %o0
     retl
     xor %o0, %o0, %o0   ! context_restore_arch returns 0

 /trunk/uspace/lib/libc/arch/sparc64/src/entry.s
 ,18 → 31,27
 .org 0
 .globl __entry
+.globl __entry_driver
 ## User-space task entry point
 #
-# %o0 contains uarg
-# %o1 contains pcb_ptr
 #
 __entry:
-    # Pass pcb_ptr as the first argument to __main()
-    mov %o1, %o0
     sethi %hi(_gp), %l7
     call __main
     or %l7, %lo(_gp), %l7
+    call __io_init
+    nop
+    call main
+    nop
+    call __exit
+    nop
+__entry_driver:
+    sethi %hi(_gp), %l7
+    call __main
+    or %l7, %lo(_gp), %l7
+    call main
+    nop
     call __exit
     nop

 /trunk/uspace/lib/libc/arch/sparc64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x4000 + SIZEOF_HEADERS;
+    . = 0x4000;
-    .init : {
+    .init ALIGN(0x4000) : SUBALIGN(0x4000) {
         *(.init);
     } :text
     .text : {
 ,14 → 16,12
         *(.text);
         *(.rodata*);
     } :text
-    . = . + 0x4000;
-    .got : {
+    .got ALIGN(0x4000) : SUBALIGN(0x4000) {
          _gp = .;
          *(.got*);
     } :data
-    .data : {
+    .data ALIGN(0x4000) : SUBALIGN(0x4000) {
         *(.data);
         *(.sdata);
     } :data
 ,11 → 29,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
         *(.sbss);
         *(COMMON);

 /trunk/uspace/lib/libc/arch/ppc32/src/fibril.S
 ,10 → 32,58
 .global context_restore
 #include <libarch/regname.h>
-#include <arch/context_offset.h>
+#include <libarch/context_offset.h>
+.macro CONTEXT_STORE r
+    stw sp, OFFSET_SP(\r)
+    stw r2, OFFSET_R2(\r)
+    stw r13, OFFSET_R13(\r)
+    stw r14, OFFSET_R14(\r)
+    stw r15, OFFSET_R15(\r)
+    stw r16, OFFSET_R16(\r)
+    stw r17, OFFSET_R17(\r)
+    stw r18, OFFSET_R18(\r)
+    stw r19, OFFSET_R19(\r)
+    stw r20, OFFSET_R20(\r)
+    stw r21, OFFSET_R21(\r)
+    stw r22, OFFSET_R22(\r)
+    stw r23, OFFSET_R23(\r)
+    stw r24, OFFSET_R24(\r)
+    stw r25, OFFSET_R25(\r)
+    stw r26, OFFSET_R26(\r)
+    stw r27, OFFSET_R27(\r)
+    stw r28, OFFSET_R28(\r)
+    stw r29, OFFSET_R29(\r)
+    stw r30, OFFSET_R30(\r)
+    stw r31, OFFSET_R31(\r)
+.endm
+.macro CONTEXT_LOAD r
+    lwz sp, OFFSET_SP(\r)
+    lwz r2, OFFSET_R2(\r)
+    lwz r13, OFFSET_R13(\r)
+    lwz r14, OFFSET_R14(\r)
+    lwz r15, OFFSET_R15(\r)
+    lwz r16, OFFSET_R16(\r)
+    lwz r17, OFFSET_R17(\r)
+    lwz r18, OFFSET_R18(\r)
+    lwz r19, OFFSET_R19(\r)
+    lwz r20, OFFSET_R20(\r)
+    lwz r21, OFFSET_R21(\r)
+    lwz r22, OFFSET_R22(\r)
+    lwz r23, OFFSET_R23(\r)
+    lwz r24, OFFSET_R24(\r)
+    lwz r25, OFFSET_R25(\r)
+    lwz r26, OFFSET_R26(\r)
+    lwz r27, OFFSET_R27(\r)
+    lwz r28, OFFSET_R28(\r)
+    lwz r29, OFFSET_R29(\r)
+    lwz r30, OFFSET_R30(\r)
+    lwz r31, OFFSET_R31(\r)
+.endm
 context_save:
-    CONTEXT_SAVE_ARCH_CORE r3
+    CONTEXT_STORE r3
     mflr r4
     stw r4, OFFSET_PC(r3)
 ,7 → 97,7
 context_restore:
-    CONTEXT_RESTORE_ARCH_CORE r3
+    CONTEXT_LOAD r3
     lwz r4, OFFSET_CR(r3)
     mtcr r4

 /trunk/uspace/lib/libc/arch/ppc32/src/entry.s
 ,15 → 31,18
 .org 0
 .globl __entry
+.globl __entry_driver
 ## User-space task entry point
 #
-# r6 contains the PCB pointer
 #
 __entry:
-    # Pass the PCB pointer to __main() as the first argument.
-    # The first argument is passed in r3.
-    mr %r3, %r6
     bl __main
+    bl __io_init
+    bl main
+    bl __exit
+__entry_driver:
+    bl __main
+    bl main
     bl __exit

 /trunk/uspace/lib/libc/arch/ppc32/include/types.h
 ,9 → 47,6
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef int32_t ssize_t;
-typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/ppc32/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_ppc32_SYSCALL_H_
 #define LIBC_ppc32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /trunk/uspace/lib/libc/arch/ppc32/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc32
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc32_ENDIAN_H_
+#define LIBC_ppc32_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __BIG_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc32/include/config.h
 ,7 → 36,8
 #define LIBC_ppc32_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
 #endif

 /trunk/uspace/lib/libc/arch/ppc32/include/context_offset.h
 ,0 → 1,25
+/* struct context */
+#define OFFSET_SP    0x0
+#define OFFSET_PC    0x4
+#define OFFSET_R2    0x8
+#define OFFSET_R13   0xc
+#define OFFSET_R14   0x10
+#define OFFSET_R15   0x14
+#define OFFSET_R16   0x18
+#define OFFSET_R17   0x1c
+#define OFFSET_R18   0x20
+#define OFFSET_R19   0x24
+#define OFFSET_R20   0x28
+#define OFFSET_R21   0x2c
+#define OFFSET_R22   0x30
+#define OFFSET_R23   0x34
+#define OFFSET_R24   0x38
+#define OFFSET_R25   0x3c
+#define OFFSET_R26   0x40
+#define OFFSET_R27   0x44
+#define OFFSET_R28   0x48
+#define OFFSET_R29   0x4c
+#define OFFSET_R30   0x50
+#define OFFSET_R31   0x54
+#define OFFSET_CR    0x58
+#define OFFSET_CR    0x58

 /trunk/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,17 → 30,15
 #
 TARGET = ppc-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
+TOOLCHAIN_DIR = /usr/local/ppc/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32
 LFLAGS += -N
-ENDIANESS = BE
 BFD_NAME = elf32-powerpc
 BFD_ARCH = powerpc:common

 /trunk/uspace/lib/libc/arch/ppc32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x1000 + SIZEOF_HEADERS;
+    . = 0x1000;
-    .init : {
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.init);
     } :text
     .text : {
 ,10 → 16,8
         *(.text);
         *(.rodata*);
     } :text
-    . = . + 0x1000;
-    .data : {
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.data);
         *(.sdata);
     } :data
 ,11 → 25,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
         *(.sbss);
         *(COMMON);

 /trunk/uspace/lib/libc/arch/ia64/src/entry.s
 ,17 → 31,27
 .org 0
 .globl __entry
+.globl __entry_driver
 ## User-space task entry point
 #
-# r2 contains the PCB pointer
 #
 __entry:
     alloc loc0 = ar.pfs, 0, 1, 2, 0
-    movl r1 = _gp
+    mov r1 = _gp
+    br.call.sptk.many b0 = __main
+:
+    br.call.sptk.many b0 = __io_init
+:
+    br.call.sptk.many b0 = main
+:
+    br.call.sptk.many b0 = __exit
-    # Pass PCB pointer as the first argument to __main
-    mov out0 = r2
+__entry_driver:
+    alloc loc0 = ar.pfs, 0, 1, 2, 0
+    mov r1 = _gp
     br.call.sptk.many b0 = __main
 :
+    br.call.sptk.many b0 = main
+:
     br.call.sptk.many b0 = __exit

 /trunk/uspace/lib/libc/arch/ia64/src/thread_entry.s
 ,7 → 36,7
 __thread_entry:
     alloc loc0 = ar.pfs, 0, 1, 1, 0
-    movl r1 = _gp
+    mov r1 = _gp
     #
     # r8 contains address of uarg structure.

 /trunk/uspace/lib/libc/arch/ia64/Makefile.inc
 ,17 → 30,14
 #
 TARGET = ia64-pc-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/ddi.c
-CFLAGS += -fno-unwind-tables
+TOOLCHAIN_DIR = /usr/local/ia64/bin
+CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
+AFLAGS +=
-ENDIANESS = LE
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

 /trunk/uspace/lib/libc/arch/ia64/include/types.h
 ,9 → 47,6
 typedef unsigned int uint32_t;
 typedef unsigned long int uint64_t;
-typedef int64_t ssize_t;
-typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
 typedef unsigned char __r8;                     /* Reserve byte */

 /trunk/uspace/lib/libc/arch/ia64/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_ia64_SYSCALL_H_
 #define LIBC_ia64_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /trunk/uspace/lib/libc/arch/ia64/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcia64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ia64_ENDIAN_H_
+#define LIBC_ia64_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ia64/include/config.h
 ,7 → 36,8
 #define LIBC_ia64_CONFIG_H_
 #define PAGE_WIDTH  14
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
 #endif

 /trunk/uspace/lib/libc/arch/ia64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x4000 + SIZEOF_HEADERS;
+    . = 0x4000;
-    .init : {
+    .init ALIGN(0x4000): SUBALIGN(0x4000) {
         *(.init);
     } : text
     .text : {
 ,9 → 17,7
         *(.rodata*);
     } :text
-    . = . + 0x4000;
-    .got : {
+    .got ALIGN(0x4000) : SUBALIGN(0x4000) {
         _gp = .;
         *(.got*);
     } :data
 ,11 → 30,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
         *(.sbss);
         *(.scommon);

 /trunk/uspace/lib/libc/arch/mips32/src/fibril.S
 ,13 → 31,119
 .set noat
 .set noreorder
-#include <arch/context_offset.h>
+#include <arch/asm/regname.h>
+#include <libarch/context_offset.h>
 .global context_save
 .global context_restore
+.macro CONTEXT_STORE r
+    sw $s0,OFFSET_S0(\r)
+    sw $s1,OFFSET_S1(\r)
+    sw $s2,OFFSET_S2(\r)
+    sw $s3,OFFSET_S3(\r)
+    sw $s4,OFFSET_S4(\r)
+    sw $s5,OFFSET_S5(\r)
+    sw $s6,OFFSET_S6(\r)
+    sw $s7,OFFSET_S7(\r)
+    sw $s8,OFFSET_S8(\r)
+    sw $gp,OFFSET_GP(\r)
+    sw $k1,OFFSET_TLS(\r)
+#ifdef CONFIG_MIPS_FPU
+    mfc1 $t0,$20
+    sw $t0, OFFSET_F20(\r)
+    mfc1 $t0,$21
+    sw $t0, OFFSET_F21(\r)
+    mfc1 $t0,$22
+    sw $t0, OFFSET_F22(\r)
+    mfc1 $t0,$23
+    sw $t0, OFFSET_F23(\r)
+    mfc1 $t0,$24
+    sw $t0, OFFSET_F24(\r)
+    mfc1 $t0,$25
+    sw $t0, OFFSET_F25(\r)
+    mfc1 $t0,$26
+    sw $t0, OFFSET_F26(\r)
+    mfc1 $t0,$27
+    sw $t0, OFFSET_F27(\r)
+    mfc1 $t0,$28
+    sw $t0, OFFSET_F28(\r)
+    mfc1 $t0,$29
+    sw $t0, OFFSET_F29(\r)
+    mfc1 $t0,$30
+    sw $t0, OFFSET_F30(\r)
+#endif
+    sw $ra,OFFSET_PC(\r)
+    sw $sp,OFFSET_SP(\r)
+.endm
+.macro CONTEXT_LOAD r
+    lw $s0,OFFSET_S0(\r)
+    lw $s1,OFFSET_S1(\r)
+    lw $s2,OFFSET_S2(\r)
+    lw $s3,OFFSET_S3(\r)
+    lw $s4,OFFSET_S4(\r)
+    lw $s5,OFFSET_S5(\r)
+    lw $s6,OFFSET_S6(\r)
+    lw $s7,OFFSET_S7(\r)
+    lw $s8,OFFSET_S8(\r)
+    lw $gp,OFFSET_GP(\r)
+    lw $k1,OFFSET_TLS(\r)
+#ifdef CONFIG_MIPS_FPU
+    lw $t0, OFFSET_F20(\r)
+    mtc1 $t0,$20
+    lw $t0, OFFSET_F21(\r)
+    mtc1 $t0,$21
+    lw $t0, OFFSET_F22(\r)
+    mtc1 $t0,$22
+    lw $t0, OFFSET_F23(\r)
+    mtc1 $t0,$23
+    lw $t0, OFFSET_F24(\r)
+    mtc1 $t0,$24
+    lw $t0, OFFSET_F25(\r)
+    mtc1 $t0,$25
+    lw $t0, OFFSET_F26(\r)
+    mtc1 $t0,$26
+    lw $t0, OFFSET_F27(\r)
+    mtc1 $t0,$27
+    lw $t0, OFFSET_F28(\r)
+    mtc1 $t0,$28
+    lw $t0, OFFSET_F29(\r)
+    mtc1 $t0,$29
+    lw $t0, OFFSET_F30(\r)
+    mtc1 $t0,$30
+#endif
+    lw $ra,OFFSET_PC(\r)
+    lw $sp,OFFSET_SP(\r)
+.endm
 context_save:
-    CONTEXT_SAVE_ARCH_CORE $a0
+    CONTEXT_STORE $a0
     # context_save returns 1
     j $ra
 ,7 → 150,7
     li $v0, 1
 context_restore:
-    CONTEXT_RESTORE_ARCH_CORE $a0
+    CONTEXT_LOAD $a0
     # Just for the jump into first function, but one instruction
     # should not bother us

 /trunk/uspace/lib/libc/arch/mips32/src/entry.s
 ,13 → 35,13
 ## User-space task entry point
 #
-# $a0 ($4) contains the PCB pointer
 #
 .ent __entry
 __entry:
     .frame $sp, 32, $31
     .cpload $25
     # Mips o32 may store its arguments on stack, make space (16 bytes),
     # so that it could work with -O0
     # Make space additional 16 bytes for the stack frame
 ,18 → 48,42
     addiu $sp, -32
     .cprestore 16   # Allow PIC code
+    jal __main
+    nop
+    jal __io_init
+    nop
+    jal main
+    nop
+    jal __exit
+    nop
+.end
-    # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already
-    # in $a0. As the first argument is passed in $a0, no operation
-    # is needed.
+.ent __entry_driver
+__entry_driver:
+    .frame $sp, 32, $31
+    .cpload $25
+    # Mips o32 may store its arguments on stack, make space (16 bytes),
+    # so that it could work with -O0
+    # Make space additional 16 bytes for the stack frame
+    addiu $sp, -32
+    .cprestore 16   # Allow PIC code
     jal __main
     nop
+    jal main
+    nop
     jal __exit
     nop
 .end
 # Alignment of output section data to 0x4000
 .section .data
 .align 14

 /trunk/uspace/lib/libc/arch/mips32/include/types.h
 ,9 → 48,6
 typedef unsigned long int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef int32_t ssize_t;
-typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/mips32/include/atomic.h
 ,14 → 59,13
     asm volatile (
         "1:\n"
         "   ll %0, %1\n"
-        "   addu %0, %0, %3\n"  /* same as add, but never traps on overflow */
+        "   addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */
         "       move %2, %0\n"
         "   sc %0, %1\n"
         "   beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
         /*  nop */      /* nop is inserted automatically by compiler */
-        "   nop\n"
-        : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-        : "r" (i), "i" (0)
+        : "=r" (tmp), "=m" (val->count), "=r" (v)
+        : "i" (i), "i" (0)
         );
     return v;

 /trunk/uspace/lib/libc/arch/mips32/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_mips32_SYSCALL_H_
 #define LIBC_mips32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /trunk/uspace/lib/libc/arch/mips32/include/endian.h
 ,0 → 1,49
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcmips32 mips32
+  * @brief mips32 architecture dependent parts of libc
+  * @ingroup lc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_mips32_ENDIAN_H_
+#define LIBC_mips32_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/mips32/include/config.h
 ,7 → 36,8
 #define LIBC_mips32_CONFIG_H_
 #define PAGE_WIDTH  14
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
 #endif

 /trunk/uspace/lib/libc/arch/mips32/include/context_offset.h
 ,0 → 1,28
+/* This file is automatically generated by gencontext.c. */
+/* struct context */
+#define OFFSET_SP      0x0
+#define OFFSET_PC      0x4
+#define OFFSET_S0      0x8
+#define OFFSET_S1      0xc
+#define OFFSET_S2      0x10
+#define OFFSET_S3      0x14
+#define OFFSET_S4      0x18
+#define OFFSET_S5      0x1c
+#define OFFSET_S6      0x20
+#define OFFSET_S7      0x24
+#define OFFSET_S8      0x28
+#define OFFSET_GP      0x2c
+#define OFFSET_TLS     0x30
+#define OFFSET_F20     0x34
+#define OFFSET_F21     0x38
+#define OFFSET_F22     0x3c
+#define OFFSET_F23     0x40
+#define OFFSET_F24     0x44
+#define OFFSET_F25     0x48
+#define OFFSET_F26     0x4c
+#define OFFSET_F27     0x50
+#define OFFSET_F28     0x54
+#define OFFSET_F29     0x58
+#define OFFSET_F30     0x5c

 /trunk/uspace/lib/libc/arch/mips32/Makefile.inc
 ,15 → 30,18
 #
 TARGET = mipsel-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
+TOOLCHAIN_DIR = /usr/local/mipsel/bin
+CFLAGS += -mips3
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+-include ../../Makefile.config
+ifeq ($(CONFIG_MIPS_FPU),y)
+    CFLAGS += -DCONFIG_MIPS_FPU
+endif
-CFLAGS += -mips3
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+    arch/$(ARCH)/src/fibril.S \
+    arch/$(ARCH)/src/tls.c
-ENDIANESS = LE
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

 /trunk/uspace/lib/libc/arch/mips32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x4000 + SIZEOF_HEADERS;
+    . = 0x4000;
-    .init : {
+    .init ALIGN(0x4000) : SUBALIGN(0x4000) {
         *(.init);
     } :text
     .text : {
 ,8 → 17,6
         *(.rodata*);
     } :text
-    . = . + 0x4000;
     .data : {
         *(.data);
         *(.data.rel*);
 ,11 → 31,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .sbss : {
         *(.scommon);

 /trunk/uspace/lib/libc/arch/amd64/src/fibril.S
 ,7 → 31,7
 .global context_save
 .global context_restore
-#include <kernel/arch/context_offset.h>
+#include <libarch/context_offset.h>
 ## Save current CPU context
 #
 ,10 → 40,17
 #
 context_save:
     movq (%rsp), %rdx     # the caller's return %eip
     # In %edi is passed 1st argument
-    CONTEXT_SAVE_ARCH_CORE %rdi %rdx
+    movq %rdx, OFFSET_PC(%rdi)
+    movq %rsp, OFFSET_SP(%rdi)
+    movq %rbx, OFFSET_RBX(%rdi)
+    movq %rbp, OFFSET_RBP(%rdi)
+    movq %r12, OFFSET_R12(%rdi)
+    movq %r13, OFFSET_R13(%rdi)
+    movq %r14, OFFSET_R14(%rdi)
+    movq %r15, OFFSET_R15(%rdi)
     # Save TLS
     movq %fs:0, %rax
     movq %rax, OFFSET_TLS(%rdi)
 ,9 → 66,16
 # pointed by the 1st argument. Returns 0 in EAX.
 #
 context_restore:
+    movq OFFSET_R15(%rdi), %r15
+    movq OFFSET_R14(%rdi), %r14
+    movq OFFSET_R13(%rdi), %r13
+    movq OFFSET_R12(%rdi), %r12
+    movq OFFSET_RBP(%rdi), %rbp
+    movq OFFSET_RBX(%rdi), %rbx
-    CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
+    movq OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+    movq OFFSET_PC(%rdi), %rdx
     movq %rdx,(%rsp)
     # Set thread local storage

 /trunk/uspace/lib/libc/arch/amd64/src/entry.s
 ,14 → 31,18
 .org 0
 .globl __entry
+.globl __entry_driver
 ## User-space task entry point
 #
-# %rdi contains the PCB pointer
 #
 __entry:
-    # %rdi was deliberately chosen as the first argument is also in %rdi
-    # Pass PCB pointer to __main (no operation)
     call __main
+    call __io_init
+    call main
+    call __exit
+__entry_driver:
+    call __main
+    call main
     call __exit

 /trunk/uspace/lib/libc/arch/amd64/include/types.h
 ,9 → 47,6
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
-typedef int64_t ssize_t;
-typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
 #endif

 /trunk/uspace/lib/libc/arch/amd64/include/atomic.h
 ,11 → 38,11
 #define LIBC_amd64_ATOMIC_H_
 static inline void atomic_inc(atomic_t *val) {
-    asm volatile ("lock incq %0\n" : "+m" (val->count));
+    asm volatile ("lock incq %0\n" : "=m" (val->count));
 }
 static inline void atomic_dec(atomic_t *val) {
-    asm volatile ("lock decq %0\n" : "+m" (val->count));
+    asm volatile ("lock decq %0\n" : "=m" (val->count));
 }
 static inline long atomic_postinc(atomic_t *val)
 ,7 → 52,7
     asm volatile (
         "movq $1, %0\n"
         "lock xaddq %0, %1\n"
-        : "=r" (r), "+m" (val->count)
+        : "=r" (r), "=m" (val->count)
     );
     return r;
 ,14 → 65,14
     asm volatile (
         "movq $-1, %0\n"
         "lock xaddq %0, %1\n"
-        : "=r" (r), "+m" (val->count)
+        : "=r" (r), "=m" (val->count)
     );
     return r;
 }
-#define atomic_preinc(val) (atomic_postinc(val) + 1)
-#define atomic_predec(val) (atomic_postdec(val) - 1)
+#define atomic_preinc(val) (atomic_postinc(val)+1)
+#define atomic_predec(val) (atomic_postdec(val)-1)
 #endif

 /trunk/uspace/lib/libc/arch/amd64/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_amd64_SYSCALL_H_
 #define LIBC_amd64_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /trunk/uspace/lib/libc/arch/amd64/include/endian.h
 ,0 → 1,49
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcamd64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_amd64_ENDIAN_H_
+#define LIBC_amd64_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/amd64/include/config.h
 ,7 → 36,8
 #define LIBC_amd64_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
 #endif

 /trunk/uspace/lib/libc/arch/amd64/include/context_offset.h
 ,0 → 1,12
+/* This file is automatically generated by gencontext.c. */
+#define OFFSET_SP  0x0
+#define OFFSET_PC  0x8
+#define OFFSET_RBX 0x10
+#define OFFSET_RBP 0x18
+#define OFFSET_R12 0x20
+#define OFFSET_R13 0x28
+#define OFFSET_R14 0x30
+#define OFFSET_R15 0x38
+#define OFFSET_TLS 0x40

 /trunk/uspace/lib/libc/arch/amd64/Makefile.inc
 ,15 → 30,13
 #
 TARGET = amd64-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
+TOOLCHAIN_DIR = /usr/local/amd64/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 LFLAGS += -N
-ENDIANESS = LE
 BFD_NAME = elf64-x86-64
 BFD_ARCH = i386:x86-64

 /trunk/uspace/lib/libc/arch/amd64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,9 → 7,9
 }
 SECTIONS {
-    . = 0x1000 + SIZEOF_HEADERS;
+    . = 0x1000;
-    .init : {
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.init);
     } :text
     .text : {
 ,10 → 16,8
         *(.text);
         *(.rodata*);
     } :text
-    . = . + 0x1000;
-    .data : {
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
         *(.data);
     } :data
     .tdata : {
 ,11 → 24,13
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
+    } :data
+    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = ALIGNOF(.tdata);
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
     .bss : {
         *(COMMON);
         *(.bss);

 /trunk/uspace/lib/libc/arch/ppc64/src/tls.c
 ,0 → 1,60
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#include <tls.h>
+#include <malloc.h>
+/** Allocate TLS & TCB for initial module threads
+ *
+ * @param data Start of data section
+ * @return pointer to tcb_t structure
+ *
+ */
+tcb_t * __alloc_tls(void **data, size_t size)
+{
+    tcb_t *tcb;
+    *data = malloc(sizeof(tcb_t) + size);
+    tcb = (tcb_t *) (*data + size);
+    return tcb;
+}
+void __free_tls_arch(tcb_t *tcb, size_t size)
+{
+    void *start = ((void *) tcb) - size;
+    free(start);
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/src/fibril.S
 ,0 → 1,110
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+.text
+.global context_save
+.global context_restore
+#include <libarch/regname.h>
+#include <libarch/context_offset.h>
+.macro CONTEXT_STORE r
+    stw sp, OFFSET_SP(\r)
+    stw r2, OFFSET_R2(\r)
+    stw r13, OFFSET_R13(\r)
+    stw r14, OFFSET_R14(\r)
+    stw r15, OFFSET_R15(\r)
+    stw r16, OFFSET_R16(\r)
+    stw r17, OFFSET_R17(\r)
+    stw r18, OFFSET_R18(\r)
+    stw r19, OFFSET_R19(\r)
+    stw r20, OFFSET_R20(\r)
+    stw r21, OFFSET_R21(\r)
+    stw r22, OFFSET_R22(\r)
+    stw r23, OFFSET_R23(\r)
+    stw r24, OFFSET_R24(\r)
+    stw r25, OFFSET_R25(\r)
+    stw r26, OFFSET_R26(\r)
+    stw r27, OFFSET_R27(\r)
+    stw r28, OFFSET_R28(\r)
+    stw r29, OFFSET_R29(\r)
+    stw r30, OFFSET_R30(\r)
+    stw r31, OFFSET_R31(\r)
+.endm
+.macro CONTEXT_LOAD r
+    lwz sp, OFFSET_SP(\r)
+    lwz r2, OFFSET_R2(\r)
+    lwz r13, OFFSET_R13(\r)
+    lwz r14, OFFSET_R14(\r)
+    lwz r15, OFFSET_R15(\r)
+    lwz r16, OFFSET_R16(\r)
+    lwz r17, OFFSET_R17(\r)
+    lwz r18, OFFSET_R18(\r)
+    lwz r19, OFFSET_R19(\r)
+    lwz r20, OFFSET_R20(\r)
+    lwz r21, OFFSET_R21(\r)
+    lwz r22, OFFSET_R22(\r)
+    lwz r23, OFFSET_R23(\r)
+    lwz r24, OFFSET_R24(\r)
+    lwz r25, OFFSET_R25(\r)
+    lwz r26, OFFSET_R26(\r)
+    lwz r27, OFFSET_R27(\r)
+    lwz r28, OFFSET_R28(\r)
+    lwz r29, OFFSET_R29(\r)
+    lwz r30, OFFSET_R30(\r)
+    lwz r31, OFFSET_R31(\r)
+.endm
+context_save:
+    CONTEXT_STORE r3
+    mflr r4
+    stw r4, OFFSET_PC(r3)
+    mfcr r4
+    stw r4, OFFSET_CR(r3)
+    # context_save returns 1
+    li r3, 1
+    blr
+context_restore:
+    CONTEXT_LOAD r3
+    lwz r4, OFFSET_CR(r3)
+    mtcr r4
+    lwz r4, OFFSET_PC(r3)
+    mtlr r4
+    # context_restore returns 0
+    li r3, 0
+    blr

 /trunk/uspace/lib/libc/arch/ppc64/src/entry.s
 ,0 → 1,48
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+.section .init, "ax"
+.org 0
+.globl __entry
+.globl __entry_driver
+## User-space task entry point
+#
+#
+__entry:
+    bl __main
+    bl __io_init
+    bl main
+    bl __exit
+__entry_driver:
+    bl __main
+    bl main
+    bl __exit

 /trunk/uspace/lib/libc/arch/ppc64/src/thread_entry.s
 ,0 → 1,39
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+.text
+.globl __thread_entry
+## User-space thread entry point for all but the first threads.
+#
+#
+__thread_entry:
+    b __thread_main
+.end __thread_entry

 /trunk/uspace/lib/libc/arch/ppc64/src/syscall.c
 ,0 → 1,61
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64 ppc64
+ * @brief ppc64 architecture dependent parts of libc
+ * @ingroup lc
+ * @{
+ */
+/** @file
+ */
+#include <libc.h>
+sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, const sysarg_t p4, const syscall_t id)
+{
+    register sysarg_t __ppc32_reg_r3 asm("3") = p1;
+    register sysarg_t __ppc32_reg_r4 asm("4") = p2;
+    register sysarg_t __ppc32_reg_r5 asm("5") = p3;
+    register sysarg_t __ppc32_reg_r6 asm("6") = p4;
+    register sysarg_t __ppc32_reg_r7 asm("7") = id;
+    asm volatile (
+        "sc\n"
+        : "=r" (__ppc32_reg_r3)
+        : "r" (__ppc32_reg_r3),
+          "r" (__ppc32_reg_r4),
+          "r" (__ppc32_reg_r5),
+          "r" (__ppc32_reg_r6),
+          "r" (__ppc32_reg_r7)
+    );
+    return __ppc32_reg_r3;
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/tls.h
 ,0 → 1,73
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TLS_H_
+#define LIBC_ppc64_TLS_H_
+#define CONFIG_TLS_VARIANT_1
+#define PPC_TP_OFFSET 0x7000
+typedef struct {
+    void *fibril_data;
+} tcb_t;
+static inline void __tcb_set(tcb_t *tcb)
+{
+    void *tp = tcb;
+    tp += PPC_TP_OFFSET + sizeof(tcb_t);
+    asm volatile (
+        "mr %%r2, %0\n"
+        :
+        : "r" (tp)
+    );
+}
+static inline tcb_t * __tcb_get(void)
+{
+    void * retval;
+    asm volatile (
+        "mr %0, %%r2\n"
+        : "=r" (retval)
+    );
+    return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t));
+}
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/thread.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_THREAD_H_
+#define LIBC_ppc64_THREAD_H_
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/types.h
 ,0 → 1,55
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TYPES_H_
+#define LIBC_ppc64_TYPES_H_
+typedef unsigned long sysarg_t;
+typedef char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+typedef long int int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long int uint64_t;
+typedef uint64_t uintptr_t;
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/fibril.h
 ,0 → 1,83
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FIBRIL_H_
+#define LIBC_ppc64_FIBRIL_H_
+#include <sys/types.h>
+/* We define our own context_set, because we need to set
+ * the TLS pointer to the tcb+0x7000
+ *
+ * See tls_set in thread.h
+ */
+#define context_set(c, _pc, stack, size, ptls)          \
+    (c)->pc = (sysarg_t) (_pc);             \
+    (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
+    (c)->tls = ((sysarg_t) (ptls)) + 0x7000 + sizeof(tcb_t);
+#define SP_DELTA    16
+typedef struct {
+    uint64_t sp;
+    uint64_t pc;
+    uint64_t tls;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t r28;
+    uint64_t r29;
+    uint64_t r30;
+    uint64_t r31;
+    uint64_t cr;
+} __attribute__ ((packed)) context_t;
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/atomic.h
 ,0 → 1,95
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_ATOMIC_H_
+#define LIBC_ppc64_ATOMIC_H_
+static inline void atomic_inc(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, 1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline void atomic_dec(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, -1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count - 1;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count + 1;
+}
+static inline long atomic_preinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count;
+}
+static inline long atomic_predec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count;
+}
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/syscall.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/**
+ * @file
+ */
+#ifndef LIBC_ppc64_SYSCALL_H_
+#define LIBC_ppc64_SYSCALL_H_
+#include <syscall.h>
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_ENDIAN_H_
+#define LIBC_ppc64_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __BIG_ENDIAN
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/regname.h
 ,0 → 1,188
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_REGNAME_H_
+#define LIBC_ppc64_REGNAME_H_
+/* Condition Register Bit Fields */
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+/* General Purpose Registers (GPRs) */
+#define r0  0
+#define r1  1
+#define r2  2
+#define r3  3
+#define r4  4
+#define r5  5
+#define r6  6
+#define r7  7
+#define r8  8
+#define r9  9
+#define r10 10
+#define r11 11
+#define r12 12
+#define r13 13
+#define r14 14
+#define r15 15
+#define r16 16
+#define r17 17
+#define r18 18
+#define r19 19
+#define r20 20
+#define r21 21
+#define r22 22
+#define r23 23
+#define r24 24
+#define r25 25
+#define r26 26
+#define r27 27
+#define r28 28
+#define r29 29
+#define r30 30
+#define r31 31
+/* GPR Aliases */
+#define sp  1
+/* Floating Point Registers (FPRs) */
+#define fr0     0
+#define fr1     1
+#define fr2     2
+#define fr3     3
+#define fr4     4
+#define fr5     5
+#define fr6     6
+#define fr7     7
+#define fr8     8
+#define fr9     9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/stackarg.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_STACKARG_H_
+#define LIBC_STACKARG_H_
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/faddr.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FADDR_H_
+#define LIBC_ppc64_FADDR_H_
+#include <libarch/types.h>
+#define FADDR(fptr)     ((uintptr_t) (fptr))
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/limits.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_LIMITS_H_
+#define LIBC_ppc64_LIMITS_H_
+#define LONG_MIN MIN_INT64
+#define LONG_MAX MAX_INT64
+#define ULONG_MIN MIN_UINT64
+#define ULONG_MAX MAX_UINT64
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/config.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_CONFIG_H_
+#define LIBC_ppc64_CONFIG_H_
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1<<PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0        /* dummy */
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/arch/ppc64/include/context_offset.h
 ,0 → 1,24
+/* struct context */
+#define OFFSET_SP    0x0
+#define OFFSET_PC    0x4
+#define OFFSET_R2    0x8
+#define OFFSET_R13   0xc
+#define OFFSET_R14   0x10
+#define OFFSET_R15   0x14
+#define OFFSET_R16   0x18
+#define OFFSET_R17   0x1c
+#define OFFSET_R18   0x20
+#define OFFSET_R19   0x24
+#define OFFSET_R20   0x28
+#define OFFSET_R21   0x2c
+#define OFFSET_R22   0x30
+#define OFFSET_R23   0x34
+#define OFFSET_R24   0x38
+#define OFFSET_R25   0x3c
+#define OFFSET_R26   0x40
+#define OFFSET_R27   0x44
+#define OFFSET_R28   0x48
+#define OFFSET_R29   0x4c
+#define OFFSET_R30   0x50
+#define OFFSET_R31   0x54
+#define OFFSET_CR    0x58

 /trunk/uspace/lib/libc/arch/ppc64/Makefile.inc
 ,0 → 1,44
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Toolchain configuration
+#
+TARGET = ppc64-linux-gnu
+TOOLCHAIN_DIR = /usr/local/ppc64/bin
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
+CFLAGS += -mcpu=powerpc64 -msoft-float -m64
+AFLAGS += -a64
+LFLAGS += -N
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64

 /trunk/uspace/lib/libc/arch/ppc64/_link.ld.in
 ,0 → 1,50
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+ENTRY(__entry)
+PHDRS {
+    text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    . = 0x1000;
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.toc);
+        *(.rodata*);
+    } :text
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.opd);
+        *(.data*);
+        *(.sdata);
+    } :data
+    .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    .bss : {
+        *(.sbss);
+        *(COMMON);
+        *(.bss);
+    } :data
+    . = ALIGN(0x1000);
+    _heap = .;
+    /DISCARD/ : {
+        *(*);
+    }
+}

/trunk/uspace/lib/libc/arch/mips32eb/include/ddi.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

 /trunk/uspace/lib/libc/arch/mips32eb/include/endian.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcmips32eb mipseb32
+  * @brief mipseb32 architecture dependent parts of libc
+  * @ingroup lc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_mips32eb_ENDIAN_H_
+#define LIBC_mips32eb_ENDIAN_H_
+#ifndef LIBC_ENDIAN_H_
+# error "Never use <libarch/endian.h> directly - use <endian.h> instead."
+#endif
+#define __BYTE_ORDER __BIG_ENDIAN
+#endif
+/** @}
+ */

/trunk/uspace/lib/libc/arch/mips32eb/include/context_offset.h
0,0 → 1,0
link ../../mips32/include/context_offset.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /trunk/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,17 → 29,15
 ## Toolchain configuration
 #
-TARGET = mips-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
+TARGET = mips-sgi-irix5
+TOOLCHAIN_DIR = /usr/local/mips/bin
+CFLAGS += -mips3
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-        arch/$(UARCH)/src/fibril.S \
-        arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
-CFLAGS += -mips3
 LFLAGS += -N
-ENDIANESS = BE
 BFD_ARCH = mips
-BFD_NAME = elf32-tradbigmips
+BFD_NAME = elf32-big

 /trunk/uspace/lib/libc/generic/vfs.c
 ,0 → 1,322
+/*
+ * Copyright (c) 2008 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <vfs.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <async.h>
+#include <atomic.h>
+#include <futex.h>
+#include <errno.h>
+#include <string.h>
+#include "../../srv/vfs/vfs.h"
+int vfs_phone = -1;
+atomic_t vfs_phone_futex = FUTEX_INITIALIZER;
+static int vfs_connect(void)
+{
+    if (vfs_phone < 0)
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    return vfs_phone;
+}
+int mount(const char *fs_name, const char *mp, const char *dev)
+{
+    int res;
+    ipcarg_t rc;
+    aid_t req;
+    int dev_handle = 0; /* TODO */
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
+    rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (int) rc;
+    }
+    rc = ipc_data_write_start(vfs_phone, (void *)mp, strlen(mp));
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (int) rc;
+    }
+    async_wait_for(req, &rc);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    return (int) rc;
+}
+static int _open(const char *path, int lflag, int oflag, ...)
+{
+    int res;
+    ipcarg_t rc;
+    ipc_call_t answer;
+    aid_t req;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
+    rc = ipc_data_write_start(vfs_phone, path, strlen(path));
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (int) rc;
+    }
+    async_wait_for(req, &rc);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    return (int) IPC_GET_ARG1(answer);
+}
+int open(const char *path, int oflag, ...)
+{
+    return _open(path, L_FILE, oflag);
+}
+int close(int fildes)
+{
+    return 0;   /* TODO */
+}
+ssize_t read(int fildes, void *buf, size_t nbyte)
+{
+    int res;
+    ipcarg_t rc;
+    ipc_call_t answer;
+    aid_t req;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
+    if (ipc_data_read_start(vfs_phone, (void *)buf, nbyte) != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (ssize_t) rc;
+    }
+    async_wait_for(req, &rc);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    if (rc == EOK)
+        return (ssize_t) IPC_GET_ARG1(answer);
+    else
+        return -1;
+}
+ssize_t write(int fildes, const void *buf, size_t nbyte)
+{
+    int res;
+    ipcarg_t rc;
+    ipc_call_t answer;
+    aid_t req;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
+    if (ipc_data_write_start(vfs_phone, (void *)buf, nbyte) != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (ssize_t) rc;
+    }
+    async_wait_for(req, &rc);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    if (rc == EOK)
+        return (ssize_t) IPC_GET_ARG1(answer);
+    else
+        return -1;
+}
+off_t lseek(int fildes, off_t offset, int whence)
+{
+    int res;
+    ipcarg_t rc;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    off_t newoffs;
+    rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
+        (ipcarg_t)&newoffs);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    if (rc != EOK)
+        return (off_t) -1;
+    return newoffs;
+}
+int ftruncate(int fildes, off_t length)
+{
+    int res;
+    ipcarg_t rc;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    return (int) rc;
+}
+DIR *opendir(const char *dirname)
+{
+    DIR *dirp = malloc(sizeof(DIR));
+    if (!dirp)
+        return NULL;
+    dirp->fd = _open(dirname, L_DIRECTORY, 0);
+    if (dirp->fd < 0) {
+        free(dirp);
+        return NULL;
+    }
+    return dirp;
+}
+struct dirent *readdir(DIR *dirp)
+{
+    ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1);
+    if (len <= 0)
+        return NULL;
+    return &dirp->res;
+}
+void rewinddir(DIR *dirp)
+{
+    (void) lseek(dirp->fd, 0, SEEK_SET);
+}
+int closedir(DIR *dirp)
+{
+    (void) close(dirp->fd);
+    free(dirp);
+    return 0;
+}
+int mkdir(const char *path, mode_t mode)
+{
+    int res;
+    ipcarg_t rc;
+    ipc_call_t answer;
+    aid_t req;
+    futex_down(&vfs_phone_futex);
+    async_serialize_start();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    req = async_send_1(vfs_phone, VFS_MKDIR, mode, &answer);
+    rc = ipc_data_write_start(vfs_phone, path, strlen(path));
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (int) rc;
+    }
+    async_wait_for(req, &rc);
+    async_serialize_end();
+    futex_up(&vfs_phone_futex);
+    return EOK;
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/time.c
 ,8 → 47,6
 #include <as.h>
 #include <ddi.h>
-#include <time.h>
 /* Pointers to public variables with time */
 struct {
     volatile sysarg_t seconds1;

 /trunk/uspace/lib/libc/generic/ipc.c
 ,7 → 43,7
 #include <libc.h>
 #include <malloc.h>
 #include <errno.h>
-#include <adt/list.h>
+#include <libadt/list.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <futex.h>
 ,7 → 232,7
         return;
     }
-    if (callid == (ipc_callid_t) IPC_CALLRET_FATAL) {
+    if (callid == IPC_CALLRET_FATAL) {
         futex_up(&ipc_futex);
         /* Call asynchronous handler with error code */
         if (call->callback)
 ,7 → 241,7
         return;
     }
-    if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
+    if (callid == IPC_CALLRET_TEMPORARY) {
         futex_up(&ipc_futex);
         call->u.msg.phoneid = phoneid;
 ,7 → 309,7
     callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid, method, arg1,
         arg2, arg3, arg4);
-    if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
+    if (callid == IPC_CALLRET_TEMPORARY) {
         if (!call) {
             call = ipc_prepare_async(private, callback);
             if (!call)
 ,7 → 442,7
         call = list_get_instance(queued_calls.next, async_call_t, list);
         callid = _ipc_call_async(call->u.msg.phoneid,
             &call->u.msg.data);
-        if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
+        if (callid == IPC_CALLRET_TEMPORARY) {
             break;
         }
         list_remove(&call->list);
 ,7 → 451,7
         if (call->fid)
             fibril_add_ready(call->fid);
-        if (callid == (ipc_callid_t) IPC_CALLRET_FATAL) {
+        if (callid == IPC_CALLRET_FATAL) {
             if (call->callback)
                 call->callback(call->private, ENOENT, NULL);
             free(call);
 ,7 → 598,7
     ipcarg_t newphid;
     int res;
-    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
+    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
         NULL, NULL, NULL, NULL, &newphid);
     if (res)
         return res;
 ,30 → 605,6
     return newphid;
 }
-/** Ask through phone for a new connection to some service.
- *
- * If the connection is not available at the moment, the
- * call will block.
- *
- * @param phoneid   Phone handle used for contacting the other side.
- * @param arg1      User defined argument.
- * @param arg2      User defined argument.
- * @param arg3      User defined argument.
- *
- * @return      New phone handle on success or a negative error code.
- */
-int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3)
-{
-    ipcarg_t newphid;
-    int res;
-    res = ipc_call_sync_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
-        IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
-    if (res)
-        return res;
-    return newphid;
-}
 /** Hang up a phone.
  *
  * @param phoneid   Handle of the phone to be hung up.
 ,23 → 666,6
         arg2, mode);
 }
-int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
-    int mode)
-{
-    ipc_call_t data;
-    IPC_SET_METHOD(data, method);
-    IPC_SET_ARG1(data, arg1);
-    IPC_SET_ARG2(data, arg2);
-    IPC_SET_ARG3(data, arg3);
-    IPC_SET_ARG4(data, arg4);
-    IPC_SET_ARG5(data, arg5);
-    return __SYSCALL4(SYS_IPC_FORWARD_SLOW, callid, phoneid, (sysarg_t) &data, mode);
-}
 /** Wrapper for making IPC_M_SHARE_IN calls.
  *
  * @param phoneid   Phone that will be used to contact the receiving side.
 ,7 → 682,7
 {
     int res;
     sysarg_t tmp_flags;
-    res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
+    res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
         (ipcarg_t) size, arg, NULL, &tmp_flags);
     if (flags)
         *flags = tmp_flags;
 ,7 → 742,7
  */
 int ipc_share_out_start(int phoneid, void *src, int flags)
 {
-    return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
+    return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
         (ipcarg_t) flags);
 }
 ,7 → 770,7
     assert(flags);
     *callid = async_get_call(&data);
-    if (IPC_GET_METHOD(data) != IPC_M_SHARE_OUT)
+    if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
         return 0;
     *size = (size_t) IPC_GET_ARG2(data);
     *flags = (int) IPC_GET_ARG3(data);
 ,7 → 803,7
  */
 int ipc_data_read_start(int phoneid, void *dst, size_t size)
 {
-    return async_req_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
+    return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
         (ipcarg_t) size);
 }
 ,7 → 847,7
  *
  * @return      Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
+int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size)
 {
     return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
 }
 ,9 → 860,9
  *
  * @return      Zero on success or a negative error code from errno.h.
  */
-int ipc_data_write_start(int phoneid, const void *src, size_t size)
+int ipc_data_write_start(int phoneid, void *src, size_t size)
 {
-    return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
+    return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
         (ipcarg_t) size);
 }
 ,18 → 909,6
 {
     return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
 }
-#include <kernel/syscall/sysarg64.h>
-/** Connect to a task specified by id.
- */
-int ipc_connect_kbox(task_id_t id)
-{
-    sysarg64_t arg;
-    arg.value = (unsigned long long) id;
-    return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/libc.c
 ,32 → 27,29
  */
 /** @addtogroup lc Libc
- * @brief HelenOS C library
+ * @brief   HelenOS C library
  * @{
  * @}
  */
 /** @addtogroup libc generic
  * @ingroup lc
  * @{
  */
 /** @file
- */
+ */
 #include <libc.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <malloc.h>
 #include <tls.h>
 #include <thread.h>
 #include <fibril.h>
+#include <io/stream.h>
 #include <ipc/ipc.h>
 #include <async.h>
 #include <as.h>
-#include <loader/pcb.h>
-extern int main(int argc, char *argv[]);
+extern char _heap;
 void _exit(int status)
 {
 ,35 → 56,20
     thread_exit(status);
 }
-void __main(void *pcb_ptr)
+void __main(void)
 {
-    int retval;
+    fibril_t *f;
-    __heap_init();
-    __async_init();
-    fibril_t *fibril = fibril_setup();
-    __tcb_set(fibril->tcb);
-    /* Save the PCB pointer */
-    __pcb = (pcb_t *) pcb_ptr;
-    int argc;
-    char **argv;
-    if (__pcb == NULL) {
-        argc = 0;
-        argv = NULL;
-        __stdio_init(0, NULL);
-    } else {
-        argc = __pcb->argc;
-        argv = __pcb->argv;
-        __stdio_init(__pcb->filc, __pcb->filv);
-    }
-    retval = main(argc, argv);
+    (void) as_area_create(&_heap, 1, AS_AREA_WRITE | AS_AREA_READ);
+    _async_init();
+    f = fibril_setup();
+    __tcb_set(f->tcb);
+}
-    __stdio_done();
-    (void) task_retval(retval);
+void __io_init(void)
+{
+    open_stdin();
+    open_stdout();
 }
 void __exit(void)

 /trunk/uspace/lib/libc/generic/io/io.c
 ,564 → 30,78
  * @{
  */
 /** @file
- */
+ */
+#include <libc.h>
+#include <unistd.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
-#include <bool.h>
-#include <malloc.h>
-#include <io/klog.h>
-#include <vfs/vfs.h>
-#include <ipc/devmap.h>
-#include <adt/list.h>
+#include <io/io.h>
-static void _fflushbuf(FILE *stream);
+const static char nl = '\n';
-static FILE stdin_null = {
-    .fd = -1,
-    .error = true,
-    .eof = true,
-    .klog = false,
-    .phone = -1,
-    .btype = _IONBF,
-    .buf = NULL,
-    .buf_size = 0,
-    .buf_head = NULL
-};
-static FILE stdout_klog = {
-    .fd = -1,
-    .error = false,
-    .eof = false,
-    .klog = true,
-    .phone = -1,
-    .btype = _IOLBF,
-    .buf = NULL,
-    .buf_size = BUFSIZ,
-    .buf_head = NULL
-};
-static FILE stderr_klog = {
-    .fd = -1,
-    .error = false,
-    .eof = false,
-    .klog = true,
-    .phone = -1,
-    .btype = _IONBF,
-    .buf = NULL,
-    .buf_size = 0,
-    .buf_head = NULL
-};
-FILE *stdin = NULL;
-FILE *stdout = NULL;
-FILE *stderr = NULL;
-static LIST_INITIALIZE(files);
-void __stdio_init(int filc, fdi_node_t *filv[])
+int puts(const char *str)
 {
-    if (filc > 0) {
-        stdin = fopen_node(filv[0], "r");
-    } else {
-        stdin = &stdin_null;
-        list_append(&stdin->link, &files);
-    }
+    size_t count;
-    if (filc > 1) {
-        stdout = fopen_node(filv[1], "w");
-    } else {
-        stdout = &stdout_klog;
-        list_append(&stdout->link, &files);
-    }
+    if (str == NULL)
+        return putnchars("(NULL)", 6);
-    if (filc > 2) {
-        stderr = fopen_node(filv[2], "w");
-    } else {
-        stderr = &stderr_klog;
-        list_append(&stderr->link, &files);
+    for (count = 0; str[count] != 0; count++);
+    if (write_stdout((void *) str, count) == count) {
+        if (write_stdout(&nl, 1) == 1)
+            return 0;
     }
-}
-void __stdio_done(void)
-{
-    link_t *link = files.next;
-    while (link != &files) {
-        FILE *file = list_get_instance(link, FILE, link);
-        fclose(file);
-        link = files.next;
-    }
+    return EOF;
 }
-static bool parse_mode(const char *mode, int *flags)
-{
-    /* Parse mode except first character. */
-    const char *mp = mode;
-    if (*mp++ == 0) {
-        errno = EINVAL;
-        return false;
-    }
-    if ((*mp == 'b') || (*mp == 't'))
-        mp++;
-    bool plus;
-    if (*mp == '+') {
-        mp++;
-        plus = true;
-    } else
-        plus = false;
-    if (*mp != 0) {
-        errno = EINVAL;
-        return false;
-    }
-    /* Parse first character of mode and determine flags for open(). */
-    switch (mode[0]) {
-    case 'r':
-        *flags = plus ? O_RDWR : O_RDONLY;
-        break;
-    case 'w':
-        *flags = (O_TRUNC | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
-        break;
-    case 'a':
-        /* TODO: a+ must read from beginning, append to the end. */
-        if (plus) {
-            errno = ENOTSUP;
-            return false;
-        }
-        *flags = (O_APPEND | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
-    default:
-        errno = EINVAL;
-        return false;
-    }
-    return true;
-}
-/** Set stream buffer. */
-void setvbuf(FILE *stream, void *buf, int mode, size_t size)
-{
-    stream->btype = mode;
-    stream->buf = buf;
-    stream->buf_size = size;
-    stream->buf_head = stream->buf;
-}
-static void _setvbuf(FILE *stream)
-{
-    /* FIXME: Use more complex rules for setting buffering options. */
-    switch (stream->fd) {
-    case 1:
-        setvbuf(stream, NULL, _IOLBF, BUFSIZ);
-        break;
-    case 0:
-    case 2:
-        setvbuf(stream, NULL, _IONBF, 0);
-        break;
-    default:
-        setvbuf(stream, NULL, _IOFBF, BUFSIZ);
-    }
-}
-/** Allocate stream buffer. */
-static int _fallocbuf(FILE *stream)
-{
-    assert(stream->buf == NULL);
-    stream->buf = malloc(stream->buf_size);
-    if (stream->buf == NULL) {
-        errno = ENOMEM;
-        return -1;
-    }
-    stream->buf_head = stream->buf;
-    return 0;
-}
-/** Open a stream.
- *
- * @param path Path of the file to open.
- * @param mode Mode string, (r|w|a)[b|t][+].
- *
+/** Put count chars from buffer to stdout without adding newline
+ * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed!
+ * @param count
+ * @return 0 on succes, EOF on fail
  */
-FILE *fopen(const char *path, const char *mode)
+int putnchars(const char *buf, size_t count)
 {
-    int flags;
-    if (!parse_mode(mode, &flags))
-        return NULL;
+    if (write_stdout((void *) buf, count) == count)
+        return 0;
-    /* Open file. */
-    FILE *stream = malloc(sizeof(FILE));
-    if (stream == NULL) {
-        errno = ENOMEM;
-        return NULL;
-    }
-    stream->fd = open(path, flags, 0666);
-    if (stream->fd < 0) {
-        /* errno was set by open() */
-        free(stream);
-        return NULL;
-    }
-    stream->error = false;
-    stream->eof = false;
-    stream->klog = false;
-    stream->phone = -1;
-    _setvbuf(stream);
-    list_append(&stream->link, &files);
-    return stream;
+    return EOF;
 }
-FILE *fdopen(int fd, const char *mode)
-{
-    /* Open file. */
-    FILE *stream = malloc(sizeof(FILE));
-    if (stream == NULL) {
-        errno = ENOMEM;
-        return NULL;
-    }
-    stream->fd = fd;
-    stream->error = false;
-    stream->eof = false;
-    stream->klog = false;
-    stream->phone = -1;
-    _setvbuf(stream);
-    list_append(&stream->link, &files);
-    return stream;
-}
-FILE *fopen_node(fdi_node_t *node, const char *mode)
-{
-    int flags;
-    if (!parse_mode(mode, &flags))
-        return NULL;
-    /* Open file. */
-    FILE *stream = malloc(sizeof(FILE));
-    if (stream == NULL) {
-        errno = ENOMEM;
-        return NULL;
-    }
-    stream->fd = open_node(node, flags);
-    if (stream->fd < 0) {
-        /* errno was set by open_node() */
-        free(stream);
-        return NULL;
-    }
-    stream->error = false;
-    stream->eof = false;
-    stream->klog = false;
-    stream->phone = -1;
-    _setvbuf(stream);
-    list_append(&stream->link, &files);
-    return stream;
-}
-int fclose(FILE *stream)
-{
-    int rc = 0;
-    fflush(stream);
-    if (stream->phone >= 0)
-        ipc_hangup(stream->phone);
-    if (stream->fd >= 0)
-        rc = close(stream->fd);
-    list_remove(&stream->link);
-    if ((stream != &stdin_null)
-        && (stream != &stdout_klog)
-        && (stream != &stderr_klog))
-        free(stream);
-    stream = NULL;
-    if (rc != 0) {
-        /* errno was set by close() */
-        return EOF;
-    }
-    return 0;
-}
-/** Read from a stream.
+/** Same as puts, but does not print newline at end
  *
- * @param buf    Destination buffer.
- * @param size   Size of each record.
- * @param nmemb  Number of records to read.
- * @param stream Pointer to the stream.
- *
  */
-size_t fread(void *buf, size_t size, size_t nmemb, FILE *stream)
+int putstr(const char *str)
 {
-    size_t left = size * nmemb;
-    size_t done = 0;
+    size_t count;
-    /* Make sure no data is pending write. */
-    _fflushbuf(stream);
-    while ((left > 0) && (!stream->error) && (!stream->eof)) {
-        ssize_t rd = read(stream->fd, buf + done, left);
-        if (rd < 0)
-            stream->error = true;
-        else if (rd == 0)
-            stream->eof = true;
-        else {
-            left -= rd;
-            done += rd;
-        }
-    }
-    return (done / size);
-}
+    if (str == NULL)
+        return putnchars("(NULL)", 6);
-static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
-{
-    size_t left = size * nmemb;
-    size_t done = 0;
+    for (count = 0; str[count] != 0; count++);
+    if (write_stdout((void *) str, count) == count)
+        return 0;
-    while ((left > 0) && (!stream->error)) {
-        ssize_t wr;
-        if (stream->klog)
-            wr = klog_write(buf + done, left);
-        else
-            wr = write(stream->fd, buf + done, left);
-        if (wr <= 0)
-            stream->error = true;
-        else {
-            left -= wr;
-            done += wr;
-        }
-    }
-    return (done / size);
+    return EOF;
 }
-/** Drain stream buffer, do not sync stream. */
-static void _fflushbuf(FILE *stream)
+int putchar(int c)
 {
-    size_t bytes_used;
+    unsigned char ch = c;
+    if (write_stdout((void *) &ch, 1) == 1)
+        return c;
-    if ((!stream->buf) || (stream->btype == _IONBF) || (stream->error))
-        return;
-    bytes_used = stream->buf_head - stream->buf;
-    if (bytes_used == 0)
-        return;
-    (void) _fwrite(stream->buf, 1, bytes_used, stream);
-    stream->buf_head = stream->buf;
-}
-/** Write to a stream.
- *
- * @param buf    Source buffer.
- * @param size   Size of each record.
- * @param nmemb  Number of records to write.
- * @param stream Pointer to the stream.
- *
- */
-size_t fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
-{
-    uint8_t *data;
-    size_t bytes_left;
-    size_t now;
-    size_t buf_free;
-    size_t total_written;
-    size_t i;
-    uint8_t b;
-    bool need_flush;
-    /* If not buffered stream, write out directly. */
-    if (stream->btype == _IONBF) {
-        now = _fwrite(buf, size, nmemb, stream);
-        fflush(stream);
-        return now;
-    }
-    /* Perform lazy allocation of stream buffer. */
-    if (stream->buf == NULL) {
-        if (_fallocbuf(stream) != 0)
-            return 0; /* Errno set by _fallocbuf(). */
-    }
-    data = (uint8_t *) buf;
-    bytes_left = size * nmemb;
-    total_written = 0;
-    need_flush = false;
-    while ((!stream->error) && (bytes_left > 0)) {
-        buf_free = stream->buf_size - (stream->buf_head - stream->buf);
-        if (bytes_left > buf_free)
-            now = buf_free;
-        else
-            now = bytes_left;
-        for (i = 0; i < now; i++) {
-            b = data[i];
-            stream->buf_head[i] = b;
-            if ((b == '\n') && (stream->btype == _IOLBF))
-                need_flush = true;
-        }
-        buf += now;
-        stream->buf_head += now;
-        buf_free -= now;
-        bytes_left -= now;
-        total_written += now;
-        if (buf_free == 0) {
-            /* Only need to drain buffer. */
-            _fflushbuf(stream);
-            need_flush = false;
-        }
-    }
-    if (need_flush)
-        fflush(stream);
-    return (total_written / size);
-}
-int fputc(wchar_t c, FILE *stream)
-{
-    char buf[STR_BOUNDS(1)];
-    size_t sz = 0;
-    if (chr_encode(c, buf, &sz, STR_BOUNDS(1)) == EOK) {
-        size_t wr = fwrite(buf, sz, 1, stream);
-        if (wr < sz)
-            return EOF;
-        return (int) c;
-    }
     return EOF;
 }
-int putchar(wchar_t c)
-{
-    return fputc(c, stdout);
-}
-int fputs(const char *str, FILE *stream)
-{
-    return fwrite(str, str_size(str), 1, stream);
-}
-int puts(const char *str)
-{
-    return fputs(str, stdout);
-}
-int fgetc(FILE *stream)
-{
-    char c;
-    /* This could be made faster by only flushing when needed. */
-    if (stdout)
-        fflush(stdout);
-    if (stderr)
-        fflush(stderr);
-    if (fread(&c, sizeof(char), 1, stream) < sizeof(char))
-        return EOF;
-    return (int) c;
-}
 int getchar(void)
 {
-    return fgetc(stdin);
-}
-int fseek(FILE *stream, long offset, int origin)
-{
-    off_t rc = lseek(stream->fd, offset, origin);
-    if (rc == (off_t) (-1)) {
-        /* errno has been set by lseek. */
-        return -1;
-    }
+    unsigned char c;
+    if (read_stdin((void *) &c, 1) == 1)
+        return c;
-    stream->eof = false;
-    return 0;
+    return EOF;
 }
-void rewind(FILE *stream)
-{
-    (void) fseek(stream, 0, SEEK_SET);
-}
-int fflush(FILE *stream)
-{
-    _fflushbuf(stream);
-    if (stream->klog) {
-        klog_update();
-        return EOK;
-    }
-    if (stream->fd >= 0)
-        return fsync(stream->fd);
-    return ENOENT;
-}
-int feof(FILE *stream)
-{
-    return stream->eof;
-}
-int ferror(FILE *stream)
-{
-    return stream->error;
-}
-int fphone(FILE *stream)
-{
-    if (stream->fd >= 0) {
-        if (stream->phone < 0)
-            stream->phone = fd_phone(stream->fd);
-        return stream->phone;
-    }
-    return -1;
-}
-int fnode(FILE *stream, fdi_node_t *node)
-{
-    if (stream->fd >= 0)
-        return fd_node(stream->fd, node);
-    return ENOENT;
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/io/vprintf.c
 ,81 → 38,39
 #include <io/printf_core.h>
 #include <futex.h>
 #include <async.h>
-#include <string.h>
 static atomic_t printf_futex = FUTEX_INITIALIZER;
-static int vprintf_str_write(const char *str, size_t size, void *stream)
+static int vprintf_write(const char *str, size_t count, void *unused)
 {
-    size_t wr = fwrite(str, 1, size, (FILE *) stream);
-    return str_nlength(str, wr);
+    return write_stdout(str, count);
 }
-static int vprintf_wstr_write(const wchar_t *str, size_t size, void *stream)
-{
-    size_t offset = 0;
-    size_t chars = 0;
-    while (offset < size) {
-        if (fputc(str[chars], (FILE *) stream) <= 0)
-            break;
-        chars++;
-        offset += sizeof(wchar_t);
-    }
-    return chars;
-}
 /** Print formatted text.
- *
- * @param stream Output stream
- * @param fmt    Format string
- * @param ap     Format parameters
- *
+ * @param fmt   format string
+ * @param ap    format parameters
  * \see For more details about format string see printf_core.
- *
  */
-int vfprintf(FILE *stream, const char *fmt, va_list ap)
+int vprintf(const char *fmt, va_list ap)
 {
     struct printf_spec ps = {
-        vprintf_str_write,
-        vprintf_wstr_write,
-        stream
+        (int (*)(void *, size_t, void *)) vprintf_write,
+         NULL
     };
     /*
      * Prevent other threads to execute printf_core()
      */
     futex_down(&printf_futex);
     /*
-     * Prevent other fibrils of the same thread
+     * Prevent other pseudo threads of the same thread
      * to execute printf_core()
      */
     async_serialize_start();
     int ret = printf_core(fmt, &ps, ap);
     async_serialize_end();
     futex_up(&printf_futex);
     return ret;
 }
-/** Print formatted text to stdout.
- *
- * @param file Output stream
- * @param fmt  Format string
- * @param ap   Format parameters
- *
- * \see For more details about format string see printf_core.
- *
- */
-int vprintf(const char *fmt, va_list ap)
-{
-    return vfprintf(stdout, fmt, ap);
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/io/stream.c
 ,0 → 1,109
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2006 Jakub Vana
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <io/io.h>
+#include <io/stream.h>
+#include <string.h>
+#include <malloc.h>
+#include <libc.h>
+#include <ipc/ipc.h>
+#include <ipc/ns.h>
+#include <ipc/fb.h>
+#include <ipc/services.h>
+#include <console.h>
+#include <unistd.h>
+#include <async.h>
+#include <sys/types.h>
+static int console_phone = -1;
+ssize_t write_stderr(const void *buf, size_t count)
+{
+    return count;
+}
+ssize_t read_stdin(void *buf, size_t count)
+{
+    ipcarg_t r0, r1;
+    size_t i = 0;
+    while (i < count) {
+        if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0,
+            &r1) < 0) {
+            return -1;
+        }
+        ((char *) buf)[i++] = r0;
+    }
+    return i;
+}
+ssize_t write_stdout(const void *buf, size_t count)
+{
+    int i;
+    for (i = 0; i < count; i++)
+        async_msg_1(console_phone, CONSOLE_PUTCHAR,
+            ((const char *) buf)[i]);
+    return count;
+}
+void open_stdin(void)
+{
+    if (console_phone < 0) {
+        while ((console_phone = ipc_connect_me_to(PHONE_NS,
+            SERVICE_CONSOLE, 0, 0)) < 0) {
+            usleep(10000);
+        }
+    }
+}
+void open_stdout(void)
+{
+    if (console_phone < 0) {
+        while ((console_phone = ipc_connect_me_to(PHONE_NS,
+            SERVICE_CONSOLE, 0, 0)) < 0) {
+            usleep(10000);
+        }
+    }
+}
+int get_cons_phone(void)
+{
+    return console_phone;
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/io/printf_core.c
 ,7 → 1,6
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2009 Martin Decky
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,12 → 27,12
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup generic
+/** @addtogroup libc
  * @{
  */
 /**
  * @file
- * @brief Printing functions.
+ * @brief   Printing functions.
  */
 #include <unistd.h>
 ,30 → 41,20
 #include <ctype.h>
 #include <string.h>
-/** show prefixes 0x or 0 */
-#define __PRINTF_FLAG_PREFIX       0x00000001
-/** signed / unsigned number */
-#define __PRINTF_FLAG_SIGNED       0x00000002
-/** print leading zeroes */
-#define __PRINTF_FLAG_ZEROPADDED   0x00000004
-/** align to left */
-#define __PRINTF_FLAG_LEFTALIGNED  0x00000010
-/** always show + sign */
-#define __PRINTF_FLAG_SHOWPLUS     0x00000020
-/** print space instead of plus */
-#define __PRINTF_FLAG_SPACESIGN    0x00000040
-/** show big characters */
-#define __PRINTF_FLAG_BIGCHARS     0x00000080
-/** number has - sign */
-#define __PRINTF_FLAG_NEGATIVE     0x00000100
+#define __PRINTF_FLAG_PREFIX        0x00000001  /**< show prefixes 0x or 0*/
+#define __PRINTF_FLAG_SIGNED        0x00000002  /**< signed / unsigned number */
+#define __PRINTF_FLAG_ZEROPADDED    0x00000004  /**< print leading zeroes */
+#define __PRINTF_FLAG_LEFTALIGNED   0x00000010  /**< align to left */
+#define __PRINTF_FLAG_SHOWPLUS      0x00000020  /**< always show + sign */
+#define __PRINTF_FLAG_SPACESIGN     0x00000040  /**< print space instead of plus */
+#define __PRINTF_FLAG_BIGCHARS      0x00000080  /**< show big characters */
+#define __PRINTF_FLAG_NEGATIVE      0x00000100  /**< number has - sign */
-/**
- * Buffer big enough for 64-bit number printed in base 2, sign, prefix and 0
- * to terminate string... (last one is only for better testing end of buffer by
- * zero-filling subroutine)
- */
-#define PRINT_NUMBER_BUFFER_SIZE  (64 + 5)
+#define PRINT_NUMBER_BUFFER_SIZE    (64+5)      /**< Buffer big enought for 64 bit number
+                             * printed in base 2, sign, prefix and
+                             * 0 to terminate string.. (last one is only for better testing
+                             * end of buffer by zero-filling subroutine)
+                             */
 /** Enumeration of possible arguments types.
  */
 typedef enum {
 ,296 → 63,174
     PrintfQualifierInt,
     PrintfQualifierLong,
     PrintfQualifierLongLong,
+    PrintfQualifierSizeT,
     PrintfQualifierPointer
 } qualifier_t;
-static char nullstr[] = "(NULL)";
-static char digits_small[] = "0123456789abcdef";
-static char digits_big[] = "0123456789ABCDEF";
-static char invalch = U_SPECIAL;
+static char digits_small[] = "0123456789abcdef";    /**< Small hexadecimal characters */
+static char digits_big[] = "0123456789ABCDEF";      /**< Big hexadecimal characters */
-/** Print one or more characters without adding newline.
- *
- * @param buf  Buffer holding characters with size of
- *             at least size bytes. NULL is not allowed!
- * @param size Size of the buffer in bytes.
- * @param ps   Output method and its data.
- *
- * @return Number of characters printed.
- *
+/** Print count chars from buffer without adding newline
+ * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed!
+ * @param count
+ * @param ps output method and its data
+ * @return number of printed characters
  */
-static int printf_putnchars(const char *buf, size_t size,
-    printf_spec_t *ps)
+static int printf_putnchars(const char * buf, size_t count,
+    struct printf_spec *ps)
 {
-    return ps->str_write((void *) buf, size, ps->data);
+    return ps->write((void *)buf, count, ps->data);
 }
-/** Print one or more wide characters without adding newline.
- *
- * @param buf  Buffer holding wide characters with size of
- *             at least size bytes. NULL is not allowed!
- * @param size Size of the buffer in bytes.
- * @param ps   Output method and its data.
- *
- * @return Number of wide characters printed.
- *
+/** Print string without added newline
+ * @param str string to print
+ * @param ps write function specification and support data
+ * @return number of printed characters
  */
-static int printf_wputnchars(const wchar_t *buf, size_t size,
-    printf_spec_t *ps)
+static int printf_putstr(const char * str, struct printf_spec *ps)
 {
-    return ps->wstr_write((void *) buf, size, ps->data);
-}
+    size_t count;
+    if (str == NULL)
+        return printf_putnchars("(NULL)", 6, ps);
-/** Print string without adding a newline.
- *
- * @param str String to print.
- * @param ps  Write function specification and support data.
- *
- * @return Number of characters printed.
- *
- */
-static int printf_putstr(const char *str, printf_spec_t *ps)
-{
-    if (str == NULL)
-        return printf_putnchars(nullstr, str_size(nullstr), ps);
+    for (count = 0; str[count] != 0; count++);
+    if (ps->write((void *) str, count, ps->data) == count)
+        return 0;
-    return ps->str_write((void *) str, str_size(str), ps->data);
+    return EOF;
 }
-/** Print one ASCII character.
- *
- * @param c  ASCII character to be printed.
- * @param ps Output method.
- *
- * @return Number of characters printed.
- *
+/** Print one character to output
+ * @param c one character
+ * @param ps output method
+ * @return number of printed characters
  */
-static int printf_putchar(const char ch, printf_spec_t *ps)
+static int printf_putchar(int c, struct printf_spec *ps)
 {
-    if (!ascii_check(ch))
-        return ps->str_write((void *) &invalch, 1, ps->data);
+    unsigned char ch = c;
-    return ps->str_write(&ch, 1, ps->data);
+    return ps->write((void *) &ch, 1, ps->data);
 }
-/** Print one wide character.
- *
- * @param c  Wide character to be printed.
- * @param ps Output method.
- *
- * @return Number of characters printed.
- *
+/** Print one formatted character
+ * @param c character to print
+ * @param width
+ * @param flags
+ * @return number of printed characters
  */
-static int printf_putwchar(const wchar_t ch, printf_spec_t *ps)
+static int print_char(char c, int width, uint64_t flags, struct printf_spec *ps)
 {
-    if (!chr_check(ch))
-        return ps->str_write((void *) &invalch, 1, ps->data);
+    int counter = 0;
-    return ps->wstr_write(&ch, sizeof(wchar_t), ps->data);
-}
-/** Print one formatted ASCII character.
- *
- * @param ch    Character to print.
- * @param width Width modifier.
- * @param flags Flags that change the way the character is printed.
- *
- * @return Number of characters printed, negative value on failure.
- *
- */
-static int print_char(const char ch, int width, uint32_t flags, printf_spec_t *ps)
-{
-    size_t counter = 0;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
+        /*
+         * One space is consumed by the character itself, hence the
+         * predecrement.
+         */
         while (--width > 0) {
-            /*
-             * One space is consumed by the character itself, hence
-             * the predecrement.
-             */
-            if (printf_putchar(' ', ps) > 0)
-                counter++;
+            if (printf_putchar(' ', ps) > 0)
+                ++counter;
         }
     }
-    if (printf_putchar(ch, ps) > 0)
+    if (printf_putchar(c, ps) > 0)
         counter++;
+    /*
+     * One space is consumed by the character itself, hence the
+     * predecrement.
+     */
     while (--width > 0) {
-        /*
-         * One space is consumed by the character itself, hence
-         * the predecrement.
-         */
         if (printf_putchar(' ', ps) > 0)
-            counter++;
+            ++counter;
     }
-    return (int) (counter + 1);
+    return ++counter;
 }
-/** Print one formatted wide character.
- *
- * @param ch    Character to print.
- * @param width Width modifier.
- * @param flags Flags that change the way the character is printed.
- *
- * @return Number of characters printed, negative value on failure.
- *
+/** Print one string
+ * @param s string
+ * @param width
+ * @param precision
+ * @param flags
+ * @return number of printed characters
  */
-static int print_wchar(const wchar_t ch, int width, uint32_t flags, printf_spec_t *ps)
+static int print_string(char *s, int width, int precision, uint64_t flags,
+    struct printf_spec *ps)
 {
-    size_t counter = 0;
-    if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (--width > 0) {
-            /*
-             * One space is consumed by the character itself, hence
-             * the predecrement.
-             */
-            if (printf_putchar(' ', ps) > 0)
-                counter++;
-        }
+    int counter = 0;
+    size_t size;
+    int retval;
+    if (s == NULL) {
+        return printf_putstr("(NULL)", ps);
     }
-    if (printf_putwchar(ch, ps) > 0)
-        counter++;
-    while (--width > 0) {
-        /*
-         * One space is consumed by the character itself, hence
-         * the predecrement.
-         */
-        if (printf_putchar(' ', ps) > 0)
-            counter++;
-    }
-    return (int) (counter + 1);
-}
+    size = strlen(s);
-/** Print string.
- *
- * @param str       String to be printed.
- * @param width     Width modifier.
- * @param precision Precision modifier.
- * @param flags     Flags that modify the way the string is printed.
- *
- * @return Number of characters printed, negative value on failure.
- */
-static int print_str(char *str, int width, unsigned int precision,
-    uint32_t flags, printf_spec_t *ps)
-{
-    if (str == NULL)
-        return printf_putstr(nullstr, ps);
+    /* print leading spaces */
-    /* Print leading spaces. */
-    size_t strw = str_length(str);
-    if (precision == 0)
-        precision = strw;
+    if (precision == 0)
+        precision = size;
-    /* Left padding */
-    size_t counter = 0;
     width -= precision;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (width-- > 0) {
-            if (printf_putchar(' ', ps) == 1)
+        while (width-- > 0) {
+            if (printf_putchar(' ', ps) == 1)
                 counter++;
         }
     }
-    /* Part of @a str fitting into the alloted space. */
-    int retval;
-    size_t size = str_lsize(str, precision);
-    if ((retval = printf_putnchars(str, size, ps)) < 0)
+    if ((retval = printf_putnchars(s, size < precision ? size : precision,
+        ps)) < 0) {
         return -counter;
+    }
-    counter += retval;
+    counter += retval;
-    /* Right padding */
     while (width-- > 0) {
-        if (printf_putchar(' ', ps) == 1)
-            counter++;
+        if (printf_putchar(' ', ps) == 1)
+            ++counter;
     }
-    return ((int) counter);
+    return counter;
 }
-/** Print wide string.
- *
- * @param str       Wide string to be printed.
- * @param width     Width modifier.
- * @param precision Precision modifier.
- * @param flags     Flags that modify the way the string is printed.
- *
- * @return Number of wide characters printed, negative value on failure.
- */
-static int print_wstr(wchar_t *str, int width, unsigned int precision,
-    uint32_t flags, printf_spec_t *ps)
-{
-    if (str == NULL)
-        return printf_putstr(nullstr, ps);
-    /* Print leading spaces. */
-    size_t strw = wstr_length(str);
-    if (precision == 0)
-        precision = strw;
-    /* Left padding */
-    size_t counter = 0;
-    width -= precision;
-    if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (width-- > 0) {
-            if (printf_putchar(' ', ps) == 1)
-                counter++;
-        }
-    }
-    /* Part of @a wstr fitting into the alloted space. */
-    int retval;
-    size_t size = wstr_lsize(str, precision);
-    if ((retval = printf_wputnchars(str, size, ps)) < 0)
-        return -counter;
-    counter += retval;
-    /* Right padding */
-    while (width-- > 0) {
-        if (printf_putchar(' ', ps) == 1)
-            counter++;
-    }
-    return ((int) counter);
-}
-/** Print a number in a given base.
+/** Print number in given base
  *
- * Print significant digits of a number in given base.
+ * Print significant digits of a number in given
+ * base.
  *
- * @param num       Number to print.
- * @param width     Width modifier.
- * @param precision Precision modifier.
- * @param base      Base to print the number in (must be between 2 and 16).
- * @param flags     Flags that modify the way the number is printed.
+ * @param num  Number to print.
+ * @param width
+ * @param precision
+ * @param base Base to print the number in (should
+ *             be in range 2 .. 16).
+ * @param flags output modifiers
+ * @return number of printed characters
  *
- * @return Number of characters printed.
- *
  */
 static int print_number(uint64_t num, int width, int precision, int base,
-    uint32_t flags, printf_spec_t *ps)
+    uint64_t flags, struct printf_spec *ps)
 {
-    char *digits;
-    if (flags & __PRINTF_FLAG_BIGCHARS)
-        digits = digits_big;
-    else
-        digits = digits_small;
+    char *digits = digits_small;
+    char d[PRINT_NUMBER_BUFFER_SIZE];   /* this is good enough even for
+                         * base == 2, prefix and sign */
+    char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1];
+    int size = 0; /* size of number with all prefixes and signs */
+    int number_size; /* size of plain number */
+    char sgn;
+    int retval;
+    int counter = 0;
-    char data[PRINT_NUMBER_BUFFER_SIZE];
-    char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1];
+    if (flags & __PRINTF_FLAG_BIGCHARS)
+        digits = digits_big;
-    /* Size of number with all prefixes and signs */
-    int size = 0;
-    /* Put zero at end of string */
-    *ptr-- = 0;
+    *ptr-- = 0; /* Put zero at end of string */
     if (num == 0) {
         *ptr-- = '0';
         size++;
 ,17 → 241,15
         } while (num /= base);
     }
-    /* Size of plain number */
-    int number_size = size;
+    number_size = size;
     /*
-     * Collect the sum of all prefixes/signs/etc. to calculate padding and
-     * leading zeroes.
+     * Collect sum of all prefixes/signs/... to calculate padding and
+     * leading zeroes
      */
     if (flags & __PRINTF_FLAG_PREFIX) {
         switch(base) {
-        case 2:
-            /* Binary formating is not standard, but usefull */
+        case 2: /* Binary formating is not standard, but usefull */
             size += 2;
             break;
         case 8:
 ,8 → 260,8
             break;
         }
     }
-    char sgn = 0;
+    sgn = 0;
     if (flags & __PRINTF_FLAG_SIGNED) {
         if (flags & __PRINTF_FLAG_NEGATIVE) {
             sgn = '-';
 ,46 → 274,47
             size++;
         }
     }
-    if (flags & __PRINTF_FLAG_LEFTALIGNED)
+    if (flags & __PRINTF_FLAG_LEFTALIGNED) {
         flags &= ~__PRINTF_FLAG_ZEROPADDED;
+    }
     /*
-     * If the number is left-aligned or precision is specified then
-     * padding with zeros is ignored.
+     * If number is leftaligned or precision is specified then zeropadding
+     * is ignored.
      */
     if (flags & __PRINTF_FLAG_ZEROPADDED) {
-        if ((precision == 0) && (width > size))
+        if ((precision == 0) && (width > size)) {
             precision = width - size + number_size;
+        }
     }
-    /* Print leading spaces */
-    if (number_size > precision) {
-        /* Print the whole number, not only a part */
+    /* print leading spaces */
+    /* We must print whole number not only a part. */
+    if (number_size > precision)
         precision = number_size;
-    }
     width -= precision + size - number_size;
-    size_t counter = 0;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (width-- > 0) {
-            if (printf_putchar(' ', ps) == 1)
+        while (width-- > 0) {
+            if (printf_putchar(' ', ps) == 1)
                 counter++;
         }
     }
-    /* Print sign */
+    /* print sign */
     if (sgn) {
         if (printf_putchar(sgn, ps) == 1)
             counter++;
     }
-    /* Print prefix */
+    /* print prefix */
     if (flags & __PRINTF_FLAG_PREFIX) {
         switch(base) {
-        case 2:
-            /* Binary formating is not standard, but usefull */
+        case 2: /* Binary formating is not standard, but usefull */
             if (printf_putchar('0', ps) == 1)
                 counter++;
             if (flags & __PRINTF_FLAG_BIGCHARS) {
 ,154 → 342,152
             break;
         }
     }
-    /* Print leading zeroes */
+    /* print leading zeroes */
     precision -= number_size;
-    while (precision-- > 0) {
+    while (precision-- > 0) {
         if (printf_putchar('0', ps) == 1)
             counter++;
     }
-    /* Print the number itself */
-    int retval;
-    if ((retval = printf_putstr(++ptr, ps)) > 0)
+    /* print number itself */
+    if ((retval = printf_putstr(++ptr, ps)) > 0) {
         counter += retval;
+    }
-    /* Print tailing spaces */
+    /* print ending spaces */
-    while (width-- > 0) {
-        if (printf_putchar(' ', ps) == 1)
+    while (width-- > 0) {
+        if (printf_putchar(' ', ps) == 1)
             counter++;
     }
-    return ((int) counter);
+    return counter;
 }
 /** Print formatted string.
  *
  * Print string formatted according to the fmt parameter and variadic arguments.
  * Each formatting directive must have the following form:
+ *
+ *  \% [ FLAGS ] [ WIDTH ] [ .PRECISION ] [ TYPE ] CONVERSION
  *
- *  \% [ FLAGS ] [ WIDTH ] [ .PRECISION ] [ TYPE ] CONVERSION
- *
  * FLAGS:@n
- *  - "#" Force to print prefix. For \%o conversion, the prefix is 0, for
- *        \%x and \%X prefixes are 0x and 0X and for conversion \%b the
- *        prefix is 0b.
+ *  - "#" Force to print prefix.
+ *  For conversion \%o the prefix is 0, for %x and \%X prefixes are 0x and
+ *  0X and for conversion \%b the prefix is 0b.
  *
- *  - "-" Align to left.
+ *  - "-"   Align to left.
  *
- *  - "+" Print positive sign just as negative.
+ *  - "+"   Print positive sign just as negative.
  *
- *  - " " If the printed number is positive and "+" flag is not set,
- *        print space in place of sign.
+ *  - " "   If the printed number is positive and "+" flag is not set,
+ *      print space in place of sign.
  *
- *  - "0" Print 0 as padding instead of spaces. Zeroes are placed between
- *        sign and the rest of the number. This flag is ignored if "-"
- *        flag is specified.
- *
+ *  - "0"    Print 0 as padding instead of spaces. Zeroes are placed between
+ *      sign and the rest of the number. This flag is ignored if "-"
+ *      flag is specified.
+ *
  * WIDTH:@n
- *  - Specify the minimal width of a printed argument. If it is bigger,
- *    width is ignored. If width is specified with a "*" character instead of
- *    number, width is taken from parameter list. And integer parameter is
- *    expected before parameter for processed conversion specification. If
- *    this value is negative its absolute value is taken and the "-" flag is
- *    set.
+ *  - Specify minimal width of printed argument. If it is bigger, width is
+ *    ignored. If width is specified with a "*" character instead of number,
+ *    width is taken from parameter list. And integer parameter is expected
+ *    before parameter for processed conversion specification. If this value
+ *    is negative its absolute value is taken and the "-" flag is set.
  *
  * PRECISION:@n
- *  - Value precision. For numbers it specifies minimum valid numbers.
- *    Smaller numbers are printed with leading zeroes. Bigger numbers are not
- *    affected. Strings with more than precision characters are cut off. Just
- *    as with width, an "*" can be used used instead of a number. An integer
- *    value is then expected in parameters. When both width and precision are
- *    specified using "*", the first parameter is used for width and the
- *    second one for precision.
- *
+ *  - Value precision. For numbers it specifies minimum valid numbers.
+ *    Smaller numbers are printed with leading zeroes. Bigger numbers are
+ *    not affected. Strings with more than precision characters are cut off.
+ *    Just as with width, an "*" can be used used instead of a number. An
+ *    integer value is then expected in parameters. When both width and
+ *    precision are specified using "*", the first parameter is used for
+ *    width and the second one for precision.
+ *
  * TYPE:@n
- *  - "hh" Signed or unsigned char.@n
- *  - "h"  Signed or unsigned short.@n
- *  - ""   Signed or unsigned int (default value).@n
- *  - "l"  Signed or unsigned long int.@n
- *         If conversion is "c", the character is wchar_t (wide character).@n
- *         If conversion is "s", the string is wchar_t * (wide string).@n
- *  - "ll" Signed or unsigned long long int.@n
- *
+ *  - "hh"  Signed or unsigned char.@n
+ *  - "h"   Signed or usigned short.@n
+ *  - ""    Signed or usigned int (default value).@n
+ *  - "l"   Signed or usigned long int.@n
+ *  - "ll"  Signed or usigned long long int.@n
+ *  - "z"   Type size_t.@n
+ *
+ *
  * CONVERSION:@n
- *  - % Print percentile character itself.
+ *  - % Print percentile character itself.
  *
- *  - c Print single character. The character is expected to be plain
- *      ASCII (e.g. only values 0 .. 127 are valid).@n
- *      If type is "l", then the character is expected to be wide character
- *      (e.g. values 0 .. 0x10ffff are valid).
+ *  - c Print single character.
  *
- *  - s Print zero terminated string. If a NULL value is passed as
- *      value, "(NULL)" is printed instead.@n
- *      If type is "l", then the string is expected to be wide string.
+ *  - s Print zero terminated string. If a NULL value is passed as
+ *      value, "(NULL)" is printed instead.
+ *
+ *  - P, p  Print value of a pointer. Void * value is expected and it is
+ *      printed in hexadecimal notation with prefix (as with '\%#X' or
+ *      '\%#x' for 32bit or '\%#X' or '\%#x' for 64bit long pointers).
  *
- *  - P, p Print value of a pointer. Void * value is expected and it is
- *         printed in hexadecimal notation with prefix (as with \%#X / \%#x
- *         for 32-bit or \%#X / \%#x for 64-bit long pointers).
+ *  - b Print value as unsigned binary number. Prefix is not printed by
+ *      default. (Nonstandard extension.)
+ *
+ *  - o Print value as unsigned octal number. Prefix is not printed by
+ *      default.
  *
- *  - b Print value as unsigned binary number. Prefix is not printed by
- *      default. (Nonstandard extension.)
+ *  - d, i  Print signed decimal number. There is no difference between d
+ *      and i conversion.
  *
- *  - o Print value as unsigned octal number. Prefix is not printed by
- *      default.
+ *  - u Print unsigned decimal number.
  *
- *  - d, i Print signed decimal number. There is no difference between d
- *         and i conversion.
- *
- *  - u Print unsigned decimal number.
- *
- *  - X, x Print hexadecimal number with upper- or lower-case. Prefix is
- *         not printed by default.
- *
- * All other characters from fmt except the formatting directives are printed
+ *  - X, x  Print hexadecimal number with upper- or lower-case. Prefix is
+ *      not printed by default.
+ *
+ * All other characters from fmt except the formatting directives are printed in
  * verbatim.
  *
- * @param fmt Format NULL-terminated string.
- *
- * @return Number of characters printed, negative value on failure.
- *
+ * @param fmt Formatting NULL terminated string.
+ * @return Number of printed characters or negative value on failure.
  */
-int printf_core(const char *fmt, printf_spec_t *ps, va_list ap)
+int printf_core(const char *fmt, struct printf_spec *ps, va_list ap)
 {
-    size_t i;        /* Index of the currently processed character from fmt */
-    size_t nxt = 0;  /* Index of the next character from fmt */
-    size_t j = 0;    /* Index to the first not printed nonformating character */
+    /* i is the index of the currently processed char from fmt */
+    int i = 0;
+    /* j is the index to the first not printed nonformating character */
+    int j = 0;
+    int end;
+    int counter;    /* counter of printed characters */
+    int retval; /* used to store return values from called functions */
+    char c;
+    qualifier_t qualifier;  /* type of argument */
+    int base;   /* base in which will be a numeric parameter printed */
+    uint64_t number; /* argument value */
+    size_t  size;   /* byte size of integer parameter */
+    int width, precision;
+    uint64_t flags;
-    size_t counter = 0;   /* Number of characters printed */
-    int retval;           /* Return values from nested functions */
+    counter = 0;
-    while (true) {
-        i = nxt;
-        wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-        if (uc == 0)
-            break;
-        /* Control character */
-        if (uc == '%') {
-            /* Print common characters if any processed */
+    while ((c = fmt[i])) {
+        /* control character */
+        if (c == '%' ) {
+            /* print common characters if any processed */
             if (i > j) {
-                if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
-                    /* Error */
-                    counter = -counter;
-                    goto out;
+                if ((retval = printf_putnchars(&fmt[j],
+                    (size_t)(i - j), ps)) < 0) { /* error */
+                    goto minus_out;
                 }
                 counter += retval;
             }
             j = i;
+            /* parse modifiers */
+            flags = 0;
+            end = 0;
-            /* Parse modifiers */
-            uint32_t flags = 0;
-            bool end = false;
             do {
-                i = nxt;
-                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                switch (uc) {
+                ++i;
+                switch (c = fmt[i]) {
                 case '#':
                     flags |= __PRINTF_FLAG_PREFIX;
                     break;
 ,145 → 504,114
                     flags |= __PRINTF_FLAG_ZEROPADDED;
                     break;
                 default:
-                    end = true;
-                };
-            } while (!end);
+                    end = 1;
+                };
+            } while (end == 0);
-            /* Width & '*' operator */
-            int width = 0;
-            if (isdigit(uc)) {
-                while (true) {
+            /* width & '*' operator */
+            width = 0;
+            if (isdigit(fmt[i])) {
+                while (isdigit(fmt[i])) {
                     width *= 10;
-                    width += uc - '0';
-                    i = nxt;
-                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                    if (uc == 0)
-                        break;
-                    if (!isdigit(uc))
-                        break;
+                    width += fmt[i++] - '0';
                 }
-            } else if (uc == '*') {
-                /* Get width value from argument list */
-                i = nxt;
-                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                width = (int) va_arg(ap, int);
+            } else if (fmt[i] == '*') {
+                /* get width value from argument list*/
+                i++;
+                width = (int)va_arg(ap, int);
                 if (width < 0) {
-                    /* Negative width sets '-' flag */
+                    /* negative width sets '-' flag */
                     width *= -1;
                     flags |= __PRINTF_FLAG_LEFTALIGNED;
                 }
             }
-            /* Precision and '*' operator */
-            int precision = 0;
-            if (uc == '.') {
-                i = nxt;
-                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                if (isdigit(uc)) {
-                    while (true) {
+            /* precision and '*' operator */
+            precision = 0;
+            if (fmt[i] == '.') {
+                ++i;
+                if (isdigit(fmt[i])) {
+                    while (isdigit(fmt[i])) {
                         precision *= 10;
-                        precision += uc - '0';
-                        i = nxt;
-                        uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                        if (uc == 0)
-                            break;
-                        if (!isdigit(uc))
-                            break;
+                        precision += fmt[i++] - '0';
                     }
-                } else if (uc == '*') {
-                    /* Get precision value from the argument list */
-                    i = nxt;
-                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                    precision = (int) va_arg(ap, int);
+                } else if (fmt[i] == '*') {
+                    /* get precision value from argument */
+                    i++;
+                    precision = (int)va_arg(ap, int);
                     if (precision < 0) {
-                        /* Ignore negative precision */
+                        /* negative precision ignored */
                         precision = 0;
                     }
                 }
             }
-            qualifier_t qualifier;
-            switch (uc) {
-            /** @todo Unimplemented qualifiers:
-             *        t ptrdiff_t - ISO C 99
+            switch (fmt[i++]) {
+            /** @todo unimplemented qualifiers:
+             * t ptrdiff_t - ISO C 99
              */
-            case 'h':
-                /* Char or short */
+            case 'h':   /* char or short */
                 qualifier = PrintfQualifierShort;
-                i = nxt;
-                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                if (uc == 'h') {
-                    i = nxt;
-                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                if (fmt[i] == 'h') {
+                    i++;
                     qualifier = PrintfQualifierByte;
                 }
                 break;
-            case 'l':
-                /* Long or long long */
+            case 'l':   /* long or long long*/
                 qualifier = PrintfQualifierLong;
-                i = nxt;
-                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                if (uc == 'l') {
-                    i = nxt;
-                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                if (fmt[i] == 'l') {
+                    i++;
                     qualifier = PrintfQualifierLongLong;
                 }
                 break;
+            case 'z':   /* size_t */
+                qualifier = PrintfQualifierSizeT;
+                break;
             default:
-                /* Default type */
+                /* set default type */
                 qualifier = PrintfQualifierInt;
-            }
+                --i;
+            }
-            unsigned int base = 10;
-            switch (uc) {
+            base = 10;
+            switch (c = fmt[i]) {
             /*
              * String and character conversions.
              */
             case 's':
-                if (qualifier == PrintfQualifierLong)
-                    retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps);
-                else
-                    retval = print_str(va_arg(ap, char *), width, precision, flags, ps);
-                if (retval < 0) {
-                    counter = -counter;
-                    goto out;
+                if ((retval = print_string(va_arg(ap, char*),
+                    width, precision, flags, ps)) < 0) {
+                    goto minus_out;
                 }
                 counter += retval;
-                j = nxt;
+                j = i + 1;
                 goto next_char;
             case 'c':
-                if (qualifier == PrintfQualifierLong)
-                    retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
-                else
-                    retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
+                c = va_arg(ap, unsigned int);
+                retval = print_char(c, width, flags, ps);
                 if (retval < 0) {
-                    counter = -counter;
-                    goto out;
-                };
+                    goto minus_out;
+                }
                 counter += retval;
-                j = nxt;
+                j = i + 1;
                 goto next_char;
-            /*
+            /*
              * Integer values
              */
-            case 'P':
-                /* Pointer */
-                flags |= __PRINTF_FLAG_BIGCHARS;
+            case 'P': /* pointer */
+                    flags |= __PRINTF_FLAG_BIGCHARS;
             case 'p':
                 flags |= __PRINTF_FLAG_PREFIX;
                 base = 16;
                 qualifier = PrintfQualifierPointer;
-                break;
-            case 'b':
+                break;
+            case 'b':
                 base = 2;
                 break;
             case 'o':
 ,7 → 619,7
                 break;
             case 'd':
             case 'i':
-                flags |= __PRINTF_FLAG_SIGNED;
+                flags |= __PRINTF_FLAG_SIGNED;
             case 'u':
                 break;
             case 'X':
 ,63 → 627,66
             case 'x':
                 base = 16;
                 break;
-            /* Percentile itself */
-            case '%':
+            /* percentile itself */
+            case '%':
                 j = i;
                 goto next_char;
             /*
              * Bad formatting.
              */
             default:
                 /*
-                 * Unknown format. Now, j is the index of '%'
-                 * so we will print whole bad format sequence.
+                 * Unknown format. Now, j is the index of '%',
+                 * so we will print the whole bad format
+                 * sequence.
                  */
-                goto next_char;
+                goto next_char;
             }
             /* Print integers */
-            size_t size;
-            uint64_t number;
             switch (qualifier) {
             case PrintfQualifierByte:
                 size = sizeof(unsigned char);
-                number = (uint64_t) va_arg(ap, unsigned int);
+                number = (uint64_t)va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierShort:
                 size = sizeof(unsigned short);
-                number = (uint64_t) va_arg(ap, unsigned int);
+                number = (uint64_t)va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierInt:
                 size = sizeof(unsigned int);
-                number = (uint64_t) va_arg(ap, unsigned int);
+                number = (uint64_t)va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierLong:
                 size = sizeof(unsigned long);
-                number = (uint64_t) va_arg(ap, unsigned long);
+                number = (uint64_t)va_arg(ap, unsigned long);
                 break;
             case PrintfQualifierLongLong:
                 size = sizeof(unsigned long long);
-                number = (uint64_t) va_arg(ap, unsigned long long);
+                number = (uint64_t)va_arg(ap,
+                    unsigned long long);
                 break;
             case PrintfQualifierPointer:
                 size = sizeof(void *);
-                number = (uint64_t) (unsigned long) va_arg(ap, void *);
+                number = (uint64_t)(unsigned long)va_arg(ap,
+                    void *);
                 break;
-            default:
-                /* Unknown qualifier */
-                counter = -counter;
-                goto out;
+            case PrintfQualifierSizeT:
+                size = sizeof(size_t);
+                number = (uint64_t)va_arg(ap, size_t);
+                break;
+            default: /* Unknown qualifier */
+                goto minus_out;
             }
             if (flags & __PRINTF_FLAG_SIGNED) {
                 if (number & (0x1 << (size * 8 - 1))) {
                     flags |= __PRINTF_FLAG_NEGATIVE;
                     if (size == sizeof(uint64_t)) {
-                        number = -((int64_t) number);
+                        number = -((int64_t)number);
                     } else {
                         number = ~number;
                         number &=
 ,31 → 696,31
                     }
                 }
             }
             if ((retval = print_number(number, width, precision,
-                base, flags, ps)) < 0) {
-                counter = -counter;
-                goto out;
+                base, flags, ps)) < 0 ) {
+                goto minus_out;
             }
             counter += retval;
-            j = nxt;
-        }
+            j = i + 1;
+        }
 next_char:
-        ;
+        ++i;
     }
     if (i > j) {
-        if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
-            /* Error */
-            counter = -counter;
-            goto out;
+        retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps);
+        if (retval < 0) { /* error */
+            goto minus_out;
         }
         counter += retval;
     }
-out:
-    return ((int) counter);
+    return counter;
+minus_out:
+    return -counter;
 }
 /** @}

 /trunk/uspace/lib/libc/generic/io/printf.c
 ,43 → 34,23
 #include <io/printf_core.h>
 #include <stdio.h>
+#include <stdio.h>
 /** Print formatted text.
- *
- * @param stream Output stream
- * @param fmt    Format string
- *
+ * @param fmt   format string
  * \see For more details about format string see printf_core.
- *
  */
-int fprintf(FILE *stream, const char *fmt, ...)
+int printf(const char *fmt, ...)
 {
+    int ret;
     va_list args;
     va_start(args, fmt);
+    ret = vprintf(fmt, args);
-    int ret = vfprintf(stream, fmt, args);
     va_end(args);
-    return ret;
-}
-/** Print formatted text to stdout.
- *
- * @param fmt Format string
- *
- * \see For more details about format string see printf_core.
- *
- */
-int printf(const char *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    int ret = vprintf(fmt, args);
-    va_end(args);
     return ret;
 }

 /trunk/uspace/lib/libc/generic/io/vsnprintf.c
 ,144 → 36,67
 #include <stdio.h>
 #include <string.h>
 #include <io/printf_core.h>
-#include <errno.h>
-typedef struct {
-    size_t size;    /* Total size of the buffer (in bytes) */
-    size_t len;     /* Number of already used bytes */
-    char *dst;      /* Destination */
-} vsnprintf_data_t;
+struct vsnprintf_data {
+    size_t size; /* total space for string */
+    size_t len; /* count of currently used characters */
+    char *string; /* destination string */
+};
 /** Write string to given buffer.
- *
- * Write at most data->size plain characters including trailing zero.
- * According to C99, snprintf() has to return number of characters that
- * would have been written if enough space had been available. Hence
- * the return value is not the number of actually printed characters
- * but size of the input string.
- *
- * @param str  Source string to print.
- * @param size Number of plain characters in str.
- * @param data Structure describing destination string, counter
- *             of used space and total string size.
- *
- * @return Number of characters to print (not characters actually
- *         printed).
- *
+ * Write at most data->size characters including trailing zero. According to C99 has snprintf to return number
+ * of characters that would have been written if enough space had been available. Hence the return value is not
+ * number of really printed characters but size of input string. Number of really used characters
+ * is stored in data->len.
+ * @param str source string to print
+ * @param count size of source string
+ * @param data structure with destination string, counter of used space and total string size.
+ * @return number of characters to print (not characters really printed!)
  */
-static int vsnprintf_str_write(const char *str, size_t size, vsnprintf_data_t *data)
+static int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data)
 {
-    size_t left = data->size - data->len;
+    size_t i;
+    i = data->size - data->len;
+    if (i == 0) {
+        return count;
+    }
-    if (left == 0)
-        return ((int) size);
-    if (left == 1) {
-        /* We have only one free byte left in buffer
-         * -> store trailing zero
-         */
-        data->dst[data->size - 1] = 0;
+    if (i == 1) {
+        /* We have only one free byte left in buffer => write there trailing zero */
+        data->string[data->size - 1] = 0;
         data->len = data->size;
-        return ((int) size);
+        return count;
     }
-    if (left <= size) {
-        /* We do not have enough space for the whole string
-         * with the trailing zero => print only a part
-         * of string
-         */
-        size_t index = 0;
-        while (index < size) {
-            wchar_t uc = str_decode(str, &index, size);
-            if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
-                break;
-        }
-        /* Put trailing zero at end, but not count it
-         * into data->len so it could be rewritten next time
-         */
-        data->dst[data->len] = 0;
-        return ((int) size);
+    if (i <= count) {
+        /* We have not enought space for whole string with the trailing zero => print only a part of string */
+            memcpy((void *)(data->string + data->len), (void *)str, i - 1);
+            data->string[data->size - 1] = 0;
+            data->len = data->size;
+            return count;
     }
-    /* Buffer is big enought to print the whole string */
-    memcpy((void *)(data->dst + data->len), (void *) str, size);
-    data->len += size;
-    /* Put trailing zero at end, but not count it
-     * into data->len so it could be rewritten next time
-     */
-    data->dst[data->len] = 0;
-    return ((int) size);
+    /* Buffer is big enought to print whole string */
+    memcpy((void *)(data->string + data->len), (void *)str, count);
+    data->len += count;
+    /* Put trailing zero at end, but not count it into data->len so it could be rewritten next time */
+    data->string[data->len] = 0;
+    return count;
 }
-/** Write wide string to given buffer.
- *
- * Write at most data->size plain characters including trailing zero.
- * According to C99, snprintf() has to return number of characters that
- * would have been written if enough space had been available. Hence
- * the return value is not the number of actually printed characters
- * but size of the input string.
- *
- * @param str  Source wide string to print.
- * @param size Number of bytes in str.
- * @param data Structure describing destination string, counter
- *             of used space and total string size.
- *
- * @return Number of wide characters to print (not characters actually
- *         printed).
- *
+/** Print formatted to the given buffer with limited size.
+ * @param str   buffer
+ * @param size  buffer size
+ * @param fmt   format string
+ * \see For more details about format string see printf_core.
  */
-static int vsnprintf_wstr_write(const wchar_t *str, size_t size, vsnprintf_data_t *data)
+int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
 {
-    size_t index = 0;
-    while (index < (size / sizeof(wchar_t))) {
-        size_t left = data->size - data->len;
-        if (left == 0)
-            return ((int) size);
-        if (left == 1) {
-            /* We have only one free byte left in buffer
-             * -> store trailing zero
-             */
-            data->dst[data->size - 1] = 0;
-            data->len = data->size;
-            return ((int) size);
-        }
-        if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK)
-            break;
-        index++;
-    }
-    /* Put trailing zero at end, but not count it
-     * into data->len so it could be rewritten next time
-     */
-    data->dst[data->len] = 0;
-    return ((int) size);
-}
+    struct vsnprintf_data data = {size, 0, str};
+    struct printf_spec ps = {(int(*)(void *, size_t, void *)) vsnprintf_write, &data};
-int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
-{
-    vsnprintf_data_t data = {
-        size,
-,
-        str
-    };
-    printf_spec_t ps = {
-        (int(*) (const char *, size_t, void *)) vsnprintf_str_write,
-        (int(*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write,
-        &data
-    };
     /* Print 0 at end of string - fix the case that nothing will be printed */
     if (size > 0)
         str[0] = 0;

 /trunk/uspace/lib/libc/generic/io/vsprintf.c
 ,0 → 1,51
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <io/printf_core.h>
+/** Print formatted to the given buffer.
+ * @param str   buffer
+ * @param fmt   format string
+ * @param ap    argument list
+ * \see For more details about format string see printf_core.
+ */
+int vsprintf(char *str, const char *fmt, va_list ap)
+{
+    return vsnprintf(str, (size_t) - 1, fmt, ap);
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/io/snprintf.c
 ,23 → 37,21
 #include <io/printf_core.h>
 /** Print formatted to the given buffer with limited size.
- *
- * @param str  Buffer
- * @param size Buffer size
- * @param fmt  Format string
- *
+ * @param str   buffer
+ * @param size  buffer size
+ * @param fmt   format string
  * \see For more details about format string see printf_core.
- *
  */
 int snprintf(char *str, size_t size, const char *fmt, ...)
 {
+    int ret;
     va_list args;
     va_start(args, fmt);
-    int ret = vsnprintf(str, size, fmt, args);
+    ret = vsnprintf(str, size, fmt, args);
     va_end(args);
     return ret;
 }

 /trunk/uspace/lib/libc/generic/io/sprintf.c
 ,0 → 1,58
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <io/printf_core.h>
+/** Print formatted to the given buffer.
+ * @param str   buffer
+ * @param fmt   format string
+ * \see For more details about format string see printf_core.
+ */
+int sprintf(char *str, const char *fmt, ...)
+{
+    int ret;
+    va_list args;
+    va_start(args, fmt);
+    ret = vsprintf(str, fmt, args);
+    va_end(args);
+    return ret;
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/string.c
 ,6 → 1,5
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,677 → 33,171
  */
 #include <string.h>
-#include <stdlib.h>
-#include <assert.h>
+#include <unistd.h>
+#include <ctype.h>
 #include <limits.h>
-#include <ctype.h>
-#include <malloc.h>
-#include <errno.h>
 #include <align.h>
-#include <mem.h>
-#include <string.h>
+#include <sys/types.h>
-/** Byte mask consisting of lowest @n bits (out of 8) */
-#define LO_MASK_8(n)  ((uint8_t) ((1 << (n)) - 1))
-/** Byte mask consisting of lowest @n bits (out of 32) */
-#define LO_MASK_32(n)  ((uint32_t) ((1 << (n)) - 1))
+/* Dummy implementation of mem/ functions */
-/** Byte mask consisting of highest @n bits (out of 8) */
-#define HI_MASK_8(n)  (~LO_MASK_8(8 - (n)))
-/** Number of data bits in a UTF-8 continuation byte */
-#define CONT_BITS  6
-/** Decode a single character from a string.
- *
- * Decode a single character from a string of size @a size. Decoding starts
- * at @a offset and this offset is moved to the beginning of the next
- * character. In case of decoding error, offset generally advances at least
- * by one. However, offset is never moved beyond size.
- *
- * @param str    String (not necessarily NULL-terminated).
- * @param offset Byte offset in string where to start decoding.
- * @param size   Size of the string (in bytes).
- *
- * @return Value of decoded character, U_SPECIAL on decoding error or
- *         NULL if attempt to decode beyond @a size.
- *
- */
-wchar_t str_decode(const char *str, size_t *offset, size_t size)
+void *memset(void *s, int c, size_t n)
 {
-    if (*offset + 1 > size)
-        return 0;
+    char *os = s;
-    /* First byte read from string */
-    uint8_t b0 = (uint8_t) str[(*offset)++];
+    while (n--)
+        *(os++) = c;
-    /* Determine code length */
-    unsigned int b0_bits;  /* Data bits in first byte */
-    unsigned int cbytes;   /* Number of continuation bytes */
-    if ((b0 & 0x80) == 0) {
-        /* 0xxxxxxx (Plain ASCII) */
-        b0_bits = 7;
-        cbytes = 0;
-    } else if ((b0 & 0xe0) == 0xc0) {
-        /* 110xxxxx 10xxxxxx */
-        b0_bits = 5;
-        cbytes = 1;
-    } else if ((b0 & 0xf0) == 0xe0) {
-        /* 1110xxxx 10xxxxxx 10xxxxxx */
-        b0_bits = 4;
-        cbytes = 2;
-    } else if ((b0 & 0xf8) == 0xf0) {
-        /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
-        b0_bits = 3;
-        cbytes = 3;
-    } else {
-        /* 10xxxxxx -- unexpected continuation byte */
-        return U_SPECIAL;
-    }
-    if (*offset + cbytes > size)
-        return U_SPECIAL;
-    wchar_t ch = b0 & LO_MASK_8(b0_bits);
-    /* Decode continuation bytes */
-    while (cbytes > 0) {
-        uint8_t b = (uint8_t) str[(*offset)++];
-        /* Must be 10xxxxxx */
-        if ((b & 0xc0) != 0x80)
-            return U_SPECIAL;
-        /* Shift data bits to ch */
-        ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS));
-        cbytes--;
-    }
-    return ch;
+    return s;
 }
-/** Encode a single character to string representation.
- *
- * Encode a single character to string representation (i.e. UTF-8) and store
- * it into a buffer at @a offset. Encoding starts at @a offset and this offset
- * is moved to the position where the next character can be written to.
- *
- * @param ch     Input character.
- * @param str    Output buffer.
- * @param offset Byte offset where to start writing.
- * @param size   Size of the output buffer (in bytes).
- *
- * @return EOK if the character was encoded successfully, EOVERFLOW if there
- *         was not enough space in the output buffer or EINVAL if the character
- *         code was invalid.
- */
-int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
-{
-    if (*offset >= size)
-        return EOVERFLOW;
-    if (!chr_check(ch))
-        return EINVAL;
-    /* Unsigned version of ch (bit operations should only be done
-       on unsigned types). */
-    uint32_t cc = (uint32_t) ch;
-    /* Determine how many continuation bytes are needed */
-    unsigned int b0_bits;  /* Data bits in first byte */
-    unsigned int cbytes;   /* Number of continuation bytes */
-    if ((cc & ~LO_MASK_32(7)) == 0) {
-        b0_bits = 7;
-        cbytes = 0;
-    } else if ((cc & ~LO_MASK_32(11)) == 0) {
-        b0_bits = 5;
-        cbytes = 1;
-    } else if ((cc & ~LO_MASK_32(16)) == 0) {
-        b0_bits = 4;
-        cbytes = 2;
-    } else if ((cc & ~LO_MASK_32(21)) == 0) {
-        b0_bits = 3;
-        cbytes = 3;
-    } else {
-        /* Codes longer than 21 bits are not supported */
-        return EINVAL;
-    }
-    /* Check for available space in buffer */
-    if (*offset + cbytes >= size)
-        return EOVERFLOW;
-    /* Encode continuation bytes */
-    unsigned int i;
-    for (i = cbytes; i > 0; i--) {
-        str[*offset + i] = 0x80 | (cc & LO_MASK_32(CONT_BITS));
-        cc = cc >> CONT_BITS;
-    }
-    /* Encode first byte */
-    str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1);
-    /* Advance offset */
-    *offset += cbytes + 1;
-    return EOK;
-}
+struct along {
+    unsigned long n;
+} __attribute__ ((packed));
-/** Get size of string.
- *
- * Get the number of bytes which are used by the string @a str (excluding the
- * NULL-terminator).
- *
- * @param str String to consider.
- *
- * @return Number of bytes used by the string
- *
- */
-size_t str_size(const char *str)
+static void *unaligned_memcpy(void *dst, const void *src, size_t n)
 {
-    size_t size = 0;
-    while (*str++ != 0)
-        size++;
-    return size;
-}
+    int i, j;
+    struct along *adst = dst;
+    const struct along *asrc = src;
-/** Get size of wide string.
- *
- * Get the number of bytes which are used by the wide string @a str (excluding the
- * NULL-terminator).
- *
- * @param str Wide string to consider.
- *
- * @return Number of bytes used by the wide string
- *
- */
-size_t wstr_size(const wchar_t *str)
-{
-    return (wstr_length(str) * sizeof(wchar_t));
-}
-/** Get size of string with length limit.
- *
- * Get the number of bytes which are used by up to @a max_len first
- * characters in the string @a str. If @a max_len is greater than
- * the length of @a str, the entire string is measured (excluding the
- * NULL-terminator).
- *
- * @param str     String to consider.
- * @param max_len Maximum number of characters to measure.
- *
- * @return Number of bytes used by the characters.
- *
- */
-size_t str_lsize(const char *str, size_t max_len)
-{
-    size_t len = 0;
-    size_t offset = 0;
-    while (len < max_len) {
-        if (str_decode(str, &offset, STR_NO_LIMIT) == 0)
-            break;
+    for (i = 0; i < n / sizeof(unsigned long); i++)
+        adst[i].n = asrc[i].n;
-        len++;
-    }
-    return offset;
+    for (j = 0; j < n % sizeof(unsigned long); j++)
+        ((unsigned char *) (((unsigned long *) dst) + i))[j] = ((unsigned char *) (((unsigned long *) src) + i))[j];
+    return (char *) src;
 }
-/** Get size of wide string with length limit.
- *
- * Get the number of bytes which are used by up to @a max_len first
- * wide characters in the wide string @a str. If @a max_len is greater than
- * the length of @a str, the entire wide string is measured (excluding the
- * NULL-terminator).
- *
- * @param str     Wide string to consider.
- * @param max_len Maximum number of wide characters to measure.
- *
- * @return Number of bytes used by the wide characters.
- *
- */
-size_t wstr_lsize(const wchar_t *str, size_t max_len)
+void *memcpy(void *dst, const void *src, size_t n)
 {
-    return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
-}
+    int i, j;
-/** Get number of characters in a string.
- *
- * @param str NULL-terminated string.
- *
- * @return Number of characters in string.
- *
- */
-size_t str_length(const char *str)
-{
-    size_t len = 0;
-    size_t offset = 0;
-    while (str_decode(str, &offset, STR_NO_LIMIT) != 0)
-        len++;
-    return len;
-}
+    if (((long) dst & (sizeof(long) - 1)) || ((long) src & (sizeof(long) - 1)))
+        return unaligned_memcpy(dst, src, n);
-/** Get number of characters in a wide string.
- *
- * @param str NULL-terminated wide string.
- *
- * @return Number of characters in @a str.
- *
- */
-size_t wstr_length(const wchar_t *wstr)
-{
-    size_t len = 0;
-    while (*wstr++ != 0)
-        len++;
-    return len;
+    for (i = 0; i < n / sizeof(unsigned long); i++)
+        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
+    for (j = 0; j < n % sizeof(unsigned long); j++)
+        ((unsigned char *) (((unsigned long *) dst) + i))[j] = ((unsigned char *) (((unsigned long *) src) + i))[j];
+    return (char *) src;
 }
-/** Get number of characters in a string with size limit.
- *
- * @param str  NULL-terminated string.
- * @param size Maximum number of bytes to consider.
- *
- * @return Number of characters in string.
- *
- */
-size_t str_nlength(const char *str, size_t size)
+void *memmove(void *dst, const void *src, size_t n)
 {
-    size_t len = 0;
-    size_t offset = 0;
+    int i, j;
-    while (str_decode(str, &offset, size) != 0)
-        len++;
-    return len;
-}
+    if (src > dst)
+        return memcpy(dst, src, n);
-/** Get number of characters in a string with size limit.
- *
- * @param str  NULL-terminated string.
- * @param size Maximum number of bytes to consider.
- *
- * @return Number of characters in string.
- *
- */
-size_t wstr_nlength(const wchar_t *str, size_t size)
-{
-    size_t len = 0;
-    size_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
-    size_t offset = 0;
-    while ((offset < limit) && (*str++ != 0)) {
-        len++;
-        offset += sizeof(wchar_t);
-    }
-    return len;
-}
+    for (j = (n % sizeof(unsigned long)) - 1; j >= 0; j--)
+        ((unsigned char *) ((unsigned long *) dst))[j] = ((unsigned char *) ((unsigned long *) src))[j];
-/** Check whether character is plain ASCII.
- *
- * @return True if character is plain ASCII.
- *
- */
-bool ascii_check(wchar_t ch)
-{
-    if ((ch >= 0) && (ch <= 127))
-        return true;
-    return false;
+    for (i = n / sizeof(unsigned long) - 1; i >=0 ; i--)
+        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
+    return (char *) src;
 }
-/** Check whether character is valid
+/** Compare two memory areas.
  *
- * @return True if character is a valid Unicode code point.
- *
+ * @param s1    Pointer to the first area to compare.
+ * @param s2    Pointer to the second area to compare.
+ * @param len   Size of the first area in bytes. Both areas must have the same
+ *      length.
+ * @return  If len is 0, return zero. If the areas match, return zero.
+ *      Otherwise return non-zero.
  */
-bool chr_check(wchar_t ch)
+int bcmp(const char *s1, const char *s2, size_t len)
 {
-    if ((ch >= 0) && (ch <= 1114111))
-        return true;
-    return false;
+    for (; len && *s1++ == *s2++; len--)
+        ;
+    return len;
 }
-/** Compare two NULL terminated strings.
- *
- * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff they consist of the same
- * characters on the minimum of their lengths.
- *
- * @param s1 First string to compare.
- * @param s2 Second string to compare.
- *
- * @return 0 if the strings are equal, -1 if first is smaller,
- *         1 if second smaller.
- *
+/** Count the number of characters in the string, not including terminating 0.
+ * @param str string
+ * @return number of characters in string.
  */
-int str_cmp(const char *s1, const char *s2)
+size_t strlen(const char *str)
 {
-    wchar_t c1 = 0;
-    wchar_t c2 = 0;
-    size_t off1 = 0;
-    size_t off2 = 0;
+    size_t counter = 0;
-    while (true) {
-        c1 = str_decode(s1, &off1, STR_NO_LIMIT);
-        c2 = str_decode(s2, &off2, STR_NO_LIMIT);
+    while (str[counter] != 0)
+        counter++;
-        if (c1 < c2)
-            return -1;
-        if (c1 > c2)
-            return 1;
-        if (c1 == 0 || c2 == 0)
-            break;
-    }
-    return 0;
+    return counter;
 }
-/** Compare two NULL terminated strings with length limit.
- *
- * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff they consist of the same
- * characters on the minimum of their lengths and the length limit.
- *
- * @param s1      First string to compare.
- * @param s2      Second string to compare.
- * @param max_len Maximum number of characters to consider.
- *
- * @return 0 if the strings are equal, -1 if first is smaller,
- *         1 if second smaller.
- *
- */
-int str_lcmp(const char *s1, const char *s2, size_t max_len)
+int strcmp(const char *a, const char *b)
 {
-    wchar_t c1 = 0;
-    wchar_t c2 = 0;
+    int c = 0;
-    size_t off1 = 0;
-    size_t off2 = 0;
+    while (a[c] && b[c] && (!(a[c] - b[c])))
+        c++;
-    size_t len = 0;
-    while (true) {
-        if (len >= max_len)
-            break;
-        c1 = str_decode(s1, &off1, STR_NO_LIMIT);
-        c2 = str_decode(s2, &off2, STR_NO_LIMIT);
-        if (c1 < c2)
-            return -1;
-        if (c1 > c2)
-            return 1;
-        if (c1 == 0 || c2 == 0)
-            break;
-        ++len;
-    }
-    return 0;
-}
-/** Copy string.
- *
- * Copy source string @a src to destination buffer @a dest.
- * No more than @a size bytes are written. If the size of the output buffer
- * is at least one byte, the output string will always be well-formed, i.e.
- * null-terminated and containing only complete characters.
- *
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer (must be > 0).
- * @param src   Source string.
- */
-void str_cpy(char *dest, size_t size, const char *src)
-{
-    wchar_t ch;
-    size_t src_off;
-    size_t dest_off;
-    /* There must be space for a null terminator in the buffer. */
-    assert(size > 0);
+    return (a[c] - b[c]);
-    src_off = 0;
-    dest_off = 0;
-    while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) {
-        if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
-            break;
-    }
-    dest[dest_off] = '\0';
 }
-/** Copy size-limited substring.
- *
- * Copy prefix of string @a src of max. size @a size to destination buffer
- * @a dest. No more than @a size bytes are written. The output string will
- * always be well-formed, i.e. null-terminated and containing only complete
- * characters.
- *
- * No more than @a n bytes are read from the input string, so it does not
- * have to be null-terminated.
- *
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer (must be > 0).
- * @param src   Source string.
- * @param n Maximum number of bytes to read from @a src.
- */
-void str_ncpy(char *dest, size_t size, const char *src, size_t n)
+int strncmp(const char *a, const char *b, size_t n)
 {
-    wchar_t ch;
-    size_t src_off;
-    size_t dest_off;
+    size_t c = 0;
-    /* There must be space for a null terminator in the buffer. */
-    assert(size > 0);
+    while (c < n && a[c] && b[c] && (!(a[c] - b[c])))
+        c++;
-    src_off = 0;
-    dest_off = 0;
-    while ((ch = str_decode(src, &src_off, n)) != 0) {
-        if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
-            break;
-    }
-    dest[dest_off] = '\0';
+    return ( c < n ? a[c] - b[c] : 0);
 }
-/** Append one string to another.
- *
- * Append source string @a src to string in destination buffer @a dest.
- * Size of the destination buffer is @a dest. If the size of the output buffer
- * is at least one byte, the output string will always be well-formed, i.e.
- * null-terminated and containing only complete characters.
- *
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
- * @param src   Source string.
+/** Return pointer to the first occurence of character c in string
+ * @param str scanned string
+ * @param c searched character (taken as one byte)
+ * @return pointer to the matched character or NULL if it is not found in given string.
  */
-void str_append(char *dest, size_t size, const char *src)
+char *strchr(const char *str, int c)
 {
-    size_t dstr_size;
-    dstr_size = str_size(dest);
-    str_cpy(dest + dstr_size, size - dstr_size, src);
-}
-/** Copy NULL-terminated wide string to string
- *
- * Copy source wide string @a src to destination buffer @a dst.
- * No more than @a size bytes are written. NULL-terminator is always
- * written after the last succesfully copied character (i.e. if the
- * destination buffer is has at least 1 byte, it will be always
- * NULL-terminated).
- *
- * @param src   Source wide string.
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
- *
- */
-void wstr_nstr(char *dst, const wchar_t *src, size_t size)
-{
-    /* No space for the NULL-terminator in the buffer */
-    if (size == 0)
-        return;
-    wchar_t ch;
-    size_t src_idx = 0;
-    size_t dst_off = 0;
-    while ((ch = src[src_idx++]) != 0) {
-        if (chr_encode(ch, dst, &dst_off, size) != EOK)
-            break;
+    while (*str != '\0') {
+        if (*str == (char) c)
+            return (char *) str;
+        str++;
     }
-    if (dst_off >= size)
-        dst[size - 1] = 0;
-    else
-        dst[dst_off] = 0;
-}
-/** Find first occurence of character in string.
- *
- * @param str String to search.
- * @param ch  Character to look for.
- *
- * @return Pointer to character in @a str or NULL if not found.
- */
-char *str_chr(const char *str, wchar_t ch)
-{
-    wchar_t acc;
-    size_t off = 0;
-    size_t last = 0;
-    while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
-        if (acc == ch)
-            return (char *) (str + last);
-        last = off;
-    }
     return NULL;
 }
-/** Find last occurence of character in string.
- *
- * @param str String to search.
- * @param ch  Character to look for.
- *
- * @return Pointer to character in @a str or NULL if not found.
+/** Return pointer to the last occurence of character c in string
+ * @param str scanned string
+ * @param c searched character (taken as one byte)
+ * @return pointer to the matched character or NULL if it is not found in given string.
  */
-char *str_rchr(const char *str, wchar_t ch)
+char *strrchr(const char *str, int c)
 {
-    wchar_t acc;
-    size_t off = 0;
-    size_t last = 0;
-    const char *res = NULL;
-    while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
-        if (acc == ch)
-            res = (str + last);
-        last = off;
+    char *retval = NULL;
+    while (*str != '\0') {
+        if (*str == (char) c)
+            retval = (char *) str;
+        str++;
     }
-    return (char *) res;
-}
-/** Insert a wide character into a wide string.
- *
- * Insert a wide character into a wide string at position
- * @a pos. The characters after the position are shifted.
- *
- * @param str     String to insert to.
- * @param ch      Character to insert to.
- * @param pos     Character index where to insert.
- @ @param max_pos Characters in the buffer.
- *
- * @return True if the insertion was sucessful, false if the position
- *         is out of bounds.
- *
- */
-bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
-{
-    size_t len = wstr_length(str);
-    if ((pos > len) || (pos + 1 > max_pos))
-        return false;
-    size_t i;
-    for (i = len; i + 1 > pos; i--)
-        str[i + 1] = str[i];
-    str[pos] = ch;
-    return true;
+    return (char *) retval;
 }
-/** Remove a wide character from a wide string.
- *
- * Remove a wide character from a wide string at position
- * @a pos. The characters after the position are shifted.
- *
- * @param str String to remove from.
- * @param pos Character index to remove.
- *
- * @return True if the removal was sucessful, false if the position
- *         is out of bounds.
- *
- */
-bool wstr_remove(wchar_t *str, size_t pos)
-{
-    size_t len = wstr_length(str);
-    if (pos >= len)
-        return false;
-    size_t i;
-    for (i = pos + 1; i <= len; i++)
-        str[i - 1] = str[i];
-    return true;
-}
-int stricmp(const char *a, const char *b)
-{
-    int c = 0;
-    while (a[c] && b[c] && (!(tolower(a[c]) - tolower(b[c]))))
-        c++;
-    return (tolower(a[c]) - tolower(b[c]));
-}
 /** Convert string to a number.
  * Core of strtol and strtoul functions.
- *
- * @param nptr      Pointer to string.
- * @param endptr    If not NULL, function stores here pointer to the first
- *          invalid character.
- * @param base      Zero or number between 2 and 36 inclusive.
- * @param sgn       It's set to 1 if minus found.
- * @return      Result of conversion.
+ * @param nptr pointer to string
+ * @param endptr if not NULL, function stores here pointer to the first invalid character
+ * @param base zero or number between 2 and 36 inclusive
+ * @param sgn its set to 1 if minus found
+ * @return result of conversion.
  */
-static unsigned long
-_strtoul(const char *nptr, char **endptr, int base, char *sgn)
+static unsigned long _strtoul(const char *nptr, char **endptr, int base, char *sgn)
 {
     unsigned char c;
     unsigned long result = 0;
 ,8 → 219,7
             /* FIXME: set errno to EINVAL */
             return 0;
         }
-        if ((base == 16) && (*str == '0') && ((str[1] == 'x') ||
-            (str[1] == 'X'))) {
+        if ((base == 16) && (*str == '0') && ((str[1] == 'x') || (str[1] == 'X'))) {
             str += 2;
         }
     } else {
 ,8 → 238,7
     while (*str) {
         c = *str;
-        c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 :
-            (c <= '9' ? c - '0' : 0xff)));
+        c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 : (c <= '9' ? c - '0' : 0xff)));
         if (c > base) {
             break;
         }
 ,10 → 257,7
     }
     if (str == tmpptr) {
-        /*
-         * No number was found => first invalid character is the first
-         * character of the string.
-         */
+        /* no number was found => first invalid character is the first character of the string */
         /* FIXME: set errno to EINVAL */
         str = nptr;
         result = 0;
 ,17 → 275,14
 }
 /** Convert initial part of string to long int according to given base.
- * The number may begin with an arbitrary number of whitespaces followed by
- * optional sign (`+' or `-'). If the base is 0 or 16, the prefix `0x' may be
- * inserted and the number will be taken as hexadecimal one. If the base is 0
- * and the number begin with a zero, number will be taken as octal one (as with
- * base 8). Otherwise the base 0 is taken as decimal.
- *
- * @param nptr      Pointer to string.
- * @param endptr    If not NULL, function stores here pointer to the first
- *          invalid character.
- * @param base      Zero or number between 2 and 36 inclusive.
- * @return      Result of conversion.
+ * The number may begin with an arbitrary number of whitespaces followed by optional sign (`+' or `-').
+ * If the base is 0 or 16, the prefix `0x' may be inserted and the number will be taken as hexadecimal one.
+ * If the base is 0 and the number begin with a zero, number will be taken as octal one (as with base 8).
+ * Otherwise the base 0 is taken as decimal.
+ * @param nptr pointer to string
+ * @param endptr if not NULL, function stores here pointer to the first invalid character
+ * @param base zero or number between 2 and 36 inclusive
+ * @return result of conversion.
  */
 long int strtol(const char *nptr, char **endptr, int base)
 {
 ,17 → 305,14
 /** Convert initial part of string to unsigned long according to given base.
- * The number may begin with an arbitrary number of whitespaces followed by
- * optional sign (`+' or `-'). If the base is 0 or 16, the prefix `0x' may be
- * inserted and the number will be taken as hexadecimal one. If the base is 0
- * and the number begin with a zero, number will be taken as octal one (as with
- * base 8). Otherwise the base 0 is taken as decimal.
- *
- * @param nptr      Pointer to string.
- * @param endptr    If not NULL, function stores here pointer to the first
- *          invalid character
- * @param base      Zero or number between 2 and 36 inclusive.
- * @return      Result of conversion.
+ * The number may begin with an arbitrary number of whitespaces followed by optional sign (`+' or `-').
+ * If the base is 0 or 16, the prefix `0x' may be inserted and the number will be taken as hexadecimal one.
+ * If the base is 0 and the number begin with a zero, number will be taken as octal one (as with base 8).
+ * Otherwise the base 0 is taken as decimal.
+ * @param nptr pointer to string
+ * @param endptr if not NULL, function stores here pointer to the first invalid character
+ * @param base zero or number between 2 and 36 inclusive
+ * @return result of conversion.
  */
 unsigned long strtoul(const char *nptr, char **endptr, int base)
 {
 ,48 → 324,21
     return (sgn ? -number : number);
 }
-char *str_dup(const char *src)
+char *strcpy(char *dest, const char *src)
 {
-    size_t size = str_size(src);
-    void *dest = malloc(size + 1);
-    if (dest == NULL)
-        return (char *) NULL;
-    return (char *) memcpy(dest, src, size + 1);
+    char *orig = dest;
+    while ((*(dest++) = *(src++)));
+    return orig;
 }
-char *strtok(char *s, const char *delim)
+char *strncpy(char *dest, const char *src, size_t n)
 {
-    static char *next;
-    return strtok_r(s, delim, &next);
+    char *orig = dest;
+    while ((*(dest++) = *(src++)) && --n);
+    return orig;
 }
-char *strtok_r(char *s, const char *delim, char **next)
-{
-    char *start, *end;
-    if (s == NULL)
-        s = *next;
-    /* Skip over leading delimiters. */
-    while (*s && (str_chr(delim, *s) != NULL)) ++s;
-    start = s;
-    /* Skip over token characters. */
-    while (*s && (str_chr(delim, *s) == NULL)) ++s;
-    end = s;
-    *next = (*s ? s + 1 : s);
-    if (start == end) {
-        return NULL;    /* No more tokens. */
-    }
-    /* Overwrite delimiter with NULL terminator. */
-    *end = '\0';
-    return start;
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/async.c
 ,65 → 30,64
  * @{
  */
 /** @file
- */
+ */
 /**
  * Asynchronous library
  *
- * The aim of this library is to provide a facility for writing programs which
- * utilize the asynchronous nature of HelenOS IPC, yet using a normal way of
- * programming.
+ * The aim of this library is facilitating writing programs utilizing the
+ * asynchronous nature of HelenOS IPC, yet using a normal way of programming.
  *
  * You should be able to write very simple multithreaded programs, the async
  * framework will automatically take care of most synchronization problems.
  *
  * Default semantics:
- * - async_send_*(): Send asynchronously. If the kernel refuses to send
- *                   more messages, [ try to get responses from kernel, if
- *                   nothing found, might try synchronous ]
+ * - async_send_*():    send asynchronously. If the kernel refuses to send
+ *          more messages, [ try to get responses from kernel, if
+ *          nothing found, might try synchronous ]
  *
  * Example of use (pseudo C):
- *
+ *
  * 1) Multithreaded client application
  *
- *   fibril_create(fibril1, ...);
- *   fibril_create(fibril2, ...);
- *   ...
+ * fibril_create(fibril1, ...);
+ * fibril_create(fibril2, ...);
+ * ...
+ *
+ * int fibril1(void *arg)
+ * {
+ *  conn = ipc_connect_me_to();
+ *  c1 = async_send(conn);
+ *  c2 = async_send(conn);
+ *  async_wait_for(c1);
+ *  async_wait_for(c2);
+ *  ...
+ * }
  *
- *   int fibril1(void *arg)
- *   {
- *     conn = ipc_connect_me_to();
- *     c1 = async_send(conn);
- *     c2 = async_send(conn);
- *     async_wait_for(c1);
- *     async_wait_for(c2);
- *     ...
- *   }
  *
- *
  * 2) Multithreaded server application
+ * main()
+ * {
+ *  async_manager();
+ * }
+ *
  *
- *   main()
- *   {
- *     async_manager();
- *   }
+ * my_client_connection(icallid, *icall)
+ * {
+ *  if (want_refuse) {
+ *      ipc_answer_0(icallid, ELIMIT);
+ *      return;
+ *  }
+ *  ipc_answer_0(icallid, EOK);
  *
- *   my_client_connection(icallid, *icall)
- *   {
- *     if (want_refuse) {
- *       ipc_answer_0(icallid, ELIMIT);
- *       return;
- *     }
- *     ipc_answer_0(icallid, EOK);
+ *  callid = async_get_call(&call);
+ *  handle_call(callid, call);
+ *  ipc_answer_2(callid, 1, 2, 3);
  *
- *     callid = async_get_call(&call);
- *     handle_call(callid, call);
- *     ipc_answer_2(callid, 1, 2, 3);
+ *  callid = async_get_call(&call);
+ *  ....
+ * }
  *
- *     callid = async_get_call(&call);
- *     ...
- *   }
- *
  */
 #include <futex.h>
 ,8 → 94,8
 #include <async.h>
 #include <fibril.h>
 #include <stdio.h>
-#include <adt/hash_table.h>
-#include <adt/list.h>
+#include <libadt/hash_table.h>
+#include <libadt/list.h>
 #include <ipc/ipc.h>
 #include <assert.h>
 #include <errno.h>
 ,26 → 104,24
 #include <bool.h>
 atomic_t async_futex = FUTEX_INITIALIZER;
+static hash_table_t conn_hash_table;
+static LIST_INITIALIZE(timeout_list);
 /** Structures of this type represent a waiting fibril. */
 typedef struct {
     /** Expiration time. */
-    struct timeval expires;
+    struct timeval expires;
     /** If true, this struct is in the timeout list. */
-    bool inlist;
+    int inlist;
     /** Timeout list link. */
     link_t link;
     /** Identification of and link to the waiting fibril. */
     fid_t fid;
     /** If true, this fibril is currently active. */
-    bool active;
+    int active;
     /** If true, we have timed out. */
-    bool timedout;
+    int timedout;
 } awaiter_t;
 typedef struct {
 ,11 → 128,10
     awaiter_t wdata;
     /** If reply was received. */
-    bool done;
+    int done;
     /** Pointer to where the answer data is stored. */
-    ipc_call_t *dataptr;
+    ipc_call_t *dataptr;
     ipcarg_t retval;
 } amsg_t;
 ,31 → 147,37
 typedef struct {
     awaiter_t wdata;
     /** Hash table link. */
     link_t link;
     /** Incoming phone hash. */
-    ipcarg_t in_phone_hash;
+    ipcarg_t in_phone_hash;
     /** Messages that should be delivered to this fibril. */
-    link_t msg_queue;
+    link_t msg_queue;
     /** Identification of the opening call. */
     ipc_callid_t callid;
     /** Call data of the opening call. */
     ipc_call_t call;
     /** Identification of the closing call. */
     ipc_callid_t close_callid;
     /** Fibril function that will be used to handle the connection. */
     void (*cfibril)(ipc_callid_t, ipc_call_t *);
 } connection_t;
 /** Identifier of the incoming connection handled by the current fibril. */
-fibril_local connection_t *FIBRIL_connection;
+__thread connection_t *FIBRIL_connection;
+/**
+ * If true, it is forbidden to use async_req functions and all preemption is
+ * disabled.
+ */
+__thread int _in_interrupt_handler;
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
 ,7 → 185,6
  * Pointer to a fibril function that will be used to handle connections.
  */
 static async_client_conn_t client_connection = default_client_connection;
 /**
  * Pointer to a fibril function that will be used to handle interrupt
  * notifications.
 ,37 → 191,46
  */
 static async_client_conn_t interrupt_received = default_interrupt_received;
-static hash_table_t conn_hash_table;
-static LIST_INITIALIZE(timeout_list);
+/*
+ * Getter for _in_interrupt_handler. We need to export the value of this thread
+ * local variable to other modules, but the binutils 2.18 linkers die on an
+ * attempt to export this symbol in the header file. For now, consider this as a
+ * workaround.
+ */
+bool in_interrupt_handler(void)
+{
+    return _in_interrupt_handler;
+}
-#define CONN_HASH_TABLE_CHAINS  32
+#define CONN_HASH_TABLE_CHAINS  32
 /** Compute hash into the connection hash table based on the source phone hash.
  *
- * @param key Pointer to source phone hash.
+ * @param key       Pointer to source phone hash.
  *
- * @return Index into the connection hash table.
- *
+ * @return      Index into the connection hash table.
  */
 static hash_index_t conn_hash(unsigned long *key)
 {
     assert(key);
-    return (((*key) >> 4) % CONN_HASH_TABLE_CHAINS);
+    return ((*key) >> 4) % CONN_HASH_TABLE_CHAINS;
 }
 /** Compare hash table item with a key.
  *
- * @param key  Array containing the source phone hash as the only item.
- * @param keys Expected 1 but ignored.
- * @param item Connection hash table item.
+ * @param key       Array containing the source phone hash as the only item.
+ * @param keys      Expected 1 but ignored.
+ * @param item      Connection hash table item.
  *
- * @return True on match, false otherwise.
- *
+ * @return      True on match, false otherwise.
  */
 static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-    connection_t *hs = hash_table_get_instance(item, connection_t, link);
-    return (key[0] == hs->in_phone_hash);
+    connection_t *hs;
+    hs = hash_table_get_instance(item, connection_t, link);
+    return key[0] == hs->in_phone_hash;
 }
 /** Connection hash table removal callback function.
 ,8 → 238,7
  * This function is called whenever a connection is removed from the connection
  * hash table.
  *
- * @param item Connection hash table item being removed.
- *
+ * @param item      Connection hash table item being removed.
  */
 static void conn_remove(link_t *item)
 {
 ,24 → 255,23
 /** Sort in current fibril's timeout request.
  *
- * @param wd Wait data of the current fibril.
- *
+ * @param wd        Wait data of the current fibril.
  */
 static void insert_timeout(awaiter_t *wd)
 {
-    wd->timedout = false;
-    wd->inlist = true;
-    link_t *tmp = timeout_list.next;
+    link_t *tmp;
+    awaiter_t *cur;
+    wd->timedout = 0;
+    wd->inlist = 1;
+    tmp = timeout_list.next;
     while (tmp != &timeout_list) {
-        awaiter_t *cur = list_get_instance(tmp, awaiter_t, link);
+        cur = list_get_instance(tmp, awaiter_t, link);
         if (tv_gteq(&cur->expires, &wd->expires))
             break;
         tmp = tmp->next;
     }
     list_append(&wd->link, tmp);
 }
 ,146 → 281,93
  * its message queue. If the fibril was not active, it is activated and all
  * timeouts are unregistered.
  *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
+ * @param callid    Hash of the incoming call.
+ * @param call      Data of the incoming call.
  *
- * @return False if the call doesn't match any connection.
- *         True if the call was passed to the respective connection fibril.
- *
+ * @return      Zero if the call doesn't match any connection.
+ *          One if the call was passed to the respective connection
+ *          fibril.
  */
-static bool route_call(ipc_callid_t callid, ipc_call_t *call)
+static int route_call(ipc_callid_t callid, ipc_call_t *call)
 {
+    connection_t *conn;
+    msg_t *msg;
+    link_t *hlp;
+    unsigned long key;
     futex_down(&async_futex);
-    unsigned long key = call->in_phone_hash;
-    link_t *hlp = hash_table_find(&conn_hash_table, &key);
+    key = call->in_phone_hash;
+    hlp = hash_table_find(&conn_hash_table, &key);
     if (!hlp) {
         futex_up(&async_futex);
-        return false;
+        return 0;
     }
-    connection_t *conn = hash_table_get_instance(hlp, connection_t, link);
-    msg_t *msg = malloc(sizeof(*msg));
-    if (!msg) {
-        futex_up(&async_futex);
-        return false;
-    }
+    conn = hash_table_get_instance(hlp, connection_t, link);
+    msg = malloc(sizeof(*msg));
     msg->callid = callid;
     msg->call = *call;
     list_append(&msg->link, &conn->msg_queue);
     if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP)
         conn->close_callid = callid;
     /* If the connection fibril is waiting for an event, activate it */
     if (!conn->wdata.active) {
         /* If in timeout list, remove it */
         if (conn->wdata.inlist) {
-            conn->wdata.inlist = false;
+            conn->wdata.inlist = 0;
             list_remove(&conn->wdata.link);
         }
-        conn->wdata.active = true;
+        conn->wdata.active = 1;
         fibril_add_ready(conn->wdata.fid);
     }
     futex_up(&async_futex);
-    return true;
-}
-/** Notification fibril.
- *
- * When a notification arrives, a fibril with this implementing function is
- * created. It calls interrupt_received() and does the final cleanup.
- *
- * @param arg Message structure pointer.
- *
- * @return Always zero.
- *
- */
-static int notification_fibril(void *arg)
-{
-    msg_t *msg = (msg_t *) arg;
-    interrupt_received(msg->callid, &msg->call);
-    free(msg);
-    return 0;
+    return 1;
 }
-/** Process interrupt notification.
- *
- * A new fibril is created which would process the notification.
- *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
- * @return False if an error occured.
- *         True if the call was passed to the notification fibril.
- *
- */
-static bool process_notification(ipc_callid_t callid, ipc_call_t *call)
-{
-    futex_down(&async_futex);
-    msg_t *msg = malloc(sizeof(*msg));
-    if (!msg) {
-        futex_up(&async_futex);
-        return false;
-    }
-    msg->callid = callid;
-    msg->call = *call;
-    fid_t fid = fibril_create(notification_fibril, msg);
-    fibril_add_ready(fid);
-    futex_up(&async_futex);
-    return true;
-}
 /** Return new incoming message for the current (fibril-local) connection.
  *
- * @param call  Storage where the incoming call data will be stored.
- * @param usecs Timeout in microseconds. Zero denotes no timeout.
+ * @param call      Storage where the incoming call data will be stored.
+ * @param usecs     Timeout in microseconds. Zero denotes no timeout.
  *
- * @return If no timeout was specified, then a hash of the
- *         incoming call is returned. If a timeout is specified,
- *         then a hash of the incoming call is returned unless
- *         the timeout expires prior to receiving a message. In
- *         that case zero is returned.
- *
+ * @return      If no timeout was specified, then a hash of the
+ *          incoming call is returned. If a timeout is specified,
+ *          then a hash of the incoming call is returned unless
+ *          the timeout expires prior to receiving a message. In
+ *          that case zero is returned.
  */
 ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs)
 {
+    msg_t *msg;
+    ipc_callid_t callid;
+    connection_t *conn;
     assert(FIBRIL_connection);
-    /* Why doing this?
-     * GCC 4.1.0 coughs on FIBRIL_connection-> dereference.
+    /* GCC 4.1.0 coughs on FIBRIL_connection-> dereference,
      * GCC 4.1.1 happilly puts the rdhwr instruction in delay slot.
-     *           I would never expect to find so many errors in
-     *           a compiler.
+     *           I would never expect to find so many errors in
+     *           a compiler *($&$(*&$
      */
-    connection_t *conn = FIBRIL_connection;
+    conn = FIBRIL_connection;
     futex_down(&async_futex);
     if (usecs) {
         gettimeofday(&conn->wdata.expires, NULL);
         tv_add(&conn->wdata.expires, usecs);
-    } else
-        conn->wdata.inlist = false;
+    } else {
+        conn->wdata.inlist = 0;
+    }
     /* If nothing in queue, wait until something arrives */
     while (list_empty(&conn->msg_queue)) {
         if (usecs)
             insert_timeout(&conn->wdata);
-        conn->wdata.active = false;
+        conn->wdata.active = 0;
         /*
          * Note: the current fibril will be rescheduled either due to a
          * timeout or due to an arriving message destined to it. In the
 ,14 → 375,13
          * case, route_call() will perform the wakeup.
          */
         fibril_switch(FIBRIL_TO_MANAGER);
         /*
-         * Futex is up after getting back from async_manager.
-         * Get it again.
+         * Futex is up after getting back from async_manager get it
+         * again.
          */
         futex_down(&async_futex);
-        if ((usecs) && (conn->wdata.timedout)
-            && (list_empty(&conn->msg_queue))) {
+        if (usecs && conn->wdata.timedout &&
+            list_empty(&conn->msg_queue)) {
             /* If we timed out -> exit */
             futex_up(&async_futex);
             return 0;
 ,10 → 388,9
         }
     }
-    msg_t *msg = list_get_instance(conn->msg_queue.next, msg_t, link);
+    msg = list_get_instance(conn->msg_queue.next, msg_t, link);
     list_remove(&msg->link);
-    ipc_callid_t callid = msg->callid;
+    callid = msg->callid;
     *call = msg->call;
     free(msg);
 ,9 → 402,8
  *
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
+ * @param callid    Hash of the incoming call.
+ * @param call      Data of the incoming call.
  */
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
 {
 ,11 → 412,8
 /** Default fibril function that gets called to handle interrupt notifications.
  *
- * This function is defined as a weak symbol - to be redefined in user code.
- *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
+ * @param callid    Hash of the incoming call.
+ * @param call      Data of the incoming call.
  */
 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
 ,17 → 424,17
  * When a new connection arrives, a fibril with this implementing function is
  * created. It calls client_connection() and does the final cleanup.
  *
- * @param arg Connection structure pointer.
+ * @param arg       Connection structure pointer.
  *
- * @return Always zero.
- *
+ * @return      Always zero.
  */
-static int connection_fibril(void *arg)
+static int connection_fibril(void  *arg)
 {
-    /*
-     * Setup fibril-local connection pointer and call client_connection().
-     *
-     */
+    unsigned long key;
+    msg_t *msg;
+    int close_answered = 0;
+    /* Setup fibril-local connection pointer */
     FIBRIL_connection = (connection_t *) arg;
     FIBRIL_connection->cfibril(FIBRIL_connection->callid,
         &FIBRIL_connection->call);
 ,21 → 441,20
     /* Remove myself from the connection hash table */
     futex_down(&async_futex);
-    unsigned long key = FIBRIL_connection->in_phone_hash;
+    key = FIBRIL_connection->in_phone_hash;
     hash_table_remove(&conn_hash_table, &key, 1);
     futex_up(&async_futex);
     /* Answer all remaining messages with EHANGUP */
     while (!list_empty(&FIBRIL_connection->msg_queue)) {
-        msg_t *msg;
         msg = list_get_instance(FIBRIL_connection->msg_queue.next,
             msg_t, link);
         list_remove(&msg->link);
+        if (msg->callid == FIBRIL_connection->close_callid)
+            close_answered = 1;
         ipc_answer_0(msg->callid, EHANGUP);
         free(msg);
     }
     if (FIBRIL_connection->close_callid)
         ipc_answer_0(FIBRIL_connection->close_callid, EOK);
 ,45 → 463,43
 /** Create a new fibril for a new connection.
  *
- * Create new fibril for connection, fill in connection structures and inserts
+ * Creates new fibril for connection, fills in connection structures and inserts
  * it into the hash table, so that later we can easily do routing of messages to
  * particular fibrils.
  *
- * @param in_phone_hash Identification of the incoming connection.
- * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
- *                      If callid is zero, the connection was opened by
- *                      accepting the IPC_M_CONNECT_TO_ME call and this function
- *                      is called directly by the server.
- * @param call          Call data of the opening call.
- * @param cfibril       Fibril function that should be called upon opening the
- *                      connection.
+ * @param in_phone_hash Identification of the incoming connection.
+ * @param callid    Hash of the opening IPC_M_CONNECT_ME_TO call.
+ *          If callid is zero, the connection was opened by
+ *          accepting the IPC_M_CONNECT_TO_ME call and this function
+ *          is called directly by the server.
+ * @param call      Call data of the opening call.
+ * @param cfibril   Fibril function that should be called upon opening the
+ *          connection.
  *
- * @return New fibril id or NULL on failure.
- *
+ * @return      New fibril id or NULL on failure.
  */
 fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
 {
-    connection_t *conn = malloc(sizeof(*conn));
+    connection_t *conn;
+    unsigned long key;
+    conn = malloc(sizeof(*conn));
     if (!conn) {
         if (callid)
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     }
     conn->in_phone_hash = in_phone_hash;
     list_initialize(&conn->msg_queue);
     conn->callid = callid;
-    conn->close_callid = false;
+    conn->close_callid = 0;
     if (call)
         conn->call = *call;
-    /* We will activate the fibril ASAP */
-    conn->wdata.active = true;
+    conn->wdata.active = 1; /* We will activate the fibril ASAP */
     conn->cfibril = cfibril;
     conn->wdata.fid = fibril_create(connection_fibril, conn);
     if (!conn->wdata.fid) {
         free(conn);
         if (callid)
 ,16 → 506,14
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     }
     /* Add connection to the connection hash table */
-    unsigned long key = conn->in_phone_hash;
+    key = conn->in_phone_hash;
     futex_down(&async_futex);
     hash_table_insert(&conn_hash_table, &key, &conn->link);
     futex_up(&async_futex);
     fibril_add_ready(conn->wdata.fid);
     return conn->wdata.fid;
 }
 ,37 → 522,33
  * If the call has the IPC_M_CONNECT_ME_TO method, a new connection is created.
  * Otherwise the call is routed to its connection fibril.
  *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
+ * @param callid    Hash of the incoming call.
+ * @param call      Data of the incoming call.
  */
 static void handle_call(ipc_callid_t callid, ipc_call_t *call)
 {
     /* Unrouted call - do some default behaviour */
     if ((callid & IPC_CALLID_NOTIFICATION)) {
-        process_notification(callid, call);
-        goto out;
-    }
+        _in_interrupt_handler = 1;
+        (*interrupt_received)(callid, call);
+        _in_interrupt_handler = 0;
+        return;
+    }
     switch (IPC_GET_METHOD(*call)) {
-    case IPC_M_CONNECT_ME:
     case IPC_M_CONNECT_ME_TO:
         /* Open new connection with fibril etc. */
         async_new_connection(IPC_GET_ARG5(*call), callid, call,
             client_connection);
-        goto out;
+        return;
     }
     /* Try to route the call through the connection hash table */
     if (route_call(callid, call))
-        goto out;
+        return;
     /* Unknown call from unknown phone - hang it up */
     ipc_answer_0(callid, EHANGUP);
-    return;
-out:
-    ;
 }
 /** Fire all timeouts that expired. */
 ,44 → 555,47
 static void handle_expired_timeouts(void)
 {
     struct timeval tv;
+    awaiter_t *waiter;
+    link_t *cur;
     gettimeofday(&tv, NULL);
     futex_down(&async_futex);
-    link_t *cur = timeout_list.next;
+    cur = timeout_list.next;
     while (cur != &timeout_list) {
-        awaiter_t *waiter = list_get_instance(cur, awaiter_t, link);
+        waiter = list_get_instance(cur, awaiter_t, link);
         if (tv_gt(&waiter->expires, &tv))
             break;
         cur = cur->next;
         list_remove(&waiter->link);
-        waiter->inlist = false;
-        waiter->timedout = true;
+        waiter->inlist = 0;
+        waiter->timedout = 1;
         /*
-         * Redundant condition?
-         * The fibril should not be active when it gets here.
+         * Redundant condition?
+         * The fibril should not be active when it gets here.
          */
         if (!waiter->active) {
-            waiter->active = true;
+            waiter->active = 1;
             fibril_add_ready(waiter->fid);
         }
     }
     futex_up(&async_futex);
 }
 /** Endless loop dispatching incoming calls and answers.
  *
- * @return Never returns.
- *
+ * @return      Never returns.
  */
 static int async_manager_worker(void)
 {
-    while (true) {
+    ipc_call_t call;
+    ipc_callid_t callid;
+    int timeout;
+    awaiter_t *waiter;
+    struct timeval tv;
+    while (1) {
         if (fibril_switch(FIBRIL_FROM_MANAGER)) {
             futex_up(&async_futex);
             /*
 ,17 → 604,11
              */
             continue;
         }
         futex_down(&async_futex);
-        suseconds_t timeout;
         if (!list_empty(&timeout_list)) {
-            awaiter_t *waiter = list_get_instance(timeout_list.next,
-                awaiter_t, link);
-            struct timeval tv;
+            waiter = list_get_instance(timeout_list.next, awaiter_t,
+                link);
             gettimeofday(&tv, NULL);
             if (tv_gteq(&tv, &waiter->expires)) {
                 futex_up(&async_futex);
                 handle_expired_timeouts();
 ,21 → 617,19
                 timeout = tv_sub(&waiter->expires, &tv);
         } else
             timeout = SYNCH_NO_TIMEOUT;
         futex_up(&async_futex);
-        ipc_call_t call;
-        ipc_callid_t callid = ipc_wait_cycle(&call, timeout,
-            SYNCH_FLAGS_NONE);
+        callid = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE);
         if (!callid) {
             handle_expired_timeouts();
             continue;
         }
-        if (callid & IPC_CALLID_ANSWERED)
+        if (callid & IPC_CALLID_ANSWERED) {
             continue;
+        }
         handle_call(callid, &call);
     }
 ,17 → 637,16
 }
 /** Function to start async_manager as a standalone fibril.
- *
+ *
  * When more kernel threads are used, one async manager should exist per thread.
  *
- * @param arg Unused.
- * @return Never returns.
+ * @param arg       Unused.
  *
+ * @return      Never returns.
  */
 static int async_manager_fibril(void *arg)
 {
     futex_up(&async_futex);
     /*
      * async_futex is always locked when entering manager
      */
 ,7 → 658,9
 /** Add one manager to manager list. */
 void async_create_manager(void)
 {
-    fid_t fid = fibril_create(async_manager_fibril, NULL);
+    fid_t fid;
+    fid = fibril_create(async_manager_fibril, NULL);
     fibril_add_manager(fid);
 }
 ,9 → 672,9
 /** Initialize the async framework.
  *
- * @return Zero on success or an error code.
+ * @return      Zero on success or an error code.
  */
-int __async_init(void)
+int _async_init(void)
 {
     if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_CHAINS, 1,
         &conn_hash_table_ops)) {
 ,33 → 692,30
  *
  * Notify the fibril which is waiting for this message that it has arrived.
  *
- * @param arg    Pointer to the asynchronous message record.
- * @param retval Value returned in the answer.
- * @param data   Call data of the answer.
+ * @param private   Pointer to the asynchronous message record.
+ * @param retval    Value returned in the answer.
+ * @param data      Call data of the answer.
  */
-static void reply_received(void *arg, int retval, ipc_call_t *data)
+static void reply_received(void *private, int retval, ipc_call_t *data)
 {
+    amsg_t *msg = (amsg_t *) private;
+    msg->retval = retval;
     futex_down(&async_futex);
-    amsg_t *msg = (amsg_t *) arg;
-    msg->retval = retval;
     /* Copy data after futex_down, just in case the call was detached */
-    if ((msg->dataptr) && (data))
-        *msg->dataptr = *data;
+    if (msg->dataptr)
+        *msg->dataptr = *data;
     write_barrier();
     /* Remove message from timeout list */
     if (msg->wdata.inlist)
         list_remove(&msg->wdata.link);
-    msg->done = true;
+    msg->done = 1;
     if (!msg->wdata.active) {
-        msg->wdata.active = true;
+        msg->wdata.active = 1;
         fibril_add_ready(msg->wdata.fid);
     }
     futex_up(&async_futex);
 }
 ,36 → 724,38
  * The return value can be used as input for async_wait() to wait for
  * completion.
  *
- * @param phoneid Handle of the phone that will be used for the send.
- * @param method  Service-defined method.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param arg4    Service-defined payload argument.
- * @param dataptr If non-NULL, storage where the reply data will be
- *                stored.
+ * @param phoneid   Handle of the phone that will be used for the send.
+ * @param method    Service-defined method.
+ * @param arg1      Service-defined payload argument.
+ * @param arg2      Service-defined payload argument.
+ * @param arg3      Service-defined payload argument.
+ * @param arg4      Service-defined payload argument.
+ * @param dataptr   If non-NULL, storage where the reply data will be
+ *          stored.
  *
- * @return Hash of the sent message or 0 on error.
- *
+ * @return      Hash of the sent message.
  */
 aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
 {
-    amsg_t *msg = malloc(sizeof(*msg));
-    if (!msg)
-        return 0;
-    msg->done = false;
+    amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot send asynchronous request in interrupt "
+            "handler.\n");
+        _exit(1);
+    }
+    msg = malloc(sizeof(*msg));
+    msg->done = 0;
     msg->dataptr = dataptr;
-    msg->wdata.inlist = false;
     /* We may sleep in the next method, but it will use its own mechanism */
-    msg->wdata.active = true;
+    msg->wdata.active = 1;
     ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg,
-        reply_received, true);
+        reply_received, 1);
     return (aid_t) msg;
 }
 ,119 → 764,113
  * The return value can be used as input for async_wait() to wait for
  * completion.
  *
- * @param phoneid Handle of the phone that will be used for the send.
- * @param method  Service-defined method.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param arg4    Service-defined payload argument.
- * @param arg5    Service-defined payload argument.
- * @param dataptr If non-NULL, storage where the reply data will be
- *                stored.
+ * @param phoneid   Handle of the phone that will be used for the send.
+ * @param method    Service-defined method.
+ * @param arg1      Service-defined payload argument.
+ * @param arg2      Service-defined payload argument.
+ * @param arg3      Service-defined payload argument.
+ * @param arg4      Service-defined payload argument.
+ * @param arg5      Service-defined payload argument.
+ * @param dataptr   If non-NULL, storage where the reply data will be
+ *          stored.
  *
- * @return Hash of the sent message or 0 on error.
- *
+ * @return      Hash of the sent message.
  */
 aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
     ipc_call_t *dataptr)
 {
-    amsg_t *msg = malloc(sizeof(*msg));
-    if (!msg)
-        return 0;
-    msg->done = false;
+    amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot send asynchronous request in interrupt "
+            "handler.\n");
+        _exit(1);
+    }
+    msg = malloc(sizeof(*msg));
+    msg->done = 0;
     msg->dataptr = dataptr;
-    msg->wdata.inlist = false;
     /* We may sleep in next method, but it will use its own mechanism */
-    msg->wdata.active = true;
+    msg->wdata.active = 1;
     ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg,
-        reply_received, true);
+        reply_received, 1);
     return (aid_t) msg;
 }
 /** Wait for a message sent by the async framework.
  *
- * @param amsgid Hash of the message to wait for.
- * @param retval Pointer to storage where the retval of the answer will
- *               be stored.
- *
+ * @param amsgid    Hash of the message to wait for.
+ * @param retval    Pointer to storage where the retval of the answer will
+ *          be stored.
  */
 void async_wait_for(aid_t amsgid, ipcarg_t *retval)
 {
     amsg_t *msg = (amsg_t *) amsgid;
     futex_down(&async_futex);
     if (msg->done) {
         futex_up(&async_futex);
         goto done;
     }
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = false;
-    msg->wdata.inlist = false;
+    msg->wdata.active = 0;
+    msg->wdata.inlist = 0;
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* Futex is up automatically after fibril_switch */
+    /* futex is up automatically after fibril_switch...*/
 done:
     if (retval)
         *retval = msg->retval;
     free(msg);
 }
 /** Wait for a message sent by the async framework, timeout variant.
  *
- * @param amsgid  Hash of the message to wait for.
- * @param retval  Pointer to storage where the retval of the answer will
- *                be stored.
- * @param timeout Timeout in microseconds.
+ * @param amsgid    Hash of the message to wait for.
+ * @param retval    Pointer to storage where the retval of the answer will
+ *          be stored.
+ * @param timeout   Timeout in microseconds.
  *
- * @return Zero on success, ETIMEOUT if the timeout has expired.
- *
+ * @return      Zero on success, ETIMEOUT if the timeout has expired.
  */
 int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout)
 {
     amsg_t *msg = (amsg_t *) amsgid;
     /* TODO: Let it go through the event read at least once */
     if (timeout < 0)
         return ETIMEOUT;
     futex_down(&async_futex);
     if (msg->done) {
         futex_up(&async_futex);
         goto done;
     }
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = false;
+    msg->wdata.active = 0;
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* Futex is up automatically after fibril_switch */
+    /* futex is up automatically after fibril_switch...*/
     if (!msg->done)
         return ETIMEOUT;
 done:
     if (retval)
         *retval = msg->retval;
     free(msg);
     return 0;
 }
 ,38 → 878,38
  *
  * The current fibril is suspended but the thread continues to execute.
  *
- * @param timeout Duration of the wait in microseconds.
- *
+ * @param timeout   Duration of the wait in microseconds.
  */
 void async_usleep(suseconds_t timeout)
 {
-    amsg_t *msg = malloc(sizeof(*msg));
+    amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot call async_usleep in interrupt handler.\n");
+        _exit(1);
+    }
+    msg = malloc(sizeof(*msg));
     if (!msg)
         return;
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = false;
+    msg->wdata.active = 0;
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     futex_down(&async_futex);
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* Futex is up automatically after fibril_switch() */
+    /* futex is up automatically after fibril_switch()...*/
     free(msg);
 }
 /** Setter for client_connection function pointer.
  *
- * @param conn Function that will implement a new connection fibril.
- *
+ * @param conn      Function that will implement a new connection fibril.
  */
 void async_set_client_connection(async_client_conn_t conn)
 {
 ,12 → 918,12
 /** Setter for interrupt_received function pointer.
  *
- * @param intr Function that will implement a new interrupt
- *             notification fibril.
+ * @param conn      Function that will implement a new interrupt
+ *          notification fibril.
  */
-void async_set_interrupt_received(async_client_conn_t intr)
+void async_set_interrupt_received(async_client_conn_t conn)
 {
-    interrupt_received = intr;
+    interrupt_received = conn;
 }
 /** Pseudo-synchronous message sending - fast version.
 ,20 → 933,18
  * This function can only transfer 4 register payload arguments. For
  * transferring more arguments, see the slower async_req_slow().
  *
- * @param phoneid Hash of the phone through which to make the call.
- * @param method  Method of the call.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param arg4    Service-defined payload argument.
- * @param r1      If non-NULL, storage for the 1st reply argument.
- * @param r2      If non-NULL, storage for the 2nd reply argument.
- * @param r3      If non-NULL, storage for the 3rd reply argument.
- * @param r4      If non-NULL, storage for the 4th reply argument.
- * @param r5      If non-NULL, storage for the 5th reply argument.
- *
- * @return Return code of the reply or a negative error code.
- *
+ * @param phoneid   Hash of the phone through which to make the call.
+ * @param method    Method of the call.
+ * @param arg1      Service-defined payload argument.
+ * @param arg2      Service-defined payload argument.
+ * @param arg3      Service-defined payload argument.
+ * @param arg4      Service-defined payload argument.
+ * @param r1        If non-NULL, storage for the 1st reply argument.
+ * @param r2        If non-NULL, storage for the 2nd reply argument.
+ * @param r3        If non-NULL, storage for the 3rd reply argument.
+ * @param r4        If non-NULL, storage for the 4th reply argument.
+ * @param r5        If non-NULL, storage for the 5th reply argument.
+ * @return      Return code of the reply or a negative error code.
  */
 ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
 ,27 → 951,21
     ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
 {
     ipc_call_t result;
+    ipcarg_t rc;
     aid_t eid = async_send_4(phoneid, method, arg1, arg2, arg3, arg4,
         &result);
-    ipcarg_t rc;
     async_wait_for(eid, &rc);
-    if (r1)
+    if (r1)
         *r1 = IPC_GET_ARG1(result);
     if (r2)
         *r2 = IPC_GET_ARG2(result);
     if (r3)
         *r3 = IPC_GET_ARG3(result);
     if (r4)
         *r4 = IPC_GET_ARG4(result);
     if (r5)
         *r5 = IPC_GET_ARG5(result);
     return rc;
 }
 ,21 → 973,19
  *
  * Send message asynchronously and return only after the reply arrives.
  *
- * @param phoneid Hash of the phone through which to make the call.
- * @param method  Method of the call.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param arg4    Service-defined payload argument.
- * @param arg5    Service-defined payload argument.
- * @param r1      If non-NULL, storage for the 1st reply argument.
- * @param r2      If non-NULL, storage for the 2nd reply argument.
- * @param r3      If non-NULL, storage for the 3rd reply argument.
- * @param r4      If non-NULL, storage for the 4th reply argument.
- * @param r5      If non-NULL, storage for the 5th reply argument.
- *
- * @return Return code of the reply or a negative error code.
- *
+ * @param phoneid   Hash of the phone through which to make the call.
+ * @param method    Method of the call.
+ * @param arg1      Service-defined payload argument.
+ * @param arg2      Service-defined payload argument.
+ * @param arg3      Service-defined payload argument.
+ * @param arg4      Service-defined payload argument.
+ * @param arg5      Service-defined payload argument.
+ * @param r1        If non-NULL, storage for the 1st reply argument.
+ * @param r2        If non-NULL, storage for the 2nd reply argument.
+ * @param r3        If non-NULL, storage for the 3rd reply argument.
+ * @param r4        If non-NULL, storage for the 4th reply argument.
+ * @param r5        If non-NULL, storage for the 5th reply argument.
+ * @return      Return code of the reply or a negative error code.
  */
 ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
 ,29 → 992,24
     ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
 {
     ipc_call_t result;
+    ipcarg_t rc;
     aid_t eid = async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5,
         &result);
-    ipcarg_t rc;
     async_wait_for(eid, &rc);
-    if (r1)
+    if (r1)
         *r1 = IPC_GET_ARG1(result);
     if (r2)
         *r2 = IPC_GET_ARG2(result);
     if (r3)
         *r3 = IPC_GET_ARG3(result);
     if (r4)
         *r4 = IPC_GET_ARG4(result);
     if (r5)
         *r5 = IPC_GET_ARG5(result);
     return rc;
 }
 /** @}
  */

 /trunk/uspace/lib/libc/generic/tls.c
 ,7 → 116,7
     tcb_t *tcb;
     size = ALIGN_UP(size, &_tls_alignment);
-    *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
+    *data = memalign(&_tls_alignment, sizeof(tcb_t) + size);
     tcb = (tcb_t *) (*data + size);
     tcb->self = tcb;

 /trunk/uspace/lib/libc/generic/fibril.c
 ,7 → 33,7
 /** @file
  */
-#include <adt/list.h>
+#include <libadt/list.h>
 #include <fibril.h>
 #include <thread.h>
 #include <tls.h>
 ,8 → 49,7
 #define FIBRIL_INITIAL_STACK_PAGES_NO   1
 #endif
-/**
- * This futex serializes access to ready_list, serialized_list and manager_list.
+/** This futex serializes access to ready_list, serialized_list and manage_list.
  */
 static atomic_t fibril_futex = FUTEX_INITIALIZER;
 ,12 → 59,12
 static void fibril_main(void);
-/** Number of threads that are executing a manager fibril. */
-static int threads_in_manager;
-/** Number of threads that are executing a manager fibril and are serialized. */
-static int serialized_threads;  /* Protected by async_futex */
-/** Fibril-local count of serialization. If > 0, we must not preempt */
-static fibril_local int serialization_count;
+/** Number of fibrils that are in async_serialized mode */
+static int serialized_fibrils;  /* Protected by async_futex */
+/** Thread-local count of serialization. If >0, we must not preempt */
+static __thread int serialization_count;
+/** Counter for fibrils residing in async_manager */
+static int fibrils_in_manager;
 /** Setup fibril information into TCB structure */
 fibril_t *fibril_setup(void)
 ,11 → 143,11
         if (list_empty(&ready_list) && list_empty(&serialized_list))
             goto ret_0;
         /*
-         * Do not preempt if there is not enough threads to run the
-         * ready fibrils which are not serialized.
+         * Do not preempt if there is not sufficient count of fibril
+         * managers.
          */
         if (list_empty(&serialized_list) &&
-            threads_in_manager <= serialized_threads) {
+            fibrils_in_manager <= serialized_fibrils) {
             goto ret_0;
         }
     }
 ,7 → 194,7
             list_append(&srcf->link, &ready_list);
         else if (stype == FIBRIL_FROM_MANAGER) {
             list_append(&srcf->link, &manager_list);
-            threads_in_manager--;
+            fibrils_in_manager--;
         } else {
             /*
              * If stype == FIBRIL_TO_MANAGER, don't put ourselves to
 ,10 → 208,10
     if (stype == FIBRIL_TO_MANAGER || stype == FIBRIL_FROM_DEAD) {
         dstf = list_get_instance(manager_list.next, fibril_t, link);
         if (serialization_count && stype == FIBRIL_TO_MANAGER) {
-            serialized_threads++;
+            serialized_fibrils++;
             srcf->flags |= FIBRIL_SERIALIZED;
         }
-        threads_in_manager++;
+        fibrils_in_manager++;
         if (stype == FIBRIL_FROM_DEAD)
             dstf->clean_after_me = srcf;
 ,7 → 219,7
         if (!list_empty(&serialized_list)) {
             dstf = list_get_instance(serialized_list.next, fibril_t,
                 link);
-            serialized_threads--;
+            serialized_fibrils--;
         } else {
             dstf = list_get_instance(ready_list.next, fibril_t,
                 link);
 ,7 → 269,7
 /** Add a fibril to the ready list.
  *
- * @param fid       Pointer to the fibril structure of the fibril to be
+ * @param fid       Pinter to the fibril structure of the fibril to be
  *          added.
  */
 void fibril_add_ready(fid_t fid)
 ,8 → 287,7
 /** Add a fibril to the manager list.
  *
- * @param fid       Pointer to the fibril structure of the fibril to be
- *          added.
+ * @param fid       Pinter to the fibril structure of the fibril to be added.
  */
 void fibril_add_manager(fid_t fid)
 {
 ,8 → 314,7
 /** Return fibril id of the currently running fibril.
  *
- * @return fibril ID of the currently running fibril.
- *
+ * @return      Fibril ID of the currently running pseudo thread.
  */
 fid_t fibril_get_id(void)
 {
 ,14 → 321,13
     return (fid_t) __tcb_get()->fibril_data;
 }
-/** Disable preemption
+/** Disable preemption
  *
  * If the fibril wants to send several message in a row and does not want to be
  * preempted, it should start async_serialize_start() in the beginning of
  * communication and async_serialize_end() in the end. If it is a true
  * multithreaded application, it should protect the communication channel by a
- * futex as well.
- *
+ * futex as well. Interrupt messages can still be preempted.
  */
 void fibril_inc_sercount(void)
 {
 ,3 → 342,4
 /** @}
  */

 /trunk/uspace/lib/libc/generic/thread.c
 ,8 → 108,8
     uarg->uspace_thread_arg = arg;
     uarg->uspace_uarg = uarg;
-    rc = __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
-        (sysarg_t) str_size(name), (sysarg_t) tid);
+    rc = __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
+        (sysarg_t) tid);
     if (rc) {
         /*
 ,8 → 130,6
 void thread_exit(int status)
 {
     __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
-    for (;;)
-        ;
 }
 /** Detach thread.
 ,7 → 152,6
  */
 int thread_join(thread_id_t thread)
 {
-    return 0;
 }
 /** Get current thread ID.

 /trunk/uspace/lib/libc/generic/as.c
 ,7 → 30,7
  * @{
  */
 /** @file
- */
+ */
 #include <as.h>
 #include <libc.h>
 ,23 → 38,23
 #include <align.h>
 #include <sys/types.h>
 #include <bitops.h>
-#include <malloc.h>
-/** Last position allocated by as_get_mappable_page */
-static uintptr_t last_allocated = 0;
+/**
+ * Either 4*256M on 32-bit architecures or 16*256M on 64-bit architectures.
+ */
+#define MAX_HEAP_SIZE   (sizeof(uintptr_t)<<28)
 /** Create address space area.
  *
  * @param address Virtual address where to place new address space area.
- * @param size    Size of the area.
- * @param flags   Flags describing type of the area.
+ * @param size Size of the area.
+ * @param flags Flags describing type of the area.
  *
  * @return address on success, (void *) -1 otherwise.
- *
  */
 void *as_area_create(void *address, size_t size, int flags)
 {
-    return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t) address,
+    return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address,
         (sysarg_t) size, (sysarg_t) flags);
 }
 ,16 → 61,15
 /** Resize address space area.
  *
  * @param address Virtual address pointing into already existing address space
- *                area.
- * @param size    New requested size of the area.
- * @param flags   Currently unused.
+ *  area.
+ * @param size New requested size of the area.
+ * @param flags Currently unused.
  *
- * @return zero on success or a code from @ref errno.h on failure.
- *
+ * @return Zero on success or a code from @ref errno.h on failure.
  */
 int as_area_resize(void *address, size_t size, int flags)
 {
-    return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t) address,
+    return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address,
         (sysarg_t) size, (sysarg_t) flags);
 }
 ,54 → 76,110
 /** Destroy address space area.
  *
  * @param address Virtual address pointing into the address space area being
- *                destroyed.
+ *  destroyed.
  *
- * @return zero on success or a code from @ref errno.h on failure.
- *
+ * @return Zero on success or a code from @ref errno.h on failure.
  */
 int as_area_destroy(void *address)
 {
-    return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t) address);
+    return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address);
 }
-/** Change address-space area flags.
+static size_t heapsize = 0;
+static size_t maxheapsize = (size_t) (-1);
+static void * last_allocated = 0;
+/* Start of heap linker symbol */
+extern char _heap;
+/** Sbrk emulation
  *
- * @param address Virtual address pointing into the address space area being
- *                modified.
- * @param flags   New flags describing type of the area.
- *
- * @return zero on success or a code from @ref errno.h on failure.
- *
+ * @param incr New area that should be allocated or negative,
+               if it should be shrinked
+ * @return Pointer to newly allocated area
  */
-int as_area_change_flags(void *address, int flags)
+void *sbrk(ssize_t incr)
 {
-    return __SYSCALL2(SYS_AS_AREA_CHANGE_FLAGS, (sysarg_t) address,
-        (sysarg_t) flags);
+    int rc;
+    void *res;
+    /* Check for invalid values */
+    if (incr < 0 && -incr > heapsize)
+        return NULL;
+    /* Check for too large value */
+    if (incr > 0 && incr+heapsize < heapsize)
+        return NULL;
+    /* Check for too small values */
+    if (incr < 0 && incr+heapsize > heapsize)
+        return NULL;
+    /* Check for user limit */
+    if ((maxheapsize != (size_t) (-1)) && (heapsize + incr) > maxheapsize)
+        return NULL;
+    rc = as_area_resize(&_heap, heapsize + incr, 0);
+    if (rc != 0)
+        return NULL;
+    /* Compute start of new area */
+    res = (void *) &_heap + heapsize;
+    heapsize += incr;
+    return res;
 }
+/** Set maximum heap size and return pointer just after the heap */
+void *set_maxheapsize(size_t mhs)
+{
+    maxheapsize = mhs;
+    /* Return pointer to area not managed by sbrk */
+    return ((void *) &_heap + maxheapsize);
+}
 /** Return pointer to some unmapped area, where fits new as_area
  *
- * @param size Requested size of the allocation.
+ * @param sz Requested size of the allocation.
  *
- * @return pointer to the beginning
+ * @return Pointer to the beginning
  *
+ * TODO: make some first_fit/... algorithm, we are now just incrementing
+ *       the pointer to last area
  */
-void *as_get_mappable_page(size_t size)
+void *as_get_mappable_page(size_t sz)
 {
-    if (size == 0)
-        return NULL;
+    void *res;
+    uint64_t asz;
+    int i;
-    size_t sz = 1 << (fnzb(size - 1) + 1);
-    if (last_allocated == 0)
-        last_allocated = get_max_heap_addr();
+    if (!sz)
+        return NULL;
+    asz = 1 << (fnzb64(sz - 1) + 1);
+    /* Set heapsize to some meaningful value */
+    if (maxheapsize == -1)
+        set_maxheapsize(MAX_HEAP_SIZE);
     /*
      * Make sure we allocate from naturally aligned address.
      */
-    uintptr_t res = ALIGN_UP(last_allocated, sz);
-    last_allocated = res + ALIGN_UP(size, PAGE_SIZE);
-    return ((void *) res);
+    i = 0;
+    if (!last_allocated) {
+        last_allocated = (void *) ALIGN_UP((void *) &_heap +
+            maxheapsize, asz);
+    } else {
+        last_allocated = (void *) ALIGN_UP(((uintptr_t)
+            last_allocated) + (int) (i > 0), asz);
+    }
+    res = last_allocated;
+    last_allocated += ALIGN_UP(sz, PAGE_SIZE);
+    return res;
 }
 /** @}

 /trunk/uspace/lib/libc/generic/mman.c
 ,18 → 37,17
 #include <as.h>
 #include <unistd.h>
-void *mmap(void *start, size_t length, int prot, int flags, int fd,
+void *mmap(void  *start, size_t length, int prot, int flags, int fd,
     off_t offset)
 {
     if (!start)
         start = as_get_mappable_page(length);
-//  if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))
+//  if (! ((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))
 //      return MAP_FAILED;
-    if (!(flags & MAP_ANONYMOUS))
+    if (! (flags & MAP_ANONYMOUS))
         return MAP_FAILED;
     return as_area_create(start, length, prot);
 }

 /trunk/uspace/lib/libc/generic/ddi.c
 ,42 → 33,26
  */
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <libc.h>
 #include <task.h>
-#include <as.h>
-#include <align.h>
-#include <libarch/config.h>
 #include <kernel/ddi/ddi_arg.h>
-/** Return unique device number.
- *
- * @return New unique device number.
- *
- */
-int device_assign_devno(void)
-{
-    return __SYSCALL0(SYS_DEVICE_ASSIGN_DEVNO);
-}
 /** Map piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf        Physical address of the starting frame.
- * @param vp        Virtual address of the starting page.
- * @param pages     Number of pages to map.
- * @param flags     Flags for the new address space area.
+ * @param pf Physical address of the starting frame.
+ * @param vp Virtual address of the sterting page.
+ * @param pages Number of pages to map.
+ * @param flags Flags for the new address space area.
  *
- * @return      0 on success, EPERM if the caller lacks the
- *          CAP_MEM_MANAGER capability, ENOENT if there is no task
- *          with specified ID and ENOMEM if there was some problem
- *          in creating address space area.
+ * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability,
+ *     ENOENT if there is no task with specified ID and ENOMEM if there
+ *     was some problem in creating address space area.
  */
 int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
-        flags);
+    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
 }
 /** Enable I/O space range to task.
 ,14 → 59,13
  *
  * Caller of this function must have the IO_MEM_MANAGER capability.
  *
- * @param id        Task ID.
- * @param ioaddr    Starting address of the I/O range.
- * @param size      Size of the range.
+ * @param id Task ID.
+ * @param ioaddr Starting address of the I/O range.
+ * @param size Size of the range.
  *
- * @return      0 on success, EPERM if the caller lacks the
- *          CAP_IO_MANAGER capability, ENOENT if there is no task
- *          with specified ID and ENOMEM if there was some problem
- *          in allocating memory.
+ * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability,
+ *     ENOENT if there is no task with specified ID and ENOMEM if there
+ *     was some problem in allocating memory.
  */
 int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
 {
 ,7 → 80,7
 /** Interrupt control
  *
- * @param enable    1 - enable interrupts, 0 - disable interrupts
+ * @param enable 1 - enable interrupts, 0 - disable interrupts
  */
 int preemption_control(int enable)
 {
 ,36 → 87,5
     return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable);
 }
-/** Enable PIO for specified I/O range.
- *
- * @param pio_addr  I/O start address.
- * @param size      Size of the I/O region.
- * @param use_addr  Address where the final address for application's PIO
- *          will be stored.
- *
- * @return      Zero on success or negative error code.
- */
-int pio_enable(void *pio_addr, size_t size, void **use_addr)
-{
-    void *phys;
-    void *virt;
-    size_t offset;
-    unsigned int pages;
-#ifdef IO_SPACE_BOUNDARY
-    if (pio_addr < IO_SPACE_BOUNDARY) {
-        *use_addr = pio_addr;
-        return iospace_enable(task_get_id(), pio_addr, size);
-    }
-#endif
-    phys = (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
-    offset = pio_addr - phys;
-    pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
-    virt = as_get_mappable_page(pages << PAGE_WIDTH);
-    *use_addr = virt + offset;
-    return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/task.c
 ,6 → 1,5
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,140 → 30,19
  * @{
  */
 /** @file
- */
+ */
 #include <task.h>
 #include <libc.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <loader/loader.h>
-#include <string.h>
-#include <ipc/ns.h>
-#include <macros.h>
-#include <async.h>
 task_id_t task_get_id(void)
 {
     task_id_t task_id;
     (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
-    return task_id;
-}
-/** Set the task name.
- *
- * @param name The new name, typically the command used to execute the
- *             program.
- *
- * @return Zero on success or negative error code.
- *
- */
-int task_set_name(const char *name)
-{
-    return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
-}
-/** Create a new task by running an executable from the filesystem.
- *
- * This is really just a convenience wrapper over the more complicated
- * loader API.
- *
- * @param path pathname of the binary to execute
- * @param argv command-line arguments
- *
- * @return ID of the newly created task or zero on error.
- *
- */
-task_id_t task_spawn(const char *path, char *const args[])
-{
-    /* Connect to a program loader. */
-    loader_t *ldr = loader_connect();
-    if (ldr == NULL)
-        return 0;
-    /* Get task ID. */
-    task_id_t task_id;
-    int rc = loader_get_task_id(ldr, &task_id);
-    if (rc != EOK)
-        goto error;
-    /* Send program pathname. */
-    rc = loader_set_pathname(ldr, path);
-    if (rc != EOK)
-        goto error;
-    /* Send arguments. */
-    rc = loader_set_args(ldr, args);
-    if (rc != EOK)
-        goto error;
-    /* Send default files */
-    fdi_node_t *files[4];
-    fdi_node_t stdin_node;
-    fdi_node_t stdout_node;
-    fdi_node_t stderr_node;
-    if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
-        files[0] = &stdin_node;
-    else
-        files[0] = NULL;
-    if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
-        files[1] = &stdout_node;
-    else
-        files[1] = NULL;
-    if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
-        files[2] = &stderr_node;
-    else
-        files[2] = NULL;
-    files[3] = NULL;
-    rc = loader_set_files(ldr, files);
-    if (rc != EOK)
-        goto error;
-    /* Load the program. */
-    rc = loader_load_program(ldr);
-    if (rc != EOK)
-        goto error;
-    /* Run it. */
-    rc = loader_run(ldr);
-    if (rc != EOK)
-        goto error;
-    /* Success */
-    free(ldr);
     return task_id;
-error:
-    /* Error exit */
-    loader_abort(ldr);
-    free(ldr);
-    return 0;
 }
-int task_wait(task_id_t id, task_exit_t *texit, int *retval)
-{
-    ipcarg_t te, rv;
-    int rc;
-    rc = (int) async_req_2_2(PHONE_NS, NS_TASK_WAIT, LOWER32(id),
-        UPPER32(id), &te, &rv);
-    *texit = te;
-    *retval = rv;
-    return rc;
-}
-int task_retval(int val)
-{
-    return (int) async_req_1_0(PHONE_NS, NS_RETVAL, val);
-}
 /** @}
  */

 /trunk/uspace/lib/libc/generic/libadt/hash_table.c
 ,0 → 1,179
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+/*
+ * This is an implementation of generic chained hash table.
+ */
+#include <libadt/hash_table.h>
+#include <libadt/list.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+/** Create chained hash table.
+ *
+ * @param h Hash table structure. Will be initialized by this call.
+ * @param m Number of slots in the hash table.
+ * @param max_keys Maximal number of keys needed to identify an item.
+ * @param op Hash table operations structure.
+ * @return true on success
+ */
+int hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys, hash_table_operations_t *op)
+{
+    hash_count_t i;
+    assert(h);
+    assert(op && op->hash && op->compare);
+    assert(max_keys > 0);
+    h->entry = malloc(m * sizeof(link_t));
+    if (!h->entry) {
+        printf("cannot allocate memory for hash table\n");
+        return false;
+    }
+    memset((void *) h->entry, 0,  m * sizeof(link_t));
+    for (i = 0; i < m; i++)
+        list_initialize(&h->entry[i]);
+    h->entries = m;
+    h->max_keys = max_keys;
+    h->op = op;
+    return true;
+}
+/** Insert item into hash table.
+ *
+ * @param h Hash table.
+ * @param key Array of all keys necessary to compute hash index.
+ * @param item Item to be inserted into the hash table.
+ */
+void hash_table_insert(hash_table_t *h, unsigned long key[], link_t *item)
+{
+    hash_index_t chain;
+    assert(item);
+    assert(h && h->op && h->op->hash && h->op->compare);
+    chain = h->op->hash(key);
+    assert(chain < h->entries);
+    list_append(item, &h->entry[chain]);
+}
+/** Search hash table for an item matching keys.
+ *
+ * @param h Hash table.
+ * @param key Array of all keys needed to compute hash index.
+ *
+ * @return Matching item on success, NULL if there is no such item.
+ */
+link_t *hash_table_find(hash_table_t *h, unsigned long key[])
+{
+    link_t *cur;
+    hash_index_t chain;
+    assert(h && h->op && h->op->hash && h->op->compare);
+    chain = h->op->hash(key);
+    assert(chain < h->entries);
+    for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
+        if (h->op->compare(key, h->max_keys, cur)) {
+            /*
+             * The entry is there.
+             */
+            return cur;
+        }
+    }
+    return NULL;
+}
+/** Remove all matching items from hash table.
+ *
+ * For each removed item, h->remove_callback() is called.
+ *
+ * @param h Hash table.
+ * @param key Array of keys that will be compared against items of the hash table.
+ * @param keys Number of keys in the 'key' array.
+ */
+void hash_table_remove(hash_table_t *h, unsigned long key[], hash_count_t keys)
+{
+    hash_index_t chain;
+    link_t *cur;
+    assert(h && h->op && h->op->hash && h->op->compare && h->op->remove_callback);
+    assert(keys <= h->max_keys);
+    if (keys == h->max_keys) {
+        /*
+         * All keys are known, hash_table_find() can be used to find the entry.
+         */
+        cur = hash_table_find(h, key);
+        if (cur) {
+            list_remove(cur);
+            h->op->remove_callback(cur);
+        }
+        return;
+    }
+    /*
+     * Fewer keys were passed.
+     * Any partially matching entries are to be removed.
+     */
+    for (chain = 0; chain < h->entries; chain++) {
+        for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
+            if (h->op->compare(key, keys, cur)) {
+                link_t *hlp;
+                hlp = cur;
+                cur = cur->prev;
+                list_remove(hlp);
+                h->op->remove_callback(hlp);
+                continue;
+            }
+        }
+    }
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/libadt/list.c
 ,0 → 1,89
+/*
+ * Copyright (c) 2004 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <libadt/list.h>
+/** Check for membership
+ *
+ * Check whether link is contained in the list head.
+ * The membership is defined as pointer equivalence.
+ *
+ * @param link Item to look for.
+ * @param head List to look in.
+ *
+ * @return true if link is contained in head, false otherwise.
+ *
+ */
+int list_member(const link_t *link, const link_t *head)
+{
+    int found = false;
+    link_t *hlp = head->next;
+    while (hlp != head) {
+        if (hlp == link) {
+            found = true;
+            break;
+        }
+        hlp = hlp->next;
+    }
+    return found;
+}
+/** Concatenate two lists
+ *
+ * Concatenate lists head1 and head2, producing a single
+ * list head1 containing items from both (in head1, head2
+ * order) and empty list head2.
+ *
+ * @param head1 First list and concatenated output
+ * @param head2 Second list and empty output.
+ *
+ */
+void list_concat(link_t *head1, link_t *head2)
+{
+    if (list_empty(head2))
+        return;
+    head2->next->prev = head1->prev;
+    head2->prev->next = head1;
+    head1->prev->next = head2->next;
+    head1->prev = head2->prev;
+    list_initialize(head2);
+}
+/** @}
+ */

 /trunk/uspace/lib/libc/generic/sysinfo.c
 ,8 → 38,7
 sysarg_t sysinfo_value(char *name)
 {
-    return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name,
-        (sysarg_t) str_size(name));
+    return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name, (sysarg_t) strlen(name));
 }
 /** @}

 /trunk/uspace/lib/libc/include/fcntl.h
 ,13 → 35,13
 #ifndef LIBC_FCNTL_H_
 #define LIBC_FCNTL_H_
-#define O_CREAT   1
-#define O_EXCL    2
-#define O_TRUNC   4
-#define O_APPEND  8
-#define O_RDONLY  16
-#define O_RDWR    32
-#define O_WRONLY  64
+#define O_CREAT     1
+#define O_EXCL      2
+#define O_TRUNC     4
+#define O_APPEND    8
+#define O_RDONLY    16
+#define O_RDWR      32
+#define O_WRONLY    64
 extern int open(const char *, int, ...);

 /trunk/uspace/lib/libc/include/sys/stat.h
 ,26 → 36,7
 #define LIBC_SYS_STAT_H_
 #include <sys/types.h>
-#include <bool.h>
-#include <ipc/vfs.h>
-#include <ipc/devmap.h>
-struct stat {
-    fs_handle_t fs_handle;
-    dev_handle_t    dev_handle;
-    fs_index_t  index;
-    unsigned    lnkcnt;
-    bool        is_file;
-    off_t       size;
-    union {
-        struct {
-            dev_handle_t    device;
-        } devfs_stat;
-    };
-};
-extern int fstat(int, struct stat *);
-extern int stat(const char *, struct stat *);
 extern int mkdir(const char *, mode_t);
 #endif

 /trunk/uspace/lib/libc/include/sys/types.h
 ,15 → 37,11
 #include <libarch/types.h>
+typedef unsigned long size_t;
+typedef signed long ssize_t;
 typedef long off_t;
 typedef int mode_t;
-typedef int32_t wchar_t;
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/errno.h
 ,25 → 36,13
 #define LIBC_ERRNO_H_
 #include <kernel/errno.h>
-#include <fibril.h>
-extern int _errno;
+#define ENAMETOOLONG    (-256)
+#define EISDIR      (-257)
+#define ENOTDIR     (-258)
+#define ENOSPC      (-259)
+#define EEXIST      (-260)
-#define errno _errno
-#define EMFILE        (-17)
-#define ENAMETOOLONG  (-256)
-#define EISDIR        (-257)
-#define ENOTDIR       (-258)
-#define ENOSPC        (-259)
-#define EEXIST        (-260)
-#define ENOTEMPTY     (-261)
-#define EBADF         (-262)
-#define ERANGE        (-263)
-#define EXDEV         (-264)
-#define EIO           (-265)
-#define EMLINK        (-266)
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/dirent.h
 ,7 → 35,7
 #ifndef LIBC_DIRENT_H_
 #define LIBC_DIRENT_H_
-#define NAME_MAX  256
+#define NAME_MAX    256
 struct dirent {
     char d_name[NAME_MAX + 1];
 ,6 → 46,7
     struct dirent res;
 } DIR;
 extern DIR *opendir(const char *);
 extern struct dirent *readdir(DIR *);
 extern void rewinddir(DIR *);

 /trunk/uspace/lib/libc/include/unistd.h
 ,33 → 38,21
 #include <sys/types.h>
 #include <libarch/config.h>
-#ifndef NULL
-    #define NULL  0
-#endif
+#define NULL 0
+#define getpagesize()     (PAGE_SIZE)
-#define getpagesize()  (PAGE_SIZE)
+#define SEEK_SET    0
+#define SEEK_CUR    1
+#define SEEK_END    2
-#ifndef SEEK_SET
-    #define SEEK_SET  0
-    #define SEEK_CUR  1
-    #define SEEK_END  2
-#endif
 extern ssize_t write(int, const void *, size_t);
 extern ssize_t read(int, void *, size_t);
 extern off_t lseek(int, off_t, int);
 extern int ftruncate(int, off_t);
 extern int close(int);
-extern int fsync(int);
-extern int unlink(const char *);
-extern char *getcwd(char *buf, size_t);
-extern int rmdir(const char *);
-extern int chdir(const char *);
-extern void _exit(int status) __attribute__ ((noreturn));
+extern void _exit(int status);
+extern void *sbrk(ssize_t incr);
 extern int usleep(unsigned long usec);
 extern unsigned int sleep(unsigned int seconds);

 /trunk/uspace/lib/libc/include/ipc/ipc.h
 ,29 → 30,25
  * @{
  */
 /** @file
- */
+ */
 #ifndef LIBIPC_IPC_H_
 #define LIBIPC_IPC_H_
-#include <task.h>
 #include <kernel/ipc/ipc.h>
 #include <kernel/ddi/irq.h>
 #include <sys/types.h>
 #include <kernel/synch/synch.h>
-#define IPC_FLAG_BLOCKING  0x01
 typedef sysarg_t ipcarg_t;
 typedef struct {
     ipcarg_t args[IPC_CALL_LEN];
     ipcarg_t in_phone_hash;
 } ipc_call_t;
 typedef sysarg_t ipc_callid_t;
-typedef void (* ipc_async_callback_t)(void *, int, ipc_call_t *);
+typedef void (* ipc_async_callback_t)(void *private, int retval,
+    ipc_call_t *data);
 /*
  * User-friendly wrappers for ipc_call_sync_fast() and ipc_call_sync_slow().
 ,51 → 57,49
  * possible, the fast version is used.
  */
 #define ipc_call_sync_0_0(phoneid, method) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, 0, 0, 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, 0, 0, 0, 0, 0)
 #define ipc_call_sync_0_1(phoneid, method, res1) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), 0, 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), 0, 0, 0, 0)
 #define ipc_call_sync_0_2(phoneid, method, res1, res2) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), 0, 0, 0)
 #define ipc_call_sync_0_3(phoneid, method, res1, res2, res3) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-, 0)
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
+, 0)
 #define ipc_call_sync_0_4(phoneid, method, res1, res2, res3, res4) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-        (res4), 0)
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
+        (res4), 0)
 #define ipc_call_sync_0_5(phoneid, method, res1, res2, res3, res4, res5) \
-    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-        (res4), (res5))
+    ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
+        (res4), (res5))
 #define ipc_call_sync_1_0(phoneid, method, arg1) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, 0, 0, 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, 0, 0, 0, 0, 0)
 #define ipc_call_sync_1_1(phoneid, method, arg1, res1) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), 0, 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), 0, 0, 0, 0)
 #define ipc_call_sync_1_2(phoneid, method, arg1, res1, res2) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), 0, \
-, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), 0, \
+, 0)
 #define ipc_call_sync_1_3(phoneid, method, arg1, res1, res2, res3) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
-        (res3), 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
+    (res3), 0, 0)
 #define ipc_call_sync_1_4(phoneid, method, arg1, res1, res2, res3, res4) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
-        (res3), (res4), 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
+    (res3), (res4), 0)
 #define ipc_call_sync_1_5(phoneid, method, arg1, res1, res2, res3, res4, \
     res5) \
     ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
         (res3), (res4), (res5))
 #define ipc_call_sync_2_0(phoneid, method, arg1, arg2) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, 0, 0, 0, \
-, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, 0, 0, 0, \
+, 0)
 #define ipc_call_sync_2_1(phoneid, method, arg1, arg2, res1) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), 0, 0, \
-, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), 0, 0, \
+, 0)
 #define ipc_call_sync_2_2(phoneid, method, arg1, arg2, res1, res2) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-        (res2), 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
+    (res2), 0, 0, 0)
 #define ipc_call_sync_2_3(phoneid, method, arg1, arg2, res1, res2, res3) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-        (res2), (res3), 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
+    (res2), (res3), 0, 0)
 #define ipc_call_sync_2_4(phoneid, method, arg1, arg2, res1, res2, res3, \
     res4) \
     ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
 ,16 → 108,15
     res4, res5)\
     ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
         (res2), (res3), (res4), (res5))
 #define ipc_call_sync_3_0(phoneid, method, arg1, arg2, arg3) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, 0, 0, \
-, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, 0, 0, \
+, 0)
 #define ipc_call_sync_3_1(phoneid, method, arg1, arg2, arg3, res1) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
-, 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
+, 0, 0, 0)
 #define ipc_call_sync_3_2(phoneid, method, arg1, arg2, arg3, res1, res2) \
-    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
-        (res2), 0, 0, 0)
+    ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
+    (res2), 0, 0, 0)
 #define ipc_call_sync_3_3(phoneid, method, arg1, arg2, arg3, res1, res2, \
     res3) \
     ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \
 ,35 → 129,33
     res3, res4, res5) \
     ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \
         (res1), (res2), (res3), (res4), (res5))
 #define ipc_call_sync_4_0(phoneid, method, arg1, arg2, arg3, arg4) \
-    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-, 0, 0, 0, 0)
+    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+, 0, 0, 0, 0)
 #define ipc_call_sync_4_1(phoneid, method, arg1, arg2, arg3, arg4, res1) \
-    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-        (res1), 0, 0, 0, 0)
+    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+    (res1), 0, 0, 0, 0)
 #define ipc_call_sync_4_2(phoneid, method, arg1, arg2, arg3, arg4, res1, res2) \
-    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-        (res1), (res2), 0, 0, 0)
+    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+    (res1), (res2), 0, 0, 0)
 #define ipc_call_sync_4_3(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
     res3) \
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-        (arg4), 0, (res1), (res2), (res3), 0, 0)
+        (arg4), (res1), (res2), (res3), 0, 0)
 #define ipc_call_sync_4_4(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
     res3, res4) \
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-        (arg4), 0, (res1), (res2), (res3), (res4), 0)
+        (arg4), (res1), (res2), (res3), (res4), 0)
 #define ipc_call_sync_4_5(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
     res3, res4, res5) \
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-        (arg4), 0, (res1), (res2), (res3), (res4), (res5))
+        (arg4), (res1), (res2), (res3), (res4), (res5))
 #define ipc_call_sync_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \
-    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), 0, 0, 0, 0, 0)
+    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+        (arg5), 0, 0, 0, 0, 0)
 #define ipc_call_sync_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1) \
-    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), (res1), 0, 0, 0, 0)
+    ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+        (arg5), (res1), 0, 0, 0, 0)
 #define ipc_call_sync_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \
     res2) \
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
 ,23 → 173,23
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
-extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
+extern int ipc_call_sync_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2,
+    ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5);
-extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
-    ipcarg_t *);
+extern int ipc_call_sync_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+    ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3, ipcarg_t *result4,
+    ipcarg_t *result5);
-extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
-extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *, uint32_t);
+extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags);
+extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec);
 static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data)
 {
     return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 }
+extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
-extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *);
 /*
  * User-friendly wrappers for ipc_answer_fast() and ipc_answer_slow().
  * They are in the form of ipc_answer_m(), where m is the number of return
 ,22 → 197,22
  * to m.
  */
 #define ipc_answer_0(callid, retval) \
-    ipc_answer_fast((callid), (retval), 0, 0, 0, 0)
+    ipc_answer_fast((callid), (retval), 0, 0, 0, 0)
 #define ipc_answer_1(callid, retval, arg1) \
-    ipc_answer_fast((callid), (retval), (arg1), 0, 0, 0)
+    ipc_answer_fast((callid), (retval), (arg1), 0, 0, 0)
 #define ipc_answer_2(callid, retval, arg1, arg2) \
-    ipc_answer_fast((callid), (retval), (arg1), (arg2), 0, 0)
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), 0, 0)
 #define ipc_answer_3(callid, retval, arg1, arg2, arg3) \
-    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), 0)
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), 0)
 #define ipc_answer_4(callid, retval, arg1, arg2, arg3, arg4) \
-    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), (arg4))
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), (arg4))
 #define ipc_answer_5(callid, retval, arg1, arg2, arg3, arg4, arg5) \
-    ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
+    ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
-extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t);
-extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t);
+extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4);
+extern ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5);
 /*
  * User-friendly wrappers for ipc_call_async_fast() and ipc_call_async_slow().
 ,7 → 220,8
  * arguments. The macros decide between the fast and the slow version according
  * to m.
  */
-#define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
+#define ipc_call_async_0(phoneid, method, private, callback, \
+    can_preempt) \
     ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
         (callback), (can_preempt))
 #define ipc_call_async_1(phoneid, method, arg1, private, callback, \
 ,48 → 245,49
     ipc_call_async_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (private), (callback), (can_preempt))
-extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, void *, ipc_async_callback_t, int);
-extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
+extern void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
+    ipc_async_callback_t callback, int can_preempt);
+extern void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
+    ipc_async_callback_t callback, int can_preempt);
-extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
-extern int ipc_connect_me_to(int, int, int, int);
-extern int ipc_connect_me_to_blocking(int, int, int, int);
-extern int ipc_hangup(int);
-extern int ipc_register_irq(int, int, int, irq_code_t *);
-extern int ipc_unregister_irq(int, int);
-extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
-extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t, int);
+extern int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3,
+    ipcarg_t *phone);
+extern int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3);
+extern int ipc_hangup(int phoneid);
+extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code);
+extern int ipc_unregister_irq(int inr, int devno);
+extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
+    ipcarg_t arg1, ipcarg_t arg2, int mode);
 /*
  * User-friendly wrappers for ipc_share_in_start().
  */
 #define ipc_share_in_start_0_0(phoneid, dst, size) \
-    ipc_share_in_start((phoneid), (dst), (size), 0, NULL)
+    ipc_share_in_start((phoneid), (dst), (size), 0, NULL)
 #define ipc_share_in_start_0_1(phoneid, dst, size, flags) \
-    ipc_share_in_start((phoneid), (dst), (size), 0, (flags))
+    ipc_share_in_start((phoneid), (dst), (size), 0, (flags))
 #define ipc_share_in_start_1_0(phoneid, dst, size, arg) \
-    ipc_share_in_start((phoneid), (dst), (size), (arg), NULL)
+    ipc_share_in_start((phoneid), (dst), (size), (arg), NULL)
 #define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \
-    ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
+    ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
-extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
-extern int ipc_share_in_receive(ipc_callid_t *, size_t *);
-extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
-extern int ipc_share_out_start(int, void *, int);
-extern int ipc_share_out_receive(ipc_callid_t *, size_t *, int *);
-extern int ipc_share_out_finalize(ipc_callid_t, void *);
-extern int ipc_data_read_start(int, void *, size_t);
-extern int ipc_data_read_receive(ipc_callid_t *, size_t *);
-extern int ipc_data_read_finalize(ipc_callid_t, const void *, size_t);
-extern int ipc_data_write_start(int, const void *, size_t);
-extern int ipc_data_write_receive(ipc_callid_t *, size_t *);
-extern int ipc_data_write_finalize(ipc_callid_t, void *, size_t);
+extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
+    int *flags);
+extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags);
+extern int ipc_share_out_start(int phoneid, void *src, int flags);
+extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags);
+extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst);
+extern int ipc_data_read_start(int phoneid, void *dst, size_t size);
+extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size);
+extern int ipc_data_write_start(int phoneid, void *src, size_t size);
+extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size);
-extern int ipc_connect_kbox(task_id_t);
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/ipc/fb.h
 ,7 → 41,6
     FB_PUTCHAR = IPC_FIRST_USER_METHOD,
     FB_CLEAR,
     FB_GET_CSIZE,
-    FB_GET_COLOR_CAP,
     FB_CURSOR_VISIBILITY,
     FB_CURSOR_GOTO,
     FB_SCROLL,
 ,11 → 48,10
     FB_VIEWPORT_CREATE,
     FB_VIEWPORT_DELETE,
     FB_SET_STYLE,
-    FB_SET_COLOR,
-    FB_SET_RGB_COLOR,
     FB_GET_RESOLUTION,
     FB_DRAW_TEXT_DATA,
     FB_FLUSH,
+    FB_VIEWPORT_DB,
     FB_DRAW_PPM,
     FB_PREPARE_SHM,
     FB_DROP_SHM,
 ,6 → 59,7
     FB_VP_DRAW_PIXMAP,
     FB_VP2PIXMAP,
     FB_DROP_PIXMAP,
+    FB_TRANS_PUTCHAR,
     FB_ANIM_CREATE,
     FB_ANIM_DROP,
     FB_ANIM_ADDPIXMAP,
 ,17 → 66,9
     FB_ANIM_CHGVP,
     FB_ANIM_START,
     FB_ANIM_STOP,
-    FB_POINTER_MOVE,
-    FB_SCREEN_YIELD,
-    FB_SCREEN_RECLAIM
+    FB_POINTER_MOVE
 } fb_request_t;
-enum {
-    FB_CCAP_NONE = 0,
-    FB_CCAP_STYLE,
-    FB_CCAP_INDEXED,
-    FB_CCAP_RGB
-};
 #endif

 /trunk/uspace/lib/libc/include/ipc/services.h
 ,8 → 30,8
  * @{
  */
 /**
- * @file  services.h
- * @brief List of all known services and their codes.
+ * @file    services.h
+ * @brief   List of all known services and their codes.
  */
 #ifndef LIBIPC_SERVICES_H_
 ,27 → 38,13
 #define LIBIPC_SERVICES_H_
 typedef enum {
-    SERVICE_LOAD = 1,
-    SERVICE_PCI,
+    SERVICE_PCI = 1,
     SERVICE_KEYBOARD,
     SERVICE_VIDEO,
     SERVICE_CONSOLE,
+    SERVICE_RD,
     SERVICE_VFS,
-    SERVICE_DEVMAP,
-    SERVICE_FHC,
-    SERVICE_OBIO,
-    SERVICE_NETWORKING,
-    SERVICE_LO,
-    SERVICE_DP8390,
-    SERVICE_ETHERNET,
-    SERVICE_NILDUMMY,
-    SERVICE_IP,
-    SERVICE_ARP,
-    SERVICE_RARP,
-    SERVICE_ICMP,
-    SERVICE_UDP,
-    SERVICE_TCP,
-    SERVICE_SOCKET
+    SERVICE_DEVMAP
 } services_t;
 /* Memory area to be received from NS */

 /trunk/uspace/lib/libc/include/ipc/ns.h
 ,15 → 35,6
 #ifndef LIBIPC_NS_H_
 #define LIBIPC_NS_H_
-#include <ipc/ipc.h>
-typedef enum {
-    NS_PING = IPC_FIRST_USER_METHOD,
-    NS_TASK_WAIT,
-    NS_ID_INTRO,
-    NS_RETVAL
-} ns_request_t;
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/vfs.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2007 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_VFS_H_
+#define LIBC_VFS_H_
+extern int mount(const char *, const char *, const char *);
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/io/stream.h
 ,0 → 1,54
+/*
+ * Copyright (c) 2006 Jakub Vana
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_STREAM_H_
+#define LIBC_STREAM_H_
+#include <libarch/types.h>
+#define EMFILE -17
+extern void open_stdin(void);
+extern void open_stdout(void);
+extern ssize_t read_stdin(void *, size_t);
+extern ssize_t write_stdout(const void *, size_t);
+extern ssize_t write_stderr(const void *, size_t);
+extern int get_cons_phone(void);
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/io/printf_core.h
 ,20 → 39,19
 #include <stdarg.h>
 /** Structure for specifying output methods for different printf clones. */
-typedef struct printf_spec {
-    /* String output function, returns number of printed characters or EOF */
-    int (*str_write)(const char *, size_t, void *);
-    /* Wide string output function, returns number of printed characters or EOF */
-    int (*wstr_write)(const wchar_t *, size_t, void *);
-    /* User data - output stream specification, state, locks, etc. */
+struct printf_spec {
+    /* Output function, returns count of printed characters or EOF */
+    int (*write)(void *, size_t, void *);
+    /* Support data - output stream specification, its state, locks,... */
     void *data;
-} printf_spec_t;
-int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
+};
+int printf_core(const char *fmt, struct printf_spec *ps ,va_list ap);
 #endif
 /** @}
  */

 /trunk/uspace/lib/libc/include/io/io.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_IO_H_
+#define LIBC_IO_H_
+#include <sys/types.h>
+int putnchars(const char * buf, size_t count);
+int putstr(const char * str);
+int putchar(int c);
+int getchar(void);
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/string.h
 ,65 → 35,30
 #ifndef LIBC_STRING_H_
 #define LIBC_STRING_H_
-#include <mem.h>
 #include <sys/types.h>
-#include <bool.h>
-#define U_SPECIAL  '?'
+#define bzero(ptr, len) memset((ptr), 0, (len))
-/** No size limit constant */
-#define STR_NO_LIMIT  ((size_t) -1)
+void * memset(void *s, int c, size_t n);
+void * memcpy(void *dest, const void *src, size_t n);
+void * memmove(void *dest, const void *src, size_t n);
-/** Maximum size of a string containing @c length characters */
-#define STR_BOUNDS(length)  ((length) << 2)
+int bcmp(const char *s1, const char *s2, size_t n);
-extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
-extern int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t sz);
+int strcmp(const char *, const char *);
+int strncmp(const char *, const char *, size_t n);
-extern size_t str_size(const char *str);
-extern size_t wstr_size(const wchar_t *str);
+char *strcpy(char *dest, const char *src);
+char *strncpy(char *dest, const char *src, size_t n);
-extern size_t str_lsize(const char *str, size_t max_len);
-extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
+size_t strlen(const char *str);
-extern size_t str_length(const char *str);
-extern size_t wstr_length(const wchar_t *wstr);
+char *strchr(const char *str, int c);
+char *strrchr(const char *str, int c);
-extern size_t str_nlength(const char *str, size_t size);
-extern size_t wstr_nlength(const wchar_t *str, size_t size);
+long int strtol(const char *nptr, char **endptr, int base);
+unsigned long strtoul(const char *nptr, char **endptr, int base);
-extern bool ascii_check(wchar_t ch);
-extern bool chr_check(wchar_t ch);
-extern int str_cmp(const char *s1, const char *s2);
-extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
-extern void str_cpy(char *dest, size_t size, const char *src);
-extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
-extern void str_append(char *dest, size_t size, const char *src);
-extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
-extern char *str_chr(const char *str, wchar_t ch);
-extern char *str_rchr(const char *str, wchar_t ch);
-extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
-extern bool wstr_remove(wchar_t *str, size_t pos);
-extern char *str_dup(const char *);
-/*
- * TODO: Get rid of this.
- */
-extern int stricmp(const char *, const char *);
-extern long int strtol(const char *, char **, int);
-extern unsigned long strtoul(const char *, char **, int);
-extern char * strtok_r(char *, const char *, char **);
-extern char * strtok(char *, const char *);
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/async.h
 ,21 → 44,17
 typedef ipc_callid_t aid_t;
 typedef void (*async_client_conn_t)(ipc_callid_t callid, ipc_call_t *call);
-extern atomic_t async_futex;
+static inline void async_manager(void)
+{
+    fibril_switch(FIBRIL_TO_MANAGER);
+}
-extern int __async_init(void);
-extern ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs);
+ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs);
 static inline ipc_callid_t async_get_call(ipc_call_t *data)
 {
     return async_get_call_timeout(data, 0);
 }
-static inline void async_manager(void)
-{
-    fibril_switch(FIBRIL_TO_MANAGER);
-}
 /*
  * User-friendly wrappers for async_send_fast() and async_send_slow(). The
  * macros are in the form async_send_m(), where m denotes the number of payload
 ,20 → 63,20
  */
 #define async_send_0(phoneid, method, dataptr) \
-    async_send_fast((phoneid), (method), 0, 0, 0, 0, (dataptr))
+    async_send_fast((phoneid), (method), 0, 0, 0, 0, (dataptr))
 #define async_send_1(phoneid, method, arg1, dataptr) \
-    async_send_fast((phoneid), (method), (arg1), 0, 0, 0, (dataptr))
+    async_send_fast((phoneid), (method), (arg1), 0, 0, 0, (dataptr))
 #define async_send_2(phoneid, method, arg1, arg2, dataptr) \
-    async_send_fast((phoneid), (method), (arg1), (arg2), 0, 0, (dataptr))
+    async_send_fast((phoneid), (method), (arg1), (arg2), 0, 0, (dataptr))
 #define async_send_3(phoneid, method, arg1, arg2, arg3, dataptr) \
-    async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (dataptr))
+    async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (dataptr))
 #define async_send_4(phoneid, method, arg1, arg2, arg3, arg4, dataptr) \
-    async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (dataptr))
+    async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+        (dataptr))
 #define async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \
-    async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), (dataptr))
+    async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+        (arg5), (dataptr))
 extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
 extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
 ,11 → 86,12
 extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
     suseconds_t timeout);
-extern fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
-    ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
-extern void async_usleep(suseconds_t timeout);
-extern void async_create_manager(void);
-extern void async_destroy_manager(void);
+fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid,
+    ipc_call_t *call, void (*cthread)(ipc_callid_t,ipc_call_t *));
+void async_usleep(suseconds_t timeout);
+void async_create_manager(void);
+void async_destroy_manager(void);
+int _async_init(void);
 extern void async_set_client_connection(async_client_conn_t conn);
 extern void async_set_interrupt_received(async_client_conn_t conn);
 ,114 → 98,114
 /* Wrappers for simple communication */
 #define async_msg_0(phone, method) \
-    ipc_call_async_0((phone), (method), NULL, NULL, true)
+    ipc_call_async_0((phone), (method), NULL, NULL, !in_interrupt_handler())
 #define async_msg_1(phone, method, arg1) \
-    ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \
-        true)
+    ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \
+        !in_interrupt_handler())
 #define async_msg_2(phone, method, arg1, arg2) \
-    ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \
-        true)
+    ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \
+        !in_interrupt_handler())
 #define async_msg_3(phone, method, arg1, arg2, arg3) \
-    ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \
-        true)
+    ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \
+        !in_interrupt_handler())
 #define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \
-    ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
-        NULL, true)
+    ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
+        NULL, !in_interrupt_handler())
 #define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \
-    ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), NULL, NULL, true)
+    ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \
+        (arg5), NULL, NULL, !in_interrupt_handler())
 /*
  * User-friendly wrappers for async_req_fast() and async_req_slow(). The macros
  * are in the form async_req_m_n(), where m is the number of payload arguments
- * and n is the number of return arguments. The macros decide between the fast
+ * and n is the number of return arguments. The macros decidce between the fast
  * and slow verion based on m.
  */
 #define async_req_0_0(phoneid, method) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \
-        NULL)
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \
+    NULL)
 #define async_req_0_1(phoneid, method, r1) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), NULL, NULL, NULL, \
-        NULL)
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), NULL, NULL, NULL, \
+    NULL)
 #define async_req_0_2(phoneid, method, r1, r2) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), NULL, NULL, \
-        NULL)
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), NULL, NULL, \
+    NULL)
 #define async_req_0_3(phoneid, method, r1, r2, r3) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), NULL, \
-        NULL)
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), NULL, \
+    NULL)
 #define async_req_0_4(phoneid, method, r1, r2, r3, r4) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \
-        NULL)
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \
+    NULL)
 #define async_req_0_5(phoneid, method, r1, r2, r3, r4, r5) \
-    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \
-        (r5))
+    async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \
+    (r5))
 #define async_req_1_0(phoneid, method, arg1) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, NULL, NULL, NULL, \
-        NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, NULL, NULL, NULL, \
+    NULL, NULL)
 #define async_req_1_1(phoneid, method, arg1, rc1) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), NULL, NULL, \
-        NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), NULL, NULL, \
+    NULL, NULL)
 #define async_req_1_2(phoneid, method, arg1, rc1, rc2) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), NULL, \
-        NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), NULL, \
+    NULL, NULL)
 #define async_req_1_3(phoneid, method, arg1, rc1, rc2, rc3) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
-        NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
+    NULL, NULL)
 #define async_req_1_4(phoneid, method, arg1, rc1, rc2, rc3, rc4) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
-        (rc4), NULL)
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
+    (rc4), NULL)
 #define async_req_1_5(phoneid, method, arg1, rc1, rc2, rc3, rc4, rc5) \
-    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
-        (rc4), (rc5))
+    async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \
+    (rc4), (rc5))
 #define async_req_2_0(phoneid, method, arg1, arg2) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL, NULL, \
-        NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL, NULL, \
+    NULL, NULL, NULL)
 #define async_req_2_1(phoneid, method, arg1, arg2, rc1) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), NULL, \
-        NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), NULL, \
+    NULL, NULL, NULL)
 #define async_req_2_2(phoneid, method, arg1, arg2, rc1, rc2) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
-        NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
+    NULL, NULL, NULL)
 #define async_req_2_3(phoneid, method, arg1, arg2, rc1, rc2, rc3) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
-        (rc3), NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
+    (rc3), NULL, NULL)
 #define async_req_2_4(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
-        (rc3), (rc4), NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
+    (rc3), (rc4), NULL)
 #define async_req_2_5(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
-        (rc3), (rc4), (rc5))
+    async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \
+    (rc3), (rc4), (rc5))
 #define async_req_3_0(phoneid, method, arg1, arg2, arg3) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, NULL, NULL, \
-        NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, NULL, NULL, \
+    NULL, NULL, NULL)
 #define async_req_3_1(phoneid, method, arg1, arg2, arg3, rc1) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
-        NULL, NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
+    NULL, NULL, NULL, NULL)
 #define async_req_3_2(phoneid, method, arg1, arg2, arg3, rc1, rc2) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
-        (rc2), NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
+    (rc2), NULL, NULL, NULL)
 #define async_req_3_3(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
-        (rc2), (rc3), NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
+    (rc2), (rc3), NULL, NULL)
 #define async_req_3_4(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
-        (rc2), (rc3), (rc4), NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
+    (rc2), (rc3), (rc4), NULL)
 #define async_req_3_5(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \
     rc5) \
     async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \
         (rc2), (rc3), (rc4), (rc5))
 #define async_req_4_0(phoneid, method, arg1, arg2, arg3, arg4) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
-        NULL, NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
+    NULL, NULL, NULL, NULL)
 #define async_req_4_1(phoneid, method, arg1, arg2, arg3, arg4, rc1) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
-        NULL, NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
+    NULL, NULL, NULL, NULL)
 #define async_req_4_2(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
-        (rc2), NULL, NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
+    (rc2), NULL, NULL, NULL)
 #define async_req_4_3(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \
-    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
-        (rc2), (rc3), NULL, NULL)
+    async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \
+    (rc2), (rc3), NULL, NULL)
 #define async_req_4_4(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \
     rc4) \
     async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
 ,14 → 215,14
     async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
         (rc1), (rc2), (rc3), (rc4), (rc5))
 #define async_req_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \
-    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), NULL, NULL, NULL, NULL, NULL)
+    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+        (arg5), NULL, NULL, NULL, NULL, NULL)
 #define async_req_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1) \
-    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), (rc1), NULL, NULL, NULL, NULL)
+    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+    (arg5), (rc1), NULL, NULL, NULL, NULL)
 #define async_req_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \
-    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), (rc1), (rc2), NULL, NULL, NULL)
+    async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
+    (arg5), (rc1), (rc2), NULL, NULL, NULL)
 #define async_req_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \
     rc3) \
     async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
 ,6 → 253,10
     fibril_dec_sercount();
 }
+extern bool in_interrupt_handler(void);
+extern atomic_t async_futex;
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/syscall.h
 ,28 → 32,15
 /**
  * @file
  * @brief   Syscall function declaration for architectures that don't
- *      inline syscalls or architectures that handle syscalls
- *      according to the number of arguments.
+ *      inline syscalls.
  */
 #ifndef LIBC_SYSCALL_H_
 #define LIBC_SYSCALL_H_
-#ifndef LIBARCH_SYSCALL_GENERIC
-#error "You can't include this file directly."
-#endif
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
-#define __syscall0  __syscall
-#define __syscall1  __syscall
-#define __syscall2  __syscall
-#define __syscall3  __syscall
-#define __syscall4  __syscall
-#define __syscall5  __syscall
-#define __syscall6  __syscall
 extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2,
     const sysarg_t p3, const sysarg_t p4, const sysarg_t p5, const sysarg_t p6,
     const syscall_t id);

 /trunk/uspace/lib/libc/include/libc.h
 ,22 → 39,17
 #include <kernel/syscall/syscall.h>
 #include <libarch/syscall.h>
-#define __SYSCALL0(id) \
-    __syscall0(0, 0, 0, 0, 0, 0, id)
-#define __SYSCALL1(id, p1) \
-    __syscall1(p1, 0, 0, 0, 0, 0, id)
-#define __SYSCALL2(id, p1, p2) \
-    __syscall2(p1, p2, 0, 0, 0, 0, id)
-#define __SYSCALL3(id, p1, p2, p3) \
-    __syscall3(p1, p2, p3, 0, 0, 0, id)
-#define __SYSCALL4(id, p1, p2, p3, p4) \
-    __syscall4(p1, p2, p3, p4, 0, 0, id)
-#define __SYSCALL5(id, p1, p2, p3, p4, p5) \
-    __syscall5(p1, p2, p3, p4, p5, 0, id)
+#define __SYSCALL0(id) __syscall(0, 0, 0, 0, 0, 0, id)
+#define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, 0, 0, id)
+#define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, 0, 0, 0, id)
+#define __SYSCALL3(id, p1, p2, p3) __syscall(p1, p2, p3, 0, 0, 0, id)
+#define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1, p2, p3, p4, 0, 0, id)
+#define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
-    __syscall6(p1, p2, p3, p4, p5, p6, id)
+    __syscall(p1, p2, p3, p4, p5, p6,id)
-extern void __main(void *pcb_ptr);
+extern void __main(void);
+extern void __io_init(void);
 extern void __exit(void);
 #endif

 /trunk/uspace/lib/libc/include/libadt/hash_table.h
 ,0 → 1,93
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_HASH_TABLE_H_
+#define LIBC_HASH_TABLE_H_
+#include <libadt/list.h>
+#include <unistd.h>
+typedef unsigned long hash_count_t;
+typedef unsigned long hash_index_t;
+typedef struct hash_table hash_table_t;
+typedef struct hash_table_operations hash_table_operations_t;
+/** Hash table structure. */
+struct hash_table {
+    link_t *entry;
+    hash_count_t entries;
+    hash_count_t max_keys;
+    hash_table_operations_t *op;
+};
+/** Set of operations for hash table. */
+struct hash_table_operations {
+    /** Hash function.
+     *
+     * @param key   Array of keys needed to compute hash index. All keys
+     *      must be passed.
+     *
+     * @return  Index into hash table.
+     */
+    hash_index_t (* hash)(unsigned long key[]);
+    /** Hash table item comparison function.
+     *
+     * @param key   Array of keys that will be compared with item. It is
+     *      not necessary to pass all keys.
+     *
+     * @return  true if the keys match, false otherwise.
+     */
+    int (*compare)(unsigned long key[], hash_count_t keys, link_t *item);
+    /** Hash table item removal callback.
+     *
+     * @param item  Item that was removed from the hash table.
+     */
+    void (*remove_callback)(link_t *item);
+};
+#define hash_table_get_instance(item, type, member) \
+    list_get_instance((item), type, member)
+extern int hash_table_create(hash_table_t *, hash_count_t, hash_count_t,
+    hash_table_operations_t *);
+extern void hash_table_insert(hash_table_t *, unsigned long [], link_t *);
+extern link_t *hash_table_find(hash_table_t *, unsigned long []);
+extern void hash_table_remove(hash_table_t *, unsigned long [], hash_count_t);
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/libadt/list.h
 ,0 → 1,194
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_LIST_H_
+#define LIBC_LIST_H_
+#include <unistd.h>
+#ifndef true
+# define true 1
+#endif
+#ifndef false
+# define false 0
+#endif
+typedef struct link link_t;
+/** Doubly linked list head and link type. */
+struct link {
+    link_t *prev;   /**< Pointer to the previous item in the list. */
+    link_t *next;   /**< Pointer to the next item in the list. */
+};
+/** Declare and initialize statically allocated list.
+ *
+ * @param name Name of the new statically allocated list.
+ */
+#define LIST_INITIALIZE(name)       link_t name = { .prev = &name, .next = &name }
+/** Initialize doubly-linked circular list link
+ *
+ * Initialize doubly-linked list link.
+ *
+ * @param link Pointer to link_t structure to be initialized.
+ */
+static inline void link_initialize(link_t *link)
+{
+    link->prev = NULL;
+    link->next = NULL;
+}
+/** Initialize doubly-linked circular list
+ *
+ * Initialize doubly-linked circular list.
+ *
+ * @param head Pointer to link_t structure representing head of the list.
+ */
+static inline void list_initialize(link_t *head)
+{
+    head->prev = head;
+    head->next = head;
+}
+/** Add item to the beginning of doubly-linked circular list
+ *
+ * Add item to the beginning of doubly-linked circular list.
+ *
+ * @param link Pointer to link_t structure to be added.
+ * @param head Pointer to link_t structure representing head of the list.
+ */
+static inline void list_prepend(link_t *link, link_t *head)
+{
+    link->next = head->next;
+    link->prev = head;
+    head->next->prev = link;
+    head->next = link;
+}
+/** Add item to the end of doubly-linked circular list
+ *
+ * Add item to the end of doubly-linked circular list.
+ *
+ * @param link Pointer to link_t structure to be added.
+ * @param head Pointer to link_t structure representing head of the list.
+ */
+static inline void list_append(link_t *link, link_t *head)
+{
+    link->prev = head->prev;
+    link->next = head;
+    head->prev->next = link;
+    head->prev = link;
+}
+/** Remove item from doubly-linked circular list
+ *
+ * Remove item from doubly-linked circular list.
+ *
+ * @param link Pointer to link_t structure to be removed from the list it is contained in.
+ */
+static inline void list_remove(link_t *link)
+{
+    link->next->prev = link->prev;
+    link->prev->next = link->next;
+    link_initialize(link);
+}
+/** Query emptiness of doubly-linked circular list
+ *
+ * Query emptiness of doubly-linked circular list.
+ *
+ * @param head Pointer to link_t structure representing head of the list.
+ */
+static inline int list_empty(link_t *head)
+{
+    return head->next == head ? true : false;
+}
+/** Split or concatenate headless doubly-linked circular list
+ *
+ * Split or concatenate headless doubly-linked circular list.
+ *
+ * Note that the algorithm works both directions:
+ * concatenates splitted lists and splits concatenated lists.
+ *
+ * @param part1 Pointer to link_t structure leading the first (half of the headless) list.
+ * @param part2 Pointer to link_t structure leading the second (half of the headless) list.
+ */
+static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
+{
+    link_t *hlp;
+    part1->prev->next = part2;
+    part2->prev->next = part1;
+    hlp = part1->prev;
+    part1->prev = part2->prev;
+    part2->prev = hlp;
+}
+/** Split headless doubly-linked circular list
+ *
+ * Split headless doubly-linked circular list.
+ *
+ * @param part1 Pointer to link_t structure leading the first half of the headless list.
+ * @param part2 Pointer to link_t structure leading the second half of the headless list.
+ */
+static inline void headless_list_split(link_t *part1, link_t *part2)
+{
+    headless_list_split_or_concat(part1, part2);
+}
+/** Concatenate two headless doubly-linked circular lists
+ *
+ * Concatenate two headless doubly-linked circular lists.
+ *
+ * @param part1 Pointer to link_t structure leading the first headless list.
+ * @param part2 Pointer to link_t structure leading the second headless list.
+ */
+static inline void headless_list_concat(link_t *part1, link_t *part2)
+{
+    headless_list_split_or_concat(part1, part2);
+}
+#define list_get_instance(link,type,member) (type *)(((char *)(link))-((char *)&(((type *)NULL)->member)))
+extern int list_member(const link_t *link, const link_t *head);
+extern void list_concat(link_t *head1, link_t *head2);
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/libadt/fifo.h
 ,0 → 1,127
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+/*
+ * This implementation of FIFO stores values in an array
+ * (static or dynamic). As such, these FIFOs have upper bound
+ * on number of values they can store. Push and pop operations
+ * are done via accessing the array through head and tail indices.
+ * Because of better operation ordering in fifo_pop(), the access
+ * policy for these two indices is to 'increment (mod size of FIFO)
+ * and use'.
+ */
+#ifndef LIBC_FIFO_H_
+#define LIBC_FIFO_H_
+#include <malloc.h>
+typedef unsigned long fifo_count_t;
+typedef unsigned long fifo_index_t;
+#define FIFO_CREATE_STATIC(name, t, itms)       \
+    struct {                    \
+        t fifo[(itms)];             \
+        fifo_count_t items;         \
+        fifo_index_t head;          \
+        fifo_index_t tail;          \
+    } name
+/** Create and initialize static FIFO.
+ *
+ * FIFO is allocated statically.
+ * This macro is suitable for creating smaller FIFOs.
+ *
+ * @param name Name of FIFO.
+ * @param t Type of values stored in FIFO.
+ * @param itms Number of items that can be stored in FIFO.
+ */
+#define FIFO_INITIALIZE_STATIC(name, t, itms)       \
+    FIFO_CREATE_STATIC(name, t, itms) = {       \
+        .items = (itms),            \
+        .head = 0,              \
+        .tail = 0               \
+    }
+/** Create and prepare dynamic FIFO.
+ *
+ * FIFO is allocated dynamically.
+ * This macro is suitable for creating larger FIFOs.
+ *
+ * @param name Name of FIFO.
+ * @param t Type of values stored in FIFO.
+ * @param itms Number of items that can be stored in FIFO.
+ */
+#define FIFO_INITIALIZE_DYNAMIC(name, t, itms)      \
+    struct {                    \
+        t *fifo;                \
+        fifo_count_t items;         \
+        fifo_index_t head;          \
+        fifo_index_t tail;          \
+    } name = {                  \
+        .fifo = NULL,               \
+        .items = (itms),            \
+        .head = 0,              \
+        .tail = 0               \
+    }
+/** Pop value from head of FIFO.
+ *
+ * @param name FIFO name.
+ *
+ * @return Leading value in FIFO.
+ */
+#define fifo_pop(name) \
+    name.fifo[name.head = (name.head + 1) < name.items ? (name.head + 1) : 0]
+/** Push value to tail of FIFO.
+ *
+ * @param name FIFO name.
+ * @param value Value to be appended to FIFO.
+ *
+ */
+#define fifo_push(name, value) \
+    name.fifo[name.tail = (name.tail + 1) < name.items ? (name.tail + 1) : 0] = (value)
+/** Allocate memory for dynamic FIFO.
+ *
+ * @param name FIFO name.
+ */
+#define fifo_create(name) \
+    name.fifo = malloc(sizeof(*name.fifo) * name.items)
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/thread.h
 ,7 → 45,7
 extern void __thread_main(uspace_arg_t *);
 extern int thread_create(void (*)(void *), void *, char *, thread_id_t *);
-extern void thread_exit(int) __attribute__ ((noreturn));
+extern void thread_exit(int);
 extern void thread_detach(thread_id_t);
 extern int thread_join(thread_id_t);
 extern thread_id_t thread_get_id(void);

 /trunk/uspace/lib/libc/include/fibril.h
 ,18 → 36,17
 #define LIBC_FIBRIL_H_
 #include <libarch/fibril.h>
-#include <adt/list.h>
+#include <libadt/list.h>
 #include <libarch/tls.h>
 #ifndef context_set
-#define context_set(c, _pc, stack, size, ptls) \
-    (c)->pc = (sysarg_t) (_pc); \
-    (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-    (c)->tls = (sysarg_t) (ptls);
+#define context_set(c, _pc, stack, size, ptls)          \
+    (c)->pc = (sysarg_t) (_pc);             \
+    (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
+        (c)->tls = (sysarg_t) (ptls);
 #endif /* context_set */
-#define FIBRIL_SERIALIZED   1
-#define FIBRIL_WRITER       2
+#define FIBRIL_SERIALIZED   1
 typedef enum {
     FIBRIL_PREEMPT,
 ,10 → 71,7
 };
 typedef struct fibril fibril_t;
-/** Fibril-local variable specifier */
-#define fibril_local __thread
-extern int context_save(context_t *c) __attribute__ ((returns_twice));
+extern int context_save(context_t *c);
 extern void context_restore(context_t *c) __attribute__ ((noreturn));
 extern fid_t fibril_create(int (*func)(void *), void *arg);

/trunk/uspace/lib/libc/include/as.h
42,7 → 42,6

extern void as_area_create(void address, size_t size, int flags);
extern int as_area_resize(void *address, size_t size, int flags);
extern int as_area_change_flags(void *address, int flags);
extern int as_area_destroy(void *address);
extern void *set_maxheapsize(size_t mhs);
extern void * as_get_mappable_page(size_t sz);

 /trunk/uspace/lib/libc/include/stdio.h
 ,117 → 37,36
 #include <sys/types.h>
 #include <stdarg.h>
-#include <string.h>
-#include <adt/list.h>
-#define EOF  (-1)
+#define EOF (-1)
-/** Default size for stream I/O buffers */
-#define BUFSIZ  4096
+#include <string.h>
+#include <io/stream.h>
 #define DEBUG(fmt, ...) \
-    { \
-        char _buf[256]; \
-        int _n = snprintf(_buf, sizeof(_buf), fmt, ##__VA_ARGS__); \
-        if (_n > 0) \
-            (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) _buf, str_size(_buf)); \
-    }
+{ \
+    char buf[256]; \
+    int n; \
+    n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
+    if (n > 0) \
+        (void) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, strlen(buf)); \
+}
-#ifndef SEEK_SET
-    #define SEEK_SET  0
-    #define SEEK_CUR  1
-    #define SEEK_END  2
-#endif
-enum _buffer_type {
-    /** No buffering */
-    _IONBF,
-    /** Line buffering */
-    _IOLBF,
-    /** Full buffering */
-    _IOFBF
-};
-typedef struct {
-    /** Linked list pointer. */
-    link_t link;
-    /** Underlying file descriptor. */
-    int fd;
-    /** Error indicator. */
-    int error;
-    /** End-of-file indicator. */
-    int eof;
-    /** Klog indicator */
-    int klog;
-    /** Phone to the file provider */
-    int phone;
-    /** Buffering type */
-    enum _buffer_type btype;
-    /** Buffer */
-    uint8_t *buf;
-    /** Buffer size */
-    size_t buf_size;
-    /** Buffer I/O pointer */
-    uint8_t *buf_head;
-} FILE;
-extern FILE *stdin;
-extern FILE *stdout;
-extern FILE *stderr;
-/* Character and string input functions */
-extern int fgetc(FILE *);
-extern char *fgets(char *, size_t, FILE *);
 extern int getchar(void);
-extern char *gets(char *, size_t);
-/* Character and string output functions */
-extern int fputc(wchar_t, FILE *);
-extern int fputs(const char *, FILE *);
+extern int puts(const char * str);
+extern int putchar(int c);
-extern int putchar(wchar_t);
-extern int puts(const char *);
+extern int printf(const char *fmt, ...);
+extern int sprintf(char *str, const char *fmt, ...);
+extern int snprintf(char *str, size_t size, const char *fmt, ...);
-/* Formatted string output functions */
-extern int fprintf(FILE *, const char*, ...);
-extern int vfprintf(FILE *, const char *, va_list);
+extern int vprintf(const char *fmt, va_list ap);
+extern int vsprintf(char *str, const char *fmt, va_list ap);
+extern int vsnprintf(char *str, size_t size, const char *fmt, va_list ap);
-extern int printf(const char *, ...);
-extern int vprintf(const char *, va_list);
+#define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__)
-extern int snprintf(char *, size_t , const char *, ...);
-extern int asprintf(char **, const char *, ...);
-extern int vsnprintf(char *, size_t, const char *, va_list);
-/* File stream functions */
-extern FILE *fopen(const char *, const char *);
-extern FILE *fdopen(int, const char *);
-extern int fclose(FILE *);
-extern size_t fread(void *, size_t, size_t, FILE *);
-extern size_t fwrite(const void *, size_t, size_t, FILE *);
-extern int fseek(FILE *, long, int);
-extern void rewind(FILE *);
-extern int ftell(FILE *);
-extern int feof(FILE *);
-extern int fflush(FILE *);
-extern int ferror(FILE *);
-extern void clearerr(FILE *);
-extern void setvbuf(FILE *, void *, int, size_t);
-/* Misc file functions */
-extern int rename(const char *, const char *);
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/bitops.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup generic
+/** @addtogroup generic
  * @{
  */
 /** @file
 ,10 → 42,10
  *
  * If number is zero, it returns 0
  */
-static inline unsigned int fnzb32(uint32_t arg)
+static inline int fnzb32(uint32_t arg)
 {
-    unsigned int n = 0;
+    int n = 0;
     if (arg >> 16) {
         arg >>= 16;
         n += 16;
 ,22 → 74,19
     return n;
 }
-static inline unsigned int fnzb64(uint64_t arg)
+static inline int fnzb64(uint64_t arg)
 {
-    unsigned int n = 0;
+    int n = 0;
     if (arg >> 32) {
         arg >>= 32;
         n += 32;
     }
-    return (n + fnzb32((uint32_t) arg));
+    return n + fnzb32((uint32_t) arg);
 }
-static inline unsigned int fnzb(size_t arg)
-{
-    return fnzb64(arg);
-}
+#define fnzb(x) fnzb32(x)
 #endif

 /trunk/uspace/lib/libc/include/task.h
 ,18 → 39,8
 typedef uint64_t task_id_t;
-typedef enum {
-    TASK_EXIT_NORMAL,
-    TASK_EXIT_UNEXPECTED
-} task_exit_t;
 extern task_id_t task_get_id(void);
-extern int task_set_name(const char *name);
-extern task_id_t task_spawn(const char *path, char *const argv[]);
-extern int task_wait(task_id_t id, task_exit_t *texit, int *retval);
-extern int task_retval(int val);
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/ctype.h
 ,22 → 76,6
     }
 }
-static inline int tolower(int c)
-{
-    if (isupper(c))
-        return (c + ('a' - 'A'));
-    else
-        return c;
-}
-static inline int toupper(int c)
-{
-    if (islower(c))
-        return (c + ('A' - 'a'));
-    else
-        return c;
-}
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/align.h
 ,28 → 35,21
 #ifndef LIBC_ALIGN_H_
 #define LIBC_ALIGN_H_
-/** Align to the nearest lower address which is a power of two.
+/** Align to the nearest lower address.
  *
- * @param s     Address or size to be aligned.
- * @param a     Size of alignment, must be power of 2.
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
  */
 #define ALIGN_DOWN(s, a)    ((s) & ~((a) - 1))
-/** Align to the nearest higher address which is a power of two.
+/** Align to the nearest higher address.
  *
- * @param s     Address or size to be aligned.
- * @param a     Size of alignment, must be power of 2.
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
  */
 #define ALIGN_UP(s, a)      ((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
-/** Round up to the nearest higher boundary.
- *
- * @param n     Number to be aligned.
- * @param b     Boundary, arbitrary unsigned number.
- */
-#define ROUND_UP(n, b)      (((n) / (b) + ((n) % (b) != 0)) * (b))
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/endian.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ENDIAN_H_
+#define LIBC_ENDIAN_H_
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN    4321
+#define __PDP_ENDIAN    3412
+#include <libarch/endian.h>
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/include/ddi.h
 ,11 → 37,9
 #include <task.h>
-extern int device_assign_devno(void);
-extern int physmem_map(void *, void *, unsigned long, int);
-extern int iospace_enable(task_id_t, void *, unsigned long);
-extern int preemption_control(int);
-extern int pio_enable(void *, size_t, void **);
+extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
+extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
+extern int preemption_control(int enable);
 #endif

 /trunk/uspace/lib/libc/include/stdlib.h
 ,10 → 38,10
 #include <unistd.h>
 #include <malloc.h>
-#define abort()       _exit(1)
-#define exit(status)  _exit((status))
+#define abort() _exit(1)
+#define exit(status)    _exit((status))
-#define RAND_MAX  714025
+#define RAND_MAX 714025
 extern long int random(void);
 extern void srandom(unsigned int seed);
 ,7 → 50,6
 {
     return random();
 }
 static inline void srand(unsigned int seed)
 {
     srandom(seed);

 /trunk/uspace/lib/libc/include/malloc.h
 ,51 → 1,537
 /*
- * Copyright (c) 2009 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+  Default header file for malloc-2.8.x, written by Doug Lea
+  and released to the public domain, as explained at
+  http://creativecommons.org/licenses/publicdomain.
+  last update: Mon Aug 15 08:55:52 2005  Doug Lea  (dl at gee)
-/** @addtogroup libc
- * @{
+  This header is for ANSI C/C++ only.  You can set any of
+  the following #defines before including:
+  * If USE_DL_PREFIX is defined, it is assumed that malloc.c
+    was also compiled with this option, so all routines
+    have names starting with "dl".
+  * If HAVE_USR_INCLUDE_MALLOC_H is defined, it is assumed that this
+    file will be #included AFTER <malloc.h>. This is needed only if
+    your system defines a struct mallinfo that is incompatible with the
+    standard one declared here.  Otherwise, you can include this file
+    INSTEAD of your system system <malloc.h>.  At least on ANSI, all
+    declarations should be compatible with system versions
+  * If MSPACES is defined, declarations for mspace versions are included.
+*/
+#ifndef MALLOC_280_H
+#define MALLOC_280_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stddef.h>   /* for size_t */
+#if !ONLY_MSPACES
+#ifndef USE_DL_PREFIX
+#define dlcalloc               calloc
+#define dlfree                 free
+#define dlmalloc               malloc
+#define dlmemalign             memalign
+#define dlrealloc              realloc
+#define dlvalloc               valloc
+#define dlpvalloc              pvalloc
+#define dlmallinfo             mallinfo
+#define dlmallopt              mallopt
+#define dlmalloc_trim          malloc_trim
+#define dlmalloc_stats         malloc_stats
+#define dlmalloc_usable_size   malloc_usable_size
+#define dlmalloc_footprint     malloc_footprint
+#define dlmalloc_max_footprint malloc_max_footprint
+#define dlindependent_calloc   independent_calloc
+#define dlindependent_comalloc independent_comalloc
+#endif /* USE_DL_PREFIX */
+/*
+  malloc(size_t n)
+  Returns a pointer to a newly allocated chunk of at least n bytes, or
+  null if no space is available, in which case errno is set to ENOMEM
+  on ANSI C systems.
+  If n is zero, malloc returns a minimum-sized chunk. (The minimum
+  size is 16 bytes on most 32bit systems, and 32 bytes on 64bit
+  systems.)  Note that size_t is an unsigned type, so calls with
+  arguments that would be negative if signed are interpreted as
+  requests for huge amounts of space, which will often fail. The
+  maximum supported value of n differs across systems, but is in all
+  cases less than the maximum representable value of a size_t.
+*/
+void* dlmalloc(size_t);
+/*
+  free(void* p)
+  Releases the chunk of memory pointed to by p, that had been previously
+  allocated using malloc or a related routine such as realloc.
+  It has no effect if p is null. If p was not malloced or already
+  freed, free(p) will by default cuase the current program to abort.
+*/
+void  dlfree(void*);
+/*
+  calloc(size_t n_elements, size_t element_size);
+  Returns a pointer to n_elements * element_size bytes, with all locations
+  set to zero.
+*/
+void* dlcalloc(size_t, size_t);
+/*
+  realloc(void* p, size_t n)
+  Returns a pointer to a chunk of size n that contains the same data
+  as does chunk p up to the minimum of (n, p's size) bytes, or null
+  if no space is available.
+  The returned pointer may or may not be the same as p. The algorithm
+  prefers extending p in most cases when possible, otherwise it
+  employs the equivalent of a malloc-copy-free sequence.
+  If p is null, realloc is equivalent to malloc.
+  If space is not available, realloc returns null, errno is set (if on
+  ANSI) and p is NOT freed.
+  if n is for fewer bytes than already held by p, the newly unused
+  space is lopped off and freed if possible.  realloc with a size
+  argument of zero (re)allocates a minimum-sized chunk.
+  The old unix realloc convention of allowing the last-free'd chunk
+  to be used as an argument to realloc is not supported.
+*/
+void* dlrealloc(void*, size_t);
+/*
+  memalign(size_t alignment, size_t n);
+  Returns a pointer to a newly allocated chunk of n bytes, aligned
+  in accord with the alignment argument.
+  The alignment argument should be a power of two. If the argument is
+  not a power of two, the nearest greater power is used.
+-byte alignment is guaranteed by normal malloc calls, so don't
+  bother calling memalign with an argument of 8 or less.
+  Overreliance on memalign is a sure way to fragment space.
+*/
+void* dlmemalign(size_t, size_t);
+/*
+  valloc(size_t n);
+  Equivalent to memalign(pagesize, n), where pagesize is the page
+  size of the system. If the pagesize is unknown, 4096 is used.
+*/
+void* dlvalloc(size_t);
+/*
+  mallopt(int parameter_number, int parameter_value)
+  Sets tunable parameters The format is to provide a
+  (parameter-number, parameter-value) pair.  mallopt then sets the
+  corresponding parameter to the argument value if it can (i.e., so
+  long as the value is meaningful), and returns 1 if successful else
+.  SVID/XPG/ANSI defines four standard param numbers for mallopt,
+  normally defined in malloc.h.  None of these are use in this malloc,
+  so setting them has no effect. But this malloc also supports other
+  options in mallopt:
+  Symbol            param #  default    allowed param values
+  M_TRIM_THRESHOLD     -1   2*1024*1024   any   (-1U disables trimming)
+  M_GRANULARITY        -2     page size   any power of 2 >= page size
+  M_MMAP_THRESHOLD     -3      256*1024   any   (or 0 if no MMAP support)
+*/
+int dlmallopt(int, int);
+#define M_TRIM_THRESHOLD     (-1)
+#define M_GRANULARITY        (-2)
+#define M_MMAP_THRESHOLD     (-3)
+/*
+  malloc_footprint();
+  Returns the number of bytes obtained from the system.  The total
+  number of bytes allocated by malloc, realloc etc., is less than this
+  value. Unlike mallinfo, this function returns only a precomputed
+  result, so can be called frequently to monitor memory consumption.
+  Even if locks are otherwise defined, this function does not use them,
+  so results might not be up to date.
+*/
+size_t dlmalloc_footprint(void);
+size_t dlmalloc_max_footprint(void);
+#if !NO_MALLINFO
+/*
+  mallinfo()
+  Returns (by copy) a struct containing various summary statistics:
+  arena:     current total non-mmapped bytes allocated from system
+  ordblks:   the number of free chunks
+  smblks:    always zero.
+  hblks:     current number of mmapped regions
+  hblkhd:    total bytes held in mmapped regions
+  usmblks:   the maximum total allocated space. This will be greater
+                than current total if trimming has occurred.
+  fsmblks:   always zero
+  uordblks:  current total allocated space (normal or mmapped)
+  fordblks:  total free space
+  keepcost:  the maximum number of bytes that could ideally be released
+               back to system via malloc_trim. ("ideally" means that
+               it ignores page restrictions etc.)
+  Because these fields are ints, but internal bookkeeping may
+  be kept as longs, the reported values may wrap around zero and
+  thus be inaccurate.
+*/
+#ifndef HAVE_USR_INCLUDE_MALLOC_H
+#ifndef _MALLOC_H
+#ifndef MALLINFO_FIELD_TYPE
+#define MALLINFO_FIELD_TYPE size_t
+#endif /* MALLINFO_FIELD_TYPE */
+struct mallinfo {
+  MALLINFO_FIELD_TYPE arena;    /* non-mmapped space allocated from system */
+  MALLINFO_FIELD_TYPE ordblks;  /* number of free chunks */
+  MALLINFO_FIELD_TYPE smblks;   /* always 0 */
+  MALLINFO_FIELD_TYPE hblks;    /* always 0 */
+  MALLINFO_FIELD_TYPE hblkhd;   /* space in mmapped regions */
+  MALLINFO_FIELD_TYPE usmblks;  /* maximum total allocated space */
+  MALLINFO_FIELD_TYPE fsmblks;  /* always 0 */
+  MALLINFO_FIELD_TYPE uordblks; /* total allocated space */
+  MALLINFO_FIELD_TYPE fordblks; /* total free space */
+  MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */
+};
+#endif  /* _MALLOC_H */
+#endif  /* HAVE_USR_INCLUDE_MALLOC_H */
+struct mallinfo dlmallinfo(void);
+#endif  /* NO_MALLINFO */
+/*
+  independent_calloc(size_t n_elements, size_t element_size, void* chunks[]);
+  independent_calloc is similar to calloc, but instead of returning a
+  single cleared space, it returns an array of pointers to n_elements
+  independent elements that can hold contents of size elem_size, each
+  of which starts out cleared, and can be independently freed,
+  realloc'ed etc. The elements are guaranteed to be adjacently
+  allocated (this is not guaranteed to occur with multiple callocs or
+  mallocs), which may also improve cache locality in some
+  applications.
+  The "chunks" argument is optional (i.e., may be null, which is
+  probably the most typical usage). If it is null, the returned array
+  is itself dynamically allocated and should also be freed when it is
+  no longer needed. Otherwise, the chunks array must be of at least
+  n_elements in length. It is filled in with the pointers to the
+  chunks.
+  In either case, independent_calloc returns this pointer array, or
+  null if the allocation failed.  If n_elements is zero and "chunks"
+  is null, it returns a chunk representing an array with zero elements
+  (which should be freed if not wanted).
+  Each element must be individually freed when it is no longer
+  needed. If you'd like to instead be able to free all at once, you
+  should instead use regular calloc and assign pointers into this
+  space to represent elements.  (In this case though, you cannot
+  independently free elements.)
+  independent_calloc simplifies and speeds up implementations of many
+  kinds of pools.  It may also be useful when constructing large data
+  structures that initially have a fixed number of fixed-sized nodes,
+  but the number is not known at compile time, and some of the nodes
+  may later need to be freed. For example:
+  struct Node { int item; struct Node* next; };
+  struct Node* build_list() {
+    struct Node** pool;
+    int n = read_number_of_nodes_needed();
+    if (n <= 0) return 0;
+    pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0);
+    if (pool == 0) die();
+    // organize into a linked list...
+    struct Node* first = pool[0];
+    for (i = 0; i < n-1; ++i)
+      pool[i]->next = pool[i+1];
+    free(pool);     // Can now free the array (or not, if it is needed later)
+    return first;
+  }
+*/
+void** dlindependent_calloc(size_t, size_t, void**);
+/*
+  independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]);
+  independent_comalloc allocates, all at once, a set of n_elements
+  chunks with sizes indicated in the "sizes" array.    It returns
+  an array of pointers to these elements, each of which can be
+  independently freed, realloc'ed etc. The elements are guaranteed to
+  be adjacently allocated (this is not guaranteed to occur with
+  multiple callocs or mallocs), which may also improve cache locality
+  in some applications.
+  The "chunks" argument is optional (i.e., may be null). If it is null
+  the returned array is itself dynamically allocated and should also
+  be freed when it is no longer needed. Otherwise, the chunks array
+  must be of at least n_elements in length. It is filled in with the
+  pointers to the chunks.
+  In either case, independent_comalloc returns this pointer array, or
+  null if the allocation failed.  If n_elements is zero and chunks is
+  null, it returns a chunk representing an array with zero elements
+  (which should be freed if not wanted).
+  Each element must be individually freed when it is no longer
+  needed. If you'd like to instead be able to free all at once, you
+  should instead use a single regular malloc, and assign pointers at
+  particular offsets in the aggregate space. (In this case though, you
+  cannot independently free elements.)
+  independent_comallac differs from independent_calloc in that each
+  element may have a different size, and also that it does not
+  automatically clear elements.
+  independent_comalloc can be used to speed up allocation in cases
+  where several structs or objects must always be allocated at the
+  same time.  For example:
+  struct Head { ... }
+  struct Foot { ... }
+  void send_message(char* msg) {
+    int msglen = strlen(msg);
+    size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) };
+    void* chunks[3];
+    if (independent_comalloc(3, sizes, chunks) == 0)
+      die();
+    struct Head* head = (struct Head*)(chunks[0]);
+    char*        body = (char*)(chunks[1]);
+    struct Foot* foot = (struct Foot*)(chunks[2]);
+    // ...
+  }
+  In general though, independent_comalloc is worth using only for
+  larger values of n_elements. For small values, you probably won't
+  detect enough difference from series of malloc calls to bother.
+  Overuse of independent_comalloc can increase overall memory usage,
+  since it cannot reuse existing noncontiguous small chunks that
+  might be available for some of the elements.
+*/
+void** dlindependent_comalloc(size_t, size_t*, void**);
+/*
+  pvalloc(size_t n);
+  Equivalent to valloc(minimum-page-that-holds(n)), that is,
+  round up n to nearest pagesize.
  */
-/** @file
- */
+void*  dlpvalloc(size_t);
-#ifndef LIBC_MALLOC_H_
-#define LIBC_MALLOC_H_
+/*
+  malloc_trim(size_t pad);
-#include <sys/types.h>
+  If possible, gives memory back to the system (via negative arguments
+  to sbrk) if there is unused memory at the `high' end of the malloc
+  pool or in unused MMAP segments. You can call this after freeing
+  large blocks of memory to potentially reduce the system-level memory
+  requirements of a program. However, it cannot guarantee to reduce
+  memory. Under some allocation patterns, some large free blocks of
+  memory will be locked between two used chunks, so they cannot be
+  given back to the system.
-extern void __heap_init(void);
-extern uintptr_t get_max_heap_addr(void);
+  The `pad' argument to malloc_trim represents the amount of free
+  trailing space to leave untrimmed. If this argument is zero, only
+  the minimum amount of memory to maintain internal data structures
+  will be left. Non-zero arguments can be supplied to maintain enough
+  trailing space to service future expected allocations without having
+  to re-obtain memory from the system.
-extern void *malloc(const size_t size);
-extern void *memalign(const size_t align, const size_t size);
-extern void *realloc(const void *addr, const size_t size);
-extern void free(const void *addr);
+  Malloc_trim returns 1 if it actually released any memory, else 0.
+*/
+int  dlmalloc_trim(size_t);
+/*
+  malloc_usable_size(void* p);
+  Returns the number of bytes you can actually use in
+  an allocated chunk, which may be more than you requested (although
+  often not) due to alignment and minimum size constraints.
+  You can use this many bytes without worrying about
+  overwriting other allocated objects. This is not a particularly great
+  programming practice. malloc_usable_size can be more useful in
+  debugging and assertions, for example:
+  p = malloc(n);
+  assert(malloc_usable_size(p) >= 256);
+*/
+size_t dlmalloc_usable_size(void*);
+/*
+  malloc_stats();
+  Prints on stderr the amount of space obtained from the system (both
+  via sbrk and mmap), the maximum amount (which may be more than
+  current if malloc_trim and/or munmap got called), and the current
+  number of bytes allocated via malloc (or realloc, etc) but not yet
+  freed. Note that this is the number of bytes allocated, not the
+  number requested. It will be larger than the number requested
+  because of alignment and bookkeeping overhead. Because it includes
+  alignment wastage as being in use, this figure may be greater than
+  zero even when no user-level chunks are allocated.
+  The reported current and maximum system memory can be inaccurate if
+  a program makes other calls to system memory allocation functions
+  (normally sbrk) outside of malloc.
+  malloc_stats prints only the most commonly interesting statistics.
+  More information can be obtained by calling mallinfo.
+*/
+void  dlmalloc_stats(void);
+#endif /* !ONLY_MSPACES */
+#if MSPACES
+/*
+  mspace is an opaque type representing an independent
+  region of space that supports mspace_malloc, etc.
+*/
+typedef void* mspace;
+/*
+  create_mspace creates and returns a new independent space with the
+  given initial capacity, or, if 0, the default granularity size.  It
+  returns null if there is no system memory available to create the
+  space.  If argument locked is non-zero, the space uses a separate
+  lock to control access. The capacity of the space will grow
+  dynamically as needed to service mspace_malloc requests.  You can
+  control the sizes of incremental increases of this space by
+  compiling with a different DEFAULT_GRANULARITY or dynamically
+  setting with mallopt(M_GRANULARITY, value).
+*/
+mspace create_mspace(size_t capacity, int locked);
+/*
+  destroy_mspace destroys the given space, and attempts to return all
+  of its memory back to the system, returning the total number of
+  bytes freed. After destruction, the results of access to all memory
+  used by the space become undefined.
+*/
+size_t destroy_mspace(mspace msp);
+/*
+  create_mspace_with_base uses the memory supplied as the initial base
+  of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this
+  space is used for bookkeeping, so the capacity must be at least this
+  large. (Otherwise 0 is returned.) When this initial space is
+  exhausted, additional memory will be obtained from the system.
+  Destroying this space will deallocate all additionally allocated
+  space (if possible) but not the initial base.
+*/
+mspace create_mspace_with_base(void* base, size_t capacity, int locked);
+/*
+  mspace_malloc behaves as malloc, but operates within
+  the given space.
+*/
+void* mspace_malloc(mspace msp, size_t bytes);
+/*
+  mspace_free behaves as free, but operates within
+  the given space.
+  If compiled with FOOTERS==1, mspace_free is not actually needed.
+  free may be called instead of mspace_free because freed chunks from
+  any space are handled by their originating spaces.
+*/
+void mspace_free(mspace msp, void* mem);
+/*
+  mspace_realloc behaves as realloc, but operates within
+  the given space.
+  If compiled with FOOTERS==1, mspace_realloc is not actually
+  needed.  realloc may be called instead of mspace_realloc because
+  realloced chunks from any space are handled by their originating
+  spaces.
+*/
+void* mspace_realloc(mspace msp, void* mem, size_t newsize);
+/*
+  mspace_calloc behaves as calloc, but operates within
+  the given space.
+*/
+void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
+/*
+  mspace_memalign behaves as memalign, but operates within
+  the given space.
+*/
+void* mspace_memalign(mspace msp, size_t alignment, size_t bytes);
+/*
+  mspace_independent_calloc behaves as independent_calloc, but
+  operates within the given space.
+*/
+void** mspace_independent_calloc(mspace msp, size_t n_elements,
+                                 size_t elem_size, void* chunks[]);
+/*
+  mspace_independent_comalloc behaves as independent_comalloc, but
+  operates within the given space.
+*/
+void** mspace_independent_comalloc(mspace msp, size_t n_elements,
+                                   size_t sizes[], void* chunks[]);
+/*
+  mspace_footprint() returns the number of bytes obtained from the
+  system for this space.
+*/
+size_t mspace_footprint(mspace msp);
+#if !NO_MALLINFO
+/*
+  mspace_mallinfo behaves as mallinfo, but reports properties of
+  the given space.
+*/
+struct mallinfo mspace_mallinfo(mspace msp);
+#endif /* NO_MALLINFO */
+/*
+  mspace_malloc_stats behaves as malloc_stats, but reports
+  properties of the given space.
+*/
+void mspace_malloc_stats(mspace msp);
+/*
+  mspace_trim behaves as malloc_trim, but
+  operates within the given space.
+*/
+int mspace_trim(mspace msp, size_t pad);
+/*
+  An alias for mallopt.
+*/
+int mspace_mallopt(int, int);
+#endif  /* MSPACES */
+#ifdef __cplusplus
+};  /* end of extern "C" */
 #endif
-/** @}
+#endif /* MALLOC_280_H */
+ /** @}
  */

 /trunk/uspace/lib/libc/Makefile
 ,90 → 31,80
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
+CONSOLE_PREFIX = ../../srv/console
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
+CFLAGS += -I$(CONSOLE_PREFIX)
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
     generic/as.c \
     generic/cap.c \
-    generic/devmap.c \
-    generic/event.c \
-    generic/errno.c \
-    generic/mem.c \
     generic/string.c \
     generic/fibril.c \
-    generic/fibril_sync.c \
-    generic/pcb.c \
-    generic/smc.c \
     generic/thread.c \
     generic/tls.c \
     generic/task.c \
     generic/futex.c \
-    generic/io/asprintf.c \
     generic/io/io.c \
     generic/io/printf.c \
-    generic/io/klog.c \
+    generic/io/stream.c \
+    generic/io/sprintf.c \
     generic/io/snprintf.c \
     generic/io/vprintf.c \
+    generic/io/vsprintf.c \
     generic/io/vsnprintf.c \
     generic/io/printf_core.c \
-    generic/io/console.c \
-    generic/malloc.c \
+    malloc/malloc.c \
     generic/sysinfo.c \
     generic/ipc.c \
     generic/async.c \
-    generic/loader.c \
-    generic/getopt.c \
-    generic/adt/list.o \
-    generic/adt/hash_table.o \
+    generic/libadt/list.o \
+    generic/libadt/hash_table.o \
     generic/time.c \
     generic/err.c \
     generic/stdlib.c \
     generic/mman.c \
-    generic/udebug.c \
-    generic/vfs/vfs.c \
-    generic/vfs/canonify.c
+    generic/vfs.c
 ARCH_SOURCES += \
-    arch/$(UARCH)/src/entry.s \
-    arch/$(UARCH)/src/thread_entry.s
+    arch/$(ARCH)/src/entry.s \
+    arch/$(ARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
-OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
 .PHONY: all clean depend kerninc
-all: kerninc libc.a arch/$(UARCH)/_link.ld
+all: kerninc libc.a arch/$(ARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(UARCH)/include include/libarch
+    ln -sfn ../arch/$(ARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
-    find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
+    find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

 /trunk/uspace/lib/libc/malloc/malloc.c
 ,0 → 1,4431
+#include <stdio.h>
+#include <libc.h>
+/*
+  This is a version (aka dlmalloc) of malloc/free/realloc written by
+  Doug Lea and released to the public domain, as explained at
+  http://creativecommons.org/licenses/publicdomain.  Send questions,
+  comments, complaints, performance data, etc to dl@cs.oswego.edu
+* Version 2.8.3 Thu Sep 22 11:16:15 2005  Doug Lea  (dl at gee)
+   Note: There may be an updated version of this malloc obtainable at
+           ftp://gee.cs.oswego.edu/pub/misc/malloc.c
+         Check before installing!
+* Quickstart
+  This library is all in one file to simplify the most common usage:
+  ftp it, compile it (-O3), and link it into another program. All of
+  the compile-time options default to reasonable values for use on
+  most platforms.  You might later want to step through various
+  compile-time and dynamic tuning options.
+  For convenience, an include file for code using this malloc is at:
+     ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.3.h
+  You don't really need this .h file unless you call functions not
+  defined in your system include files.  The .h file contains only the
+  excerpts from this file needed for using this malloc on ANSI C/C++
+  systems, so long as you haven't changed compile-time options about
+  naming and tuning parameters.  If you do, then you can create your
+  own malloc.h that does include all settings by cutting at the point
+  indicated below. Note that you may already by default be using a C
+  library containing a malloc that is based on some version of this
+  malloc (for example in linux). You might still want to use the one
+  in this file to customize settings or to avoid overheads associated
+  with library versions.
+* Vital statistics:
+  Supported pointer/size_t representation:       4 or 8 bytes
+       size_t MUST be an unsigned type of the same width as
+       pointers. (If you are using an ancient system that declares
+       size_t as a signed type, or need it to be a different width
+       than pointers, you can use a previous release of this malloc
+       (e.g. 2.7.2) supporting these.)
+  Alignment:                                     8 bytes (default)
+       This suffices for nearly all current machines and C compilers.
+       However, you can define MALLOC_ALIGNMENT to be wider than this
+       if necessary (up to 128bytes), at the expense of using more space.
+  Minimum overhead per allocated chunk:   4 or  8 bytes (if 4byte sizes)
+or 16 bytes (if 8byte sizes)
+       Each malloced chunk has a hidden word of overhead holding size
+       and status information, and additional cross-check word
+       if FOOTERS is defined.
+  Minimum allocated size: 4-byte ptrs:  16 bytes    (including overhead)
+-byte ptrs:  32 bytes    (including overhead)
+       Even a request for zero bytes (i.e., malloc(0)) returns a
+       pointer to something of the minimum allocatable size.
+       The maximum overhead wastage (i.e., number of extra bytes
+       allocated than were requested in malloc) is less than or equal
+       to the minimum size, except for requests >= mmap_threshold that
+       are serviced via mmap(), where the worst case wastage is about
+bytes plus the remainder from a system page (the minimal
+       mmap unit); typically 4096 or 8192 bytes.
+  Security: static-safe; optionally more or less
+       The "security" of malloc refers to the ability of malicious
+       code to accentuate the effects of errors (for example, freeing
+       space that is not currently malloc'ed or overwriting past the
+       ends of chunks) in code that calls malloc.  This malloc
+       guarantees not to modify any memory locations below the base of
+       heap, i.e., static variables, even in the presence of usage
+       errors.  The routines additionally detect most improper frees
+       and reallocs.  All this holds as long as the static bookkeeping
+       for malloc itself is not corrupted by some other means.  This
+       is only one aspect of security -- these checks do not, and
+       cannot, detect all possible programming errors.
+       If FOOTERS is defined nonzero, then each allocated chunk
+       carries an additional check word to verify that it was malloced
+       from its space.  These check words are the same within each
+       execution of a program using malloc, but differ across
+       executions, so externally crafted fake chunks cannot be
+       freed. This improves security by rejecting frees/reallocs that
+       could corrupt heap memory, in addition to the checks preventing
+       writes to statics that are always on.  This may further improve
+       security at the expense of time and space overhead.  (Note that
+       FOOTERS may also be worth using with MSPACES.)
+       By default detected errors cause the program to abort (calling
+       "abort()"). You can override this to instead proceed past
+       errors by defining PROCEED_ON_ERROR.  In this case, a bad free
+       has no effect, and a malloc that encounters a bad address
+       caused by user overwrites will ignore the bad address by
+       dropping pointers and indices to all known memory. This may
+       be appropriate for programs that should continue if at all
+       possible in the face of programming errors, although they may
+       run out of memory because dropped memory is never reclaimed.
+       If you don't like either of these options, you can define
+       CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything
+       else. And if if you are sure that your program using malloc has
+       no errors or vulnerabilities, you can define INSECURE to 1,
+       which might (or might not) provide a small performance improvement.
+  Thread-safety: NOT thread-safe unless USE_LOCKS defined
+       When USE_LOCKS is defined, each public call to malloc, free,
+       etc is surrounded with either a pthread mutex or a win32
+       spinlock (depending on WIN32). This is not especially fast, and
+       can be a major bottleneck.  It is designed only to provide
+       minimal protection in concurrent environments, and to provide a
+       basis for extensions.  If you are using malloc in a concurrent
+       program, consider instead using ptmalloc, which is derived from
+       a version of this malloc. (See http://www.malloc.de).
+  System requirements: Any combination of MORECORE and/or MMAP/MUNMAP
+       This malloc can use unix sbrk or any emulation (invoked using
+       the CALL_MORECORE macro) and/or mmap/munmap or any emulation
+       (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system
+       memory.  On most unix systems, it tends to work best if both
+       MORECORE and MMAP are enabled.  On Win32, it uses emulations
+       based on VirtualAlloc. It also uses common C library functions
+       like memset.
+  Compliance: I believe it is compliant with the Single Unix Specification
+       (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably
+       others as well.
+* Overview of algorithms
+  This is not the fastest, most space-conserving, most portable, or
+  most tunable malloc ever written. However it is among the fastest
+  while also being among the most space-conserving, portable and
+  tunable.  Consistent balance across these factors results in a good
+  general-purpose allocator for malloc-intensive programs.
+  In most ways, this malloc is a best-fit allocator. Generally, it
+  chooses the best-fitting existing chunk for a request, with ties
+  broken in approximately least-recently-used order. (This strategy
+  normally maintains low fragmentation.) However, for requests less
+  than 256bytes, it deviates from best-fit when there is not an
+  exactly fitting available chunk by preferring to use space adjacent
+  to that used for the previous small request, as well as by breaking
+  ties in approximately most-recently-used order. (These enhance
+  locality of series of small allocations.)  And for very large requests
+  (>= 256Kb by default), it relies on system memory mapping
+  facilities, if supported.  (This helps avoid carrying around and
+  possibly fragmenting memory used only for large chunks.)
+  All operations (except malloc_stats and mallinfo) have execution
+  times that are bounded by a constant factor of the number of bits in
+  a size_t, not counting any clearing in calloc or copying in realloc,
+  or actions surrounding MORECORE and MMAP that have times
+  proportional to the number of non-contiguous regions returned by
+  system allocation routines, which is often just 1.
+  The implementation is not very modular and seriously overuses
+  macros. Perhaps someday all C compilers will do as good a job
+  inlining modular code as can now be done by brute-force expansion,
+  but now, enough of them seem not to.
+  Some compilers issue a lot of warnings about code that is
+  dead/unreachable only on some platforms, and also about intentional
+  uses of negation on unsigned types. All known cases of each can be
+  ignored.
+  For a longer but out of date high-level description, see
+     http://gee.cs.oswego.edu/dl/html/malloc.html
+* MSPACES
+  If MSPACES is defined, then in addition to malloc, free, etc.,
+  this file also defines mspace_malloc, mspace_free, etc. These
+  are versions of malloc routines that take an "mspace" argument
+  obtained using create_mspace, to control all internal bookkeeping.
+  If ONLY_MSPACES is defined, only these versions are compiled.
+  So if you would like to use this allocator for only some allocations,
+  and your system malloc for others, you can compile with
+  ONLY_MSPACES and then do something like...
+    static mspace mymspace = create_mspace(0,0); // for example
+    #define mymalloc(bytes)  mspace_malloc(mymspace, bytes)
+  (Note: If you only need one instance of an mspace, you can instead
+  use "USE_DL_PREFIX" to relabel the global malloc.)
+  You can similarly create thread-local allocators by storing
+  mspaces as thread-locals. For example:
+    static __thread mspace tlms = 0;
+    void*  tlmalloc(size_t bytes) {
+      if (tlms == 0) tlms = create_mspace(0, 0);
+      return mspace_malloc(tlms, bytes);
+    }
+    void  tlfree(void* mem) { mspace_free(tlms, mem); }
+  Unless FOOTERS is defined, each mspace is completely independent.
+  You cannot allocate from one and free to another (although
+  conformance is only weakly checked, so usage errors are not always
+  caught). If FOOTERS is defined, then each chunk carries around a tag
+  indicating its originating mspace, and frees are directed to their
+  originating spaces.
+ -------------------------  Compile-time options ---------------------------
+Be careful in setting #define values for numerical constants of type
+size_t. On some systems, literal values are not automatically extended
+to size_t precision unless they are explicitly casted.
+WIN32                    default: defined if _WIN32 defined
+  Defining WIN32 sets up defaults for MS environment and compilers.
+  Otherwise defaults are for unix.
+MALLOC_ALIGNMENT         default: (size_t)8
+  Controls the minimum alignment for malloc'ed chunks.  It must be a
+  power of two and at least 8, even on machines for which smaller
+  alignments would suffice. It may be defined as larger than this
+  though. Note however that code and data structures are optimized for
+  the case of 8-byte alignment.
+MSPACES                  default: 0 (false)
+  If true, compile in support for independent allocation spaces.
+  This is only supported if HAVE_MMAP is true.
+ONLY_MSPACES             default: 0 (false)
+  If true, only compile in mspace versions, not regular versions.
+USE_LOCKS                default: 0 (false)
+  Causes each call to each public routine to be surrounded with
+  pthread or WIN32 mutex lock/unlock. (If set true, this can be
+  overridden on a per-mspace basis for mspace versions.)
+FOOTERS                  default: 0
+  If true, provide extra checking and dispatching by placing
+  information in the footers of allocated chunks. This adds
+  space and time overhead.
+INSECURE                 default: 0
+  If true, omit checks for usage errors and heap space overwrites.
+USE_DL_PREFIX            default: NOT defined
+  Causes compiler to prefix all public routines with the string 'dl'.
+  This can be useful when you only want to use this malloc in one part
+  of a program, using your regular system malloc elsewhere.
+ABORT                    default: defined as abort()
+  Defines how to abort on failed checks.  On most systems, a failed
+  check cannot die with an "assert" or even print an informative
+  message, because the underlying print routines in turn call malloc,
+  which will fail again.  Generally, the best policy is to simply call
+  abort(). It's not very useful to do more than this because many
+  errors due to overwriting will show up as address faults (null, odd
+  addresses etc) rather than malloc-triggered checks, so will also
+  abort.  Also, most compilers know that abort() does not return, so
+  can better optimize code conditionally calling it.
+PROCEED_ON_ERROR           default: defined as 0 (false)
+  Controls whether detected bad addresses cause them to bypassed
+  rather than aborting. If set, detected bad arguments to free and
+  realloc are ignored. And all bookkeeping information is zeroed out
+  upon a detected overwrite of freed heap space, thus losing the
+  ability to ever return it from malloc again, but enabling the
+  application to proceed. If PROCEED_ON_ERROR is defined, the
+  static variable malloc_corruption_error_count is compiled in
+  and can be examined to see if errors have occurred. This option
+  generates slower code than the default abort policy.
+DEBUG                    default: NOT defined
+  The DEBUG setting is mainly intended for people trying to modify
+  this code or diagnose problems when porting to new platforms.
+  However, it may also be able to better isolate user errors than just
+  using runtime checks.  The assertions in the check routines spell
+  out in more detail the assumptions and invariants underlying the
+  algorithms.  The checking is fairly extensive, and will slow down
+  execution noticeably. Calling malloc_stats or mallinfo with DEBUG
+  set will attempt to check every non-mmapped allocated and free chunk
+  in the course of computing the summaries.
+ABORT_ON_ASSERT_FAILURE   default: defined as 1 (true)
+  Debugging assertion failures can be nearly impossible if your
+  version of the assert macro causes malloc to be called, which will
+  lead to a cascade of further failures, blowing the runtime stack.
+  ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(),
+  which will usually make debugging easier.
+MALLOC_FAILURE_ACTION     default: sets errno to ENOMEM, or no-op on win32
+  The action to take before "return 0" when malloc fails to be able to
+  return memory because there is none available.
+HAVE_MORECORE             default: 1 (true) unless win32 or ONLY_MSPACES
+  True if this system supports sbrk or an emulation of it.
+MORECORE                  default: sbrk
+  The name of the sbrk-style system routine to call to obtain more
+  memory.  See below for guidance on writing custom MORECORE
+  functions. The type of the argument to sbrk/MORECORE varies across
+  systems.  It cannot be size_t, because it supports negative
+  arguments, so it is normally the signed type of the same width as
+  size_t (sometimes declared as "intptr_t").  It doesn't much matter
+  though. Internally, we only call it with arguments less than half
+  the max value of a size_t, which should work across all reasonable
+  possibilities, although sometimes generating compiler warnings.  See
+  near the end of this file for guidelines for creating a custom
+  version of MORECORE.
+MORECORE_CONTIGUOUS       default: 1 (true)
+  If true, take advantage of fact that consecutive calls to MORECORE
+  with positive arguments always return contiguous increasing
+  addresses.  This is true of unix sbrk. It does not hurt too much to
+  set it true anyway, since malloc copes with non-contiguities.
+  Setting it false when definitely non-contiguous saves time
+  and possibly wasted space it would take to discover this though.
+MORECORE_CANNOT_TRIM      default: NOT defined
+  True if MORECORE cannot release space back to the system when given
+  negative arguments. This is generally necessary only if you are
+  using a hand-crafted MORECORE function that cannot handle negative
+  arguments.
+HAVE_MMAP                 default: 1 (true)
+  True if this system supports mmap or an emulation of it.  If so, and
+  HAVE_MORECORE is not true, MMAP is used for all system
+  allocation. If set and HAVE_MORECORE is true as well, MMAP is
+  primarily used to directly allocate very large blocks. It is also
+  used as a backup strategy in cases where MORECORE fails to provide
+  space from system. Note: A single call to MUNMAP is assumed to be
+  able to unmap memory that may have be allocated using multiple calls
+  to MMAP, so long as they are adjacent.
+HAVE_MREMAP               default: 1 on linux, else 0
+  If true realloc() uses mremap() to re-allocate large blocks and
+  extend or shrink allocation spaces.
+MMAP_CLEARS               default: 1 on unix
+  True if mmap clears memory so calloc doesn't need to. This is true
+  for standard unix mmap using /dev/zero.
+USE_BUILTIN_FFS            default: 0 (i.e., not used)
+  Causes malloc to use the builtin ffs() function to compute indices.
+  Some compilers may recognize and intrinsify ffs to be faster than the
+  supplied C version. Also, the case of x86 using gcc is special-cased
+  to an asm instruction, so is already as fast as it can be, and so
+  this setting has no effect. (On most x86s, the asm version is only
+  slightly faster than the C version.)
+malloc_getpagesize         default: derive from system includes, or 4096.
+  The system page size. To the extent possible, this malloc manages
+  memory from the system in page-size units.  This may be (and
+  usually is) a function rather than a constant. This is ignored
+  if WIN32, where page size is determined using getSystemInfo during
+  initialization.
+USE_DEV_RANDOM             default: 0 (i.e., not used)
+  Causes malloc to use /dev/random to initialize secure magic seed for
+  stamping footers. Otherwise, the current time is used.
+NO_MALLINFO                default: 0
+  If defined, don't compile "mallinfo". This can be a simple way
+  of dealing with mismatches between system declarations and
+  those in this file.
+MALLINFO_FIELD_TYPE        default: size_t
+  The type of the fields in the mallinfo struct. This was originally
+  defined as "int" in SVID etc, but is more usefully defined as
+  size_t. The value is used only if  HAVE_USR_INCLUDE_MALLOC_H is not set
+REALLOC_ZERO_BYTES_FREES    default: not defined
+  This should be set if a call to realloc with zero bytes should
+  be the same as a call to free. Some people think it should. Otherwise,
+  since this malloc returns a unique pointer for malloc(0), so does
+  realloc(p, 0).
+LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H
+LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H,  LACKS_ERRNO_H
+LACKS_STDLIB_H                default: NOT defined unless on WIN32
+  Define these if your system does not have these header files.
+  You might need to manually insert some of the declarations they provide.
+DEFAULT_GRANULARITY        default: page size if MORECORE_CONTIGUOUS,
+                                system_info.dwAllocationGranularity in WIN32,
+                                otherwise 64K.
+      Also settable using mallopt(M_GRANULARITY, x)
+  The unit for allocating and deallocating memory from the system.  On
+  most systems with contiguous MORECORE, there is no reason to
+  make this more than a page. However, systems with MMAP tend to
+  either require or encourage larger granularities.  You can increase
+  this value to prevent system allocation functions to be called so
+  often, especially if they are slow.  The value must be at least one
+  page and must be a power of two.  Setting to 0 causes initialization
+  to either page size or win32 region size.  (Note: In previous
+  versions of malloc, the equivalent of this option was called
+  "TOP_PAD")
+DEFAULT_TRIM_THRESHOLD    default: 2MB
+      Also settable using mallopt(M_TRIM_THRESHOLD, x)
+  The maximum amount of unused top-most memory to keep before
+  releasing via malloc_trim in free().  Automatic trimming is mainly
+  useful in long-lived programs using contiguous MORECORE.  Because
+  trimming via sbrk can be slow on some systems, and can sometimes be
+  wasteful (in cases where programs immediately afterward allocate
+  more large chunks) the value should be high enough so that your
+  overall system performance would improve by releasing this much
+  memory.  As a rough guide, you might set to a value close to the
+  average size of a process (program) running on your system.
+  Releasing this much memory would allow such a process to run in
+  memory.  Generally, it is worth tuning trim thresholds when a
+  program undergoes phases where several large chunks are allocated
+  and released in ways that can reuse each other's storage, perhaps
+  mixed with phases where there are no such chunks at all. The trim
+  value must be greater than page size to have any useful effect.  To
+  disable trimming completely, you can set to MAX_SIZE_T. Note that the trick
+  some people use of mallocing a huge space and then freeing it at
+  program startup, in an attempt to reserve system memory, doesn't
+  have the intended effect under automatic trimming, since that memory
+  will immediately be returned to the system.
+DEFAULT_MMAP_THRESHOLD       default: 256K
+      Also settable using mallopt(M_MMAP_THRESHOLD, x)
+  The request size threshold for using MMAP to directly service a
+  request. Requests of at least this size that cannot be allocated
+  using already-existing space will be serviced via mmap.  (If enough
+  normal freed space already exists it is used instead.)  Using mmap
+  segregates relatively large chunks of memory so that they can be
+  individually obtained and released from the host system. A request
+  serviced through mmap is never reused by any other request (at least
+  not directly; the system may just so happen to remap successive
+  requests to the same locations).  Segregating space in this way has
+  the benefits that: Mmapped space can always be individually released
+  back to the system, which helps keep the system level memory demands
+  of a long-lived program low.  Also, mapped memory doesn't become
+  `locked' between other chunks, as can happen with normally allocated
+  chunks, which means that even trimming via malloc_trim would not
+  release them.  However, it has the disadvantage that the space
+  cannot be reclaimed, consolidated, and then used to service later
+  requests, as happens with normal chunks.  The advantages of mmap
+  nearly always outweigh disadvantages for "large" chunks, but the
+  value of "large" may vary across systems.  The default is an
+  empirically derived value that works well in most systems. You can
+  disable mmap by setting to MAX_SIZE_T.
+*/
+/** @addtogroup libcmalloc malloc
+  * @brief Malloc originally written by Doug Lea and ported to HelenOS.
+  * @ingroup libc
+ * @{
+ */
+/** @file
+ */
+#include <sys/types.h>  /* For size_t */
+/** Non-default helenos customizations */
+#define LACKS_FCNTL_H
+#define LACKS_SYS_MMAN_H
+#define LACKS_SYS_PARAM_H
+#undef HAVE_MMAP
+#define HAVE_MMAP 0
+#define LACKS_ERRNO_H
+/* Set errno? */
+#undef MALLOC_FAILURE_ACTION
+#define MALLOC_FAILURE_ACTION
+/* The maximum possible size_t value has all bits set */
+#define MAX_SIZE_T           (~(size_t)0)
+#define ONLY_MSPACES 0
+#define MSPACES 0
+#ifdef MALLOC_ALIGNMENT_16
+#define MALLOC_ALIGNMENT ((size_t)16U)
+#else
+#define MALLOC_ALIGNMENT ((size_t)8U)
+#endif
+#define FOOTERS 0
+#define ABORT  \
+{ \
+    DEBUG("%s abort in %s on line %d\n", __FILE__, __func__, __LINE__); \
+    abort(); \
+}
+#define ABORT_ON_ASSERT_FAILURE 1
+#define PROCEED_ON_ERROR 0
+#define USE_LOCKS 1
+#define INSECURE 0
+#define HAVE_MMAP 0
+#define MMAP_CLEARS 1
+#define HAVE_MORECORE 1
+#define MORECORE_CONTIGUOUS 1
+#define MORECORE sbrk
+#define DEFAULT_GRANULARITY (0)  /* 0 means to compute in init_mparams */
+#ifndef DEFAULT_TRIM_THRESHOLD
+#ifndef MORECORE_CANNOT_TRIM
+#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U)
+#else   /* MORECORE_CANNOT_TRIM */
+#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T
+#endif  /* MORECORE_CANNOT_TRIM */
+#endif  /* DEFAULT_TRIM_THRESHOLD */
+#ifndef DEFAULT_MMAP_THRESHOLD
+#if HAVE_MMAP
+#define DEFAULT_MMAP_THRESHOLD ((size_t)256U * (size_t)1024U)
+#else   /* HAVE_MMAP */
+#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
+#endif  /* HAVE_MMAP */
+#endif  /* DEFAULT_MMAP_THRESHOLD */
+#ifndef USE_BUILTIN_FFS
+#define USE_BUILTIN_FFS 0
+#endif  /* USE_BUILTIN_FFS */
+#ifndef USE_DEV_RANDOM
+#define USE_DEV_RANDOM 0
+#endif  /* USE_DEV_RANDOM */
+#ifndef NO_MALLINFO
+#define NO_MALLINFO 0
+#endif  /* NO_MALLINFO */
+#ifndef MALLINFO_FIELD_TYPE
+#define MALLINFO_FIELD_TYPE size_t
+#endif  /* MALLINFO_FIELD_TYPE */
+/*
+  mallopt tuning options.  SVID/XPG defines four standard parameter
+  numbers for mallopt, normally defined in malloc.h.  None of these
+  are used in this malloc, so setting them has no effect. But this
+  malloc does support the following options.
+*/
+#define M_TRIM_THRESHOLD     (-1)
+#define M_GRANULARITY        (-2)
+#define M_MMAP_THRESHOLD     (-3)
+/*
+  ========================================================================
+  To make a fully customizable malloc.h header file, cut everything
+  above this line, put into file malloc.h, edit to suit, and #include it
+  on the next line, as well as in programs that use this malloc.
+  ========================================================================
+*/
+#include "malloc.h"
+/*------------------------------ internal #includes ---------------------- */
+#include <stdio.h>       /* for printing in malloc_stats */
+#include <string.h>
+#ifndef LACKS_ERRNO_H
+#include <errno.h>       /* for MALLOC_FAILURE_ACTION */
+#endif /* LACKS_ERRNO_H */
+#if FOOTERS
+#include <time.h>        /* for magic initialization */
+#endif /* FOOTERS */
+#ifndef LACKS_STDLIB_H
+#include <stdlib.h>      /* for abort() */
+#endif /* LACKS_STDLIB_H */
+#ifdef DEBUG
+#if ABORT_ON_ASSERT_FAILURE
+#define assert(x) {if(!(x)) {DEBUG(#x);ABORT;}}
+#else /* ABORT_ON_ASSERT_FAILURE */
+#include <assert.h>
+#endif /* ABORT_ON_ASSERT_FAILURE */
+#else  /* DEBUG */
+#define assert(x)
+#endif /* DEBUG */
+#if USE_BUILTIN_FFS
+#ifndef LACKS_STRINGS_H
+#include <strings.h>     /* for ffs */
+#endif /* LACKS_STRINGS_H */
+#endif /* USE_BUILTIN_FFS */
+#if HAVE_MMAP
+#ifndef LACKS_SYS_MMAN_H
+#include <sys/mman.h>    /* for mmap */
+#endif /* LACKS_SYS_MMAN_H */
+#ifndef LACKS_FCNTL_H
+#include <fcntl.h>
+#endif /* LACKS_FCNTL_H */
+#endif /* HAVE_MMAP */
+#if HAVE_MORECORE
+#ifndef LACKS_UNISTD_H
+#include <unistd.h>     /* for sbrk */
+#else /* LACKS_UNISTD_H */
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+extern void*     sbrk(ptrdiff_t);
+#endif /* FreeBSD etc */
+#endif /* LACKS_UNISTD_H */
+#endif /* HAVE_MMAP */
+#ifndef WIN32
+#ifndef malloc_getpagesize
+#  ifdef _SC_PAGESIZE         /* some SVR4 systems omit an underscore */
+#    ifndef _SC_PAGE_SIZE
+#      define _SC_PAGE_SIZE _SC_PAGESIZE
+#    endif
+#  endif
+#  ifdef _SC_PAGE_SIZE
+#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
+#  else
+#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
+       extern size_t getpagesize();
+#      define malloc_getpagesize getpagesize()
+#    else
+#      ifdef WIN32 /* use supplied emulation of getpagesize */
+#        define malloc_getpagesize getpagesize()
+#      else
+#        ifndef LACKS_SYS_PARAM_H
+#          include <sys/param.h>
+#        endif
+#        ifdef EXEC_PAGESIZE
+#          define malloc_getpagesize EXEC_PAGESIZE
+#        else
+#          ifdef NBPG
+#            ifndef CLSIZE
+#              define malloc_getpagesize NBPG
+#            else
+#              define malloc_getpagesize (NBPG * CLSIZE)
+#            endif
+#          else
+#            ifdef NBPC
+#              define malloc_getpagesize NBPC
+#            else
+#              ifdef PAGESIZE
+#                define malloc_getpagesize PAGESIZE
+#              else /* just guess */
+#                define malloc_getpagesize ((size_t)4096U)
+#              endif
+#            endif
+#          endif
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+#endif
+/* ------------------- size_t and alignment properties -------------------- */
+/* The byte and bit size of a size_t */
+#define SIZE_T_SIZE         (sizeof(size_t))
+#define SIZE_T_BITSIZE      (sizeof(size_t) << 3)
+/* Some constants coerced to size_t */
+/* Annoying but necessary to avoid errors on some plaftorms */
+#define SIZE_T_ZERO         ((size_t)0)
+#define SIZE_T_ONE          ((size_t)1)
+#define SIZE_T_TWO          ((size_t)2)
+#define TWO_SIZE_T_SIZES    (SIZE_T_SIZE<<1)
+#define FOUR_SIZE_T_SIZES   (SIZE_T_SIZE<<2)
+#define SIX_SIZE_T_SIZES    (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES)
+#define HALF_MAX_SIZE_T     (MAX_SIZE_T / 2U)
+/* The bit mask value corresponding to MALLOC_ALIGNMENT */
+#define CHUNK_ALIGN_MASK    (MALLOC_ALIGNMENT - SIZE_T_ONE)
+/* True if address a has acceptable alignment */
+#define is_aligned(A)       (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0)
+/* the number of bytes to offset an address to align it */
+#define align_offset(A)\
+ ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\
+  ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK))
+/* -------------------------- MMAP preliminaries ------------------------- */
+/*
+   If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and
+   checks to fail so compiler optimizer can delete code rather than
+   using so many "#if"s.
+*/
+/* MORECORE and MMAP must return MFAIL on failure */
+#define MFAIL                ((void*)(MAX_SIZE_T))
+#define CMFAIL               ((char*)(MFAIL)) /* defined for convenience */
+#if !HAVE_MMAP
+#define IS_MMAPPED_BIT       (SIZE_T_ZERO)
+#define USE_MMAP_BIT         (SIZE_T_ZERO)
+#define CALL_MMAP(s)         MFAIL
+#define CALL_MUNMAP(a, s)    (-1)
+#define DIRECT_MMAP(s)       MFAIL
+#else /* HAVE_MMAP */
+#define IS_MMAPPED_BIT       (SIZE_T_ONE)
+#define USE_MMAP_BIT         (SIZE_T_ONE)
+#ifndef WIN32
+#define CALL_MUNMAP(a, s)    munmap((a), (s))
+#define MMAP_PROT            (PROT_READ|PROT_WRITE)
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+#define MAP_ANONYMOUS        MAP_ANON
+#endif /* MAP_ANON */
+#ifdef MAP_ANONYMOUS
+#define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS)
+#define CALL_MMAP(s)         mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
+#else /* MAP_ANONYMOUS */
+/*
+   Nearly all versions of mmap support MAP_ANONYMOUS, so the following
+   is unlikely to be needed, but is supplied just in case.
+*/
+#define MMAP_FLAGS           (MAP_PRIVATE)
+static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
+#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \
+           (dev_zero_fd = open("/dev/zero", O_RDWR), \
+            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \
+            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0))
+#endif /* MAP_ANONYMOUS */
+#define DIRECT_MMAP(s)       CALL_MMAP(s)
+#else /* WIN32 */
+/* Win32 MMAP via VirtualAlloc */
+static void* win32mmap(size_t size) {
+  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
+  return (ptr != 0)? ptr: MFAIL;
+}
+/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */
+static void* win32direct_mmap(size_t size) {
+  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN,
+                           PAGE_READWRITE);
+  return (ptr != 0)? ptr: MFAIL;
+}
+/* This function supports releasing coalesed segments */
+static int win32munmap(void* ptr, size_t size) {
+  MEMORY_BASIC_INFORMATION minfo;
+  char* cptr = ptr;
+  while (size) {
+    if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
+      return -1;
+    if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
+        minfo.State != MEM_COMMIT || minfo.RegionSize > size)
+      return -1;
+    if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
+      return -1;
+    cptr += minfo.RegionSize;
+    size -= minfo.RegionSize;
+  }
+  return 0;
+}
+#define CALL_MMAP(s)         win32mmap(s)
+#define CALL_MUNMAP(a, s)    win32munmap((a), (s))
+#define DIRECT_MMAP(s)       win32direct_mmap(s)
+#endif /* WIN32 */
+#endif /* HAVE_MMAP */
+#if HAVE_MMAP && HAVE_MREMAP
+#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
+#else  /* HAVE_MMAP && HAVE_MREMAP */
+#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
+#endif /* HAVE_MMAP && HAVE_MREMAP */
+#if HAVE_MORECORE
+#define CALL_MORECORE(S)     MORECORE(S)
+#else  /* HAVE_MORECORE */
+#define CALL_MORECORE(S)     MFAIL
+#endif /* HAVE_MORECORE */
+/* mstate bit set if continguous morecore disabled or failed */
+#define USE_NONCONTIGUOUS_BIT (4U)
+/* segment bit set in create_mspace_with_base */
+#define EXTERN_BIT            (8U)
+/* --------------------------- Lock preliminaries ------------------------ */
+#if USE_LOCKS
+/*
+  When locks are defined, there are up to two global locks:
+  * If HAVE_MORECORE, morecore_mutex protects sequences of calls to
+    MORECORE.  In many cases sys_alloc requires two calls, that should
+    not be interleaved with calls by other threads.  This does not
+    protect against direct calls to MORECORE by other threads not
+    using this lock, so there is still code to cope the best we can on
+    interference.
+  * magic_init_mutex ensures that mparams.magic and other
+    unique mparams values are initialized only once.
+*/
+/* By default use posix locks */
+#include <futex.h>
+#define MLOCK_T atomic_t
+#define INITIAL_LOCK(l)      futex_initialize(l, 1)
+/* futex_down cannot fail, but can return different
+ * retvals for OK
+ */
+#define ACQUIRE_LOCK(l)      ({futex_down(l);0;})
+#define RELEASE_LOCK(l)      futex_up(l)
+#if HAVE_MORECORE
+static MLOCK_T morecore_mutex = FUTEX_INITIALIZER;
+#endif /* HAVE_MORECORE */
+static MLOCK_T magic_init_mutex = FUTEX_INITIALIZER;
+#define USE_LOCK_BIT               (2U)
+#else  /* USE_LOCKS */
+#define USE_LOCK_BIT               (0U)
+#define INITIAL_LOCK(l)
+#endif /* USE_LOCKS */
+#if USE_LOCKS && HAVE_MORECORE
+#define ACQUIRE_MORECORE_LOCK()    ACQUIRE_LOCK(&morecore_mutex);
+#define RELEASE_MORECORE_LOCK()    RELEASE_LOCK(&morecore_mutex);
+#else /* USE_LOCKS && HAVE_MORECORE */
+#define ACQUIRE_MORECORE_LOCK()
+#define RELEASE_MORECORE_LOCK()
+#endif /* USE_LOCKS && HAVE_MORECORE */
+#if USE_LOCKS
+#define ACQUIRE_MAGIC_INIT_LOCK()  ACQUIRE_LOCK(&magic_init_mutex);
+#define RELEASE_MAGIC_INIT_LOCK()  RELEASE_LOCK(&magic_init_mutex);
+#else  /* USE_LOCKS */
+#define ACQUIRE_MAGIC_INIT_LOCK()
+#define RELEASE_MAGIC_INIT_LOCK()
+#endif /* USE_LOCKS */
+/* -----------------------  Chunk representations ------------------------ */
+/*
+  (The following includes lightly edited explanations by Colin Plumb.)
+  The malloc_chunk declaration below is misleading (but accurate and
+  necessary).  It declares a "view" into memory allowing access to
+  necessary fields at known offsets from a given base.
+  Chunks of memory are maintained using a `boundary tag' method as
+  originally described by Knuth.  (See the paper by Paul Wilson
+  ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such
+  techniques.)  Sizes of free chunks are stored both in the front of
+  each chunk and at the end.  This makes consolidating fragmented
+  chunks into bigger chunks fast.  The head fields also hold bits
+  representing whether chunks are free or in use.
+  Here are some pictures to make it clearer.  They are "exploded" to
+  show that the state of a chunk can be thought of as extending from
+  the high 31 bits of the head field of its header through the
+  prev_foot and PINUSE_BIT bit of the following chunk header.
+  A chunk that's in use looks like:
+   chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+           | Size of previous chunk (if P = 1)                             |
+           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
+         | Size of this chunk                                         1| +-+
+   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                                                               |
+         +-                                                             -+
+         |                                                               |
+         +-                                                             -+
+         |                                                               :
+         +-      size - sizeof(size_t) available payload bytes          -+
+         :                                                               |
+ chunk-> +-                                                             -+
+         |                                                               |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1|
+       | Size of next chunk (may or may not be in use)               | +-+
+ mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    And if it's free, it looks like this:
+   chunk-> +-                                                             -+
+           | User payload (must be in use, or we would have merged!)       |
+           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
+         | Size of this chunk                                         0| +-+
+   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Next pointer                                                  |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Prev pointer                                                  |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                                                               :
+         +-      size - sizeof(struct chunk) unused bytes               -+
+         :                                                               |
+ chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Size of this chunk                                            |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0|
+       | Size of next chunk (must be in use, or we would have merged)| +-+
+ mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |                                                               :
+       +- User payload                                                -+
+       :                                                               |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+                                                                     |0|
+                                                                     +-+
+  Note that since we always merge adjacent free chunks, the chunks
+  adjacent to a free chunk must be in use.
+  Given a pointer to a chunk (which can be derived trivially from the
+  payload pointer) we can, in O(1) time, find out whether the adjacent
+  chunks are free, and if so, unlink them from the lists that they
+  are on and merge them with the current chunk.
+  Chunks always begin on even word boundaries, so the mem portion
+  (which is returned to the user) is also on an even word boundary, and
+  thus at least double-word aligned.
+  The P (PINUSE_BIT) bit, stored in the unused low-order bit of the
+  chunk size (which is always a multiple of two words), is an in-use
+  bit for the *previous* chunk.  If that bit is *clear*, then the
+  word before the current chunk size contains the previous chunk
+  size, and can be used to find the front of the previous chunk.
+  The very first chunk allocated always has this bit set, preventing
+  access to non-existent (or non-owned) memory. If pinuse is set for
+  any given chunk, then you CANNOT determine the size of the
+  previous chunk, and might even get a memory addressing fault when
+  trying to do so.
+  The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of
+  the chunk size redundantly records whether the current chunk is
+  inuse. This redundancy enables usage checks within free and realloc,
+  and reduces indirection when freeing and consolidating chunks.
+  Each freshly allocated chunk must have both cinuse and pinuse set.
+  That is, each allocated chunk borders either a previously allocated
+  and still in-use chunk, or the base of its memory arena. This is
+  ensured by making all allocations from the the `lowest' part of any
+  found chunk.  Further, no free chunk physically borders another one,
+  so each free chunk is known to be preceded and followed by either
+  inuse chunks or the ends of memory.
+  Note that the `foot' of the current chunk is actually represented
+  as the prev_foot of the NEXT chunk. This makes it easier to
+  deal with alignments etc but can be very confusing when trying
+  to extend or adapt this code.
+  The exceptions to all this are
+. The special chunk `top' is the top-most available chunk (i.e.,
+        the one bordering the end of available memory). It is treated
+        specially.  Top is never included in any bin, is used only if
+        no other chunk is available, and is released back to the
+        system if it is very large (see M_TRIM_THRESHOLD).  In effect,
+        the top chunk is treated as larger (and thus less well
+        fitting) than any other available chunk.  The top chunk
+        doesn't update its trailing size field since there is no next
+        contiguous chunk that would have to index off it. However,
+        space is still allocated for it (TOP_FOOT_SIZE) to enable
+        separation or merging when space is extended.
+. Chunks allocated via mmap, which have the lowest-order bit
+        (IS_MMAPPED_BIT) set in their prev_foot fields, and do not set
+        PINUSE_BIT in their head fields.  Because they are allocated
+        one-by-one, each must carry its own prev_foot field, which is
+        also used to hold the offset this chunk has within its mmapped
+        region, which is needed to preserve alignment. Each mmapped
+        chunk is trailed by the first two fields of a fake next-chunk
+        for sake of usage checks.
+*/
+struct malloc_chunk {
+  size_t               prev_foot;  /* Size of previous chunk (if free).  */
+  size_t               head;       /* Size and inuse bits. */
+  struct malloc_chunk* fd;         /* double links -- used only if free. */
+  struct malloc_chunk* bk;
+};
+typedef struct malloc_chunk  mchunk;
+typedef struct malloc_chunk* mchunkptr;
+typedef struct malloc_chunk* sbinptr;  /* The type of bins of chunks */
+typedef unsigned int bindex_t;         /* Described below */
+typedef unsigned int binmap_t;         /* Described below */
+typedef unsigned int flag_t;           /* The type of various bit flag sets */
+/* ------------------- Chunks sizes and alignments ----------------------- */
+#define MCHUNK_SIZE         (sizeof(mchunk))
+#if FOOTERS
+#define CHUNK_OVERHEAD      (TWO_SIZE_T_SIZES)
+#else /* FOOTERS */
+#define CHUNK_OVERHEAD      (SIZE_T_SIZE)
+#endif /* FOOTERS */
+/* MMapped chunks need a second word of overhead ... */
+#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES)
+/* ... and additional padding for fake next-chunk at foot */
+#define MMAP_FOOT_PAD       (FOUR_SIZE_T_SIZES)
+/* The smallest size we can malloc is an aligned minimal chunk */
+#define MIN_CHUNK_SIZE\
+  ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
+/* conversion from malloc headers to user pointers, and back */
+#define chunk2mem(p)        ((void*)((char*)(p)       + TWO_SIZE_T_SIZES))
+#define mem2chunk(mem)      ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES))
+/* chunk associated with aligned address A */
+#define align_as_chunk(A)   (mchunkptr)((A) + align_offset(chunk2mem(A)))
+/* Bounds on request (not chunk) sizes. */
+#define MAX_REQUEST         ((-MIN_CHUNK_SIZE) << 2)
+#define MIN_REQUEST         (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE)
+/* pad request bytes into a usable size */
+#define pad_request(req) \
+   (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
+/* pad request, checking for minimum (but not maximum) */
+#define request2size(req) \
+  (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req))
+/* ------------------ Operations on head and foot fields ----------------- */
+/*
+  The head field of a chunk is or'ed with PINUSE_BIT when previous
+  adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in
+  use. If the chunk was obtained with mmap, the prev_foot field has
+  IS_MMAPPED_BIT set, otherwise holding the offset of the base of the
+  mmapped region to the base of the chunk.
+*/
+#define PINUSE_BIT          (SIZE_T_ONE)
+#define CINUSE_BIT          (SIZE_T_TWO)
+#define INUSE_BITS          (PINUSE_BIT|CINUSE_BIT)
+/* Head value for fenceposts */
+#define FENCEPOST_HEAD      (INUSE_BITS|SIZE_T_SIZE)
+/* extraction of fields from head words */
+#define cinuse(p)           ((p)->head & CINUSE_BIT)
+#define pinuse(p)           ((p)->head & PINUSE_BIT)
+#define chunksize(p)        ((p)->head & ~(INUSE_BITS))
+#define clear_pinuse(p)     ((p)->head &= ~PINUSE_BIT)
+#define clear_cinuse(p)     ((p)->head &= ~CINUSE_BIT)
+/* Treat space at ptr +/- offset as a chunk */
+#define chunk_plus_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
+#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s)))
+/* Ptr to next or previous physical malloc_chunk. */
+#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~INUSE_BITS)))
+#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) ))
+/* extract next chunk's pinuse bit */
+#define next_pinuse(p)  ((next_chunk(p)->head) & PINUSE_BIT)
+/* Get/set size at footer */
+#define get_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot)
+#define set_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s))
+/* Set size, pinuse bit, and foot */
+#define set_size_and_pinuse_of_free_chunk(p, s)\
+  ((p)->head = (s|PINUSE_BIT), set_foot(p, s))
+/* Set size, pinuse bit, foot, and clear next pinuse */
+#define set_free_with_pinuse(p, s, n)\
+  (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s))
+#define is_mmapped(p)\
+  (!((p)->head & PINUSE_BIT) && ((p)->prev_foot & IS_MMAPPED_BIT))
+/* Get the internal overhead associated with chunk p */
+#define overhead_for(p)\
+ (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD)
+/* Return true if malloced space is not necessarily cleared */
+#if MMAP_CLEARS
+#define calloc_must_clear(p) (!is_mmapped(p))
+#else /* MMAP_CLEARS */
+#define calloc_must_clear(p) (1)
+#endif /* MMAP_CLEARS */
+/* ---------------------- Overlaid data structures ----------------------- */
+/*
+  When chunks are not in use, they are treated as nodes of either
+  lists or trees.
+  "Small"  chunks are stored in circular doubly-linked lists, and look
+  like this:
+    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Size of previous chunk                            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `head:' |             Size of chunk, in bytes                         |P|
+      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Forward pointer to next chunk in list             |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Back pointer to previous chunk in list            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Unused space (may be 0 bytes long)                .
+            .                                                               .
+            .                                                               |
+nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `foot:' |             Size of chunk, in bytes                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  Larger chunks are kept in a form of bitwise digital trees (aka
+  tries) keyed on chunksizes.  Because malloc_tree_chunks are only for
+  free chunks greater than 256 bytes, their size doesn't impose any
+  constraints on user chunk sizes.  Each node looks like:
+    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Size of previous chunk                            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `head:' |             Size of chunk, in bytes                         |P|
+      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Forward pointer to next chunk of same size        |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Back pointer to previous chunk of same size       |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to left child (child[0])                  |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to right child (child[1])                 |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to parent                                 |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             bin index of this chunk                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Unused space                                      .
+            .                                                               |
+nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `foot:' |             Size of chunk, in bytes                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  Each tree holding treenodes is a tree of unique chunk sizes.  Chunks
+  of the same size are arranged in a circularly-linked list, with only
+  the oldest chunk (the next to be used, in our FIFO ordering)
+  actually in the tree.  (Tree members are distinguished by a non-null
+  parent pointer.)  If a chunk with the same size an an existing node
+  is inserted, it is linked off the existing node using pointers that
+  work in the same way as fd/bk pointers of small chunks.
+  Each tree contains a power of 2 sized range of chunk sizes (the
+  smallest is 0x100 <= x < 0x180), which is is divided in half at each
+  tree level, with the chunks in the smaller half of the range (0x100
+  <= x < 0x140 for the top nose) in the left subtree and the larger
+  half (0x140 <= x < 0x180) in the right subtree.  This is, of course,
+  done by inspecting individual bits.
+  Using these rules, each node's left subtree contains all smaller
+  sizes than its right subtree.  However, the node at the root of each
+  subtree has no particular ordering relationship to either.  (The
+  dividing line between the subtree sizes is based on trie relation.)
+  If we remove the last chunk of a given size from the interior of the
+  tree, we need to replace it with a leaf node.  The tree ordering
+  rules permit a node to be replaced by any leaf below it.
+  The smallest chunk in a tree (a common operation in a best-fit
+  allocator) can be found by walking a path to the leftmost leaf in
+  the tree.  Unlike a usual binary tree, where we follow left child
+  pointers until we reach a null, here we follow the right child
+  pointer any time the left one is null, until we reach a leaf with
+  both child pointers null. The smallest chunk in the tree will be
+  somewhere along that path.
+  The worst case number of steps to add, find, or remove a node is
+  bounded by the number of bits differentiating chunks within
+  bins. Under current bin calculations, this ranges from 6 up to 21
+  (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case
+  is of course much better.
+*/
+struct malloc_tree_chunk {
+  /* The first four fields must be compatible with malloc_chunk */
+  size_t                    prev_foot;
+  size_t                    head;
+  struct malloc_tree_chunk* fd;
+  struct malloc_tree_chunk* bk;
+  struct malloc_tree_chunk* child[2];
+  struct malloc_tree_chunk* parent;
+  bindex_t                  index;
+};
+typedef struct malloc_tree_chunk  tchunk;
+typedef struct malloc_tree_chunk* tchunkptr;
+typedef struct malloc_tree_chunk* tbinptr; /* The type of bins of trees */
+/* A little helper macro for trees */
+#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1])
+/* ----------------------------- Segments -------------------------------- */
+/*
+  Each malloc space may include non-contiguous segments, held in a
+  list headed by an embedded malloc_segment record representing the
+  top-most space. Segments also include flags holding properties of
+  the space. Large chunks that are directly allocated by mmap are not
+  included in this list. They are instead independently created and
+  destroyed without otherwise keeping track of them.
+  Segment management mainly comes into play for spaces allocated by
+  MMAP.  Any call to MMAP might or might not return memory that is
+  adjacent to an existing segment.  MORECORE normally contiguously
+  extends the current space, so this space is almost always adjacent,
+  which is simpler and faster to deal with. (This is why MORECORE is
+  used preferentially to MMAP when both are available -- see
+  sys_alloc.)  When allocating using MMAP, we don't use any of the
+  hinting mechanisms (inconsistently) supported in various
+  implementations of unix mmap, or distinguish reserving from
+  committing memory. Instead, we just ask for space, and exploit
+  contiguity when we get it.  It is probably possible to do
+  better than this on some systems, but no general scheme seems
+  to be significantly better.
+  Management entails a simpler variant of the consolidation scheme
+  used for chunks to reduce fragmentation -- new adjacent memory is
+  normally prepended or appended to an existing segment. However,
+  there are limitations compared to chunk consolidation that mostly
+  reflect the fact that segment processing is relatively infrequent
+  (occurring only when getting memory from system) and that we
+  don't expect to have huge numbers of segments:
+  * Segments are not indexed, so traversal requires linear scans.  (It
+    would be possible to index these, but is not worth the extra
+    overhead and complexity for most programs on most platforms.)
+  * New segments are only appended to old ones when holding top-most
+    memory; if they cannot be prepended to others, they are held in
+    different segments.
+  Except for the top-most segment of an mstate, each segment record
+  is kept at the tail of its segment. Segments are added by pushing
+  segment records onto the list headed by &mstate.seg for the
+  containing mstate.
+  Segment flags control allocation/merge/deallocation policies:
+  * If EXTERN_BIT set, then we did not allocate this segment,
+    and so should not try to deallocate or merge with others.
+    (This currently holds only for the initial segment passed
+    into create_mspace_with_base.)
+  * If IS_MMAPPED_BIT set, the segment may be merged with
+    other surrounding mmapped segments and trimmed/de-allocated
+    using munmap.
+  * If neither bit is set, then the segment was obtained using
+    MORECORE so can be merged with surrounding MORECORE'd segments
+    and deallocated/trimmed using MORECORE with negative arguments.
+*/
+struct malloc_segment {
+  char*        base;             /* base address */
+  size_t       size;             /* allocated size */
+  struct malloc_segment* next;   /* ptr to next segment */
+  flag_t       sflags;           /* mmap and extern flag */
+};
+#define is_mmapped_segment(S)  ((S)->sflags & IS_MMAPPED_BIT)
+#define is_extern_segment(S)   ((S)->sflags & EXTERN_BIT)
+typedef struct malloc_segment  msegment;
+typedef struct malloc_segment* msegmentptr;
+/* ---------------------------- malloc_state ----------------------------- */
+/*
+   A malloc_state holds all of the bookkeeping for a space.
+   The main fields are:
+  Top
+    The topmost chunk of the currently active segment. Its size is
+    cached in topsize.  The actual size of topmost space is
+    topsize+TOP_FOOT_SIZE, which includes space reserved for adding
+    fenceposts and segment records if necessary when getting more
+    space from the system.  The size at which to autotrim top is
+    cached from mparams in trim_check, except that it is disabled if
+    an autotrim fails.
+  Designated victim (dv)
+    This is the preferred chunk for servicing small requests that
+    don't have exact fits.  It is normally the chunk split off most
+    recently to service another small request.  Its size is cached in
+    dvsize. The link fields of this chunk are not maintained since it
+    is not kept in a bin.
+  SmallBins
+    An array of bin headers for free chunks.  These bins hold chunks
+    with sizes less than MIN_LARGE_SIZE bytes. Each bin contains
+    chunks of all the same size, spaced 8 bytes apart.  To simplify
+    use in double-linked lists, each bin header acts as a malloc_chunk
+    pointing to the real first node, if it exists (else pointing to
+    itself).  This avoids special-casing for headers.  But to avoid
+    waste, we allocate only the fd/bk pointers of bins, and then use
+    repositioning tricks to treat these as the fields of a chunk.
+  TreeBins
+    Treebins are pointers to the roots of trees holding a range of
+    sizes. There are 2 equally spaced treebins for each power of two
+    from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything
+    larger.
+  Bin maps
+    There is one bit map for small bins ("smallmap") and one for
+    treebins ("treemap).  Each bin sets its bit when non-empty, and
+    clears the bit when empty.  Bit operations are then used to avoid
+    bin-by-bin searching -- nearly all "search" is done without ever
+    looking at bins that won't be selected.  The bit maps
+    conservatively use 32 bits per map word, even if on 64bit system.
+    For a good description of some of the bit-based techniques used
+    here, see Henry S. Warren Jr's book "Hacker's Delight" (and
+    supplement at http://hackersdelight.org/). Many of these are
+    intended to reduce the branchiness of paths through malloc etc, as
+    well as to reduce the number of memory locations read or written.
+  Segments
+    A list of segments headed by an embedded malloc_segment record
+    representing the initial space.
+  Address check support
+    The least_addr field is the least address ever obtained from
+    MORECORE or MMAP. Attempted frees and reallocs of any address less
+    than this are trapped (unless INSECURE is defined).
+  Magic tag
+    A cross-check field that should always hold same value as mparams.magic.
+  Flags
+    Bits recording whether to use MMAP, locks, or contiguous MORECORE
+  Statistics
+    Each space keeps track of current and maximum system memory
+    obtained via MORECORE or MMAP.
+  Locking
+    If USE_LOCKS is defined, the "mutex" lock is acquired and released
+    around every public call using this mspace.
+*/
+/* Bin types, widths and sizes */
+#define NSMALLBINS        (32U)
+#define NTREEBINS         (32U)
+#define SMALLBIN_SHIFT    (3U)
+#define SMALLBIN_WIDTH    (SIZE_T_ONE << SMALLBIN_SHIFT)
+#define TREEBIN_SHIFT     (8U)
+#define MIN_LARGE_SIZE    (SIZE_T_ONE << TREEBIN_SHIFT)
+#define MAX_SMALL_SIZE    (MIN_LARGE_SIZE - SIZE_T_ONE)
+#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD)
+struct malloc_state {
+  binmap_t   smallmap;
+  binmap_t   treemap;
+  size_t     dvsize;
+  size_t     topsize;
+  char*      least_addr;
+  mchunkptr  dv;
+  mchunkptr  top;
+  size_t     trim_check;
+  size_t     magic;
+  mchunkptr  smallbins[(NSMALLBINS+1)*2];
+  tbinptr    treebins[NTREEBINS];
+  size_t     footprint;
+  size_t     max_footprint;
+  flag_t     mflags;
+#if USE_LOCKS
+  MLOCK_T    mutex;     /* locate lock among fields that rarely change */
+#endif /* USE_LOCKS */
+  msegment   seg;
+};
+typedef struct malloc_state*    mstate;
+/* ------------- Global malloc_state and malloc_params ------------------- */
+/*
+  malloc_params holds global properties, including those that can be
+  dynamically set using mallopt. There is a single instance, mparams,
+  initialized in init_mparams.
+*/
+struct malloc_params {
+  size_t magic;
+  size_t page_size;
+  size_t granularity;
+  size_t mmap_threshold;
+  size_t trim_threshold;
+  flag_t default_mflags;
+};
+static struct malloc_params mparams;
+/* The global malloc_state used for all non-"mspace" calls */
+static struct malloc_state _gm_;
+#define gm                 (&_gm_)
+#define is_global(M)       ((M) == &_gm_)
+#define is_initialized(M)  ((M)->top != 0)
+/* -------------------------- system alloc setup ------------------------- */
+/* Operations on mflags */
+#define use_lock(M)           ((M)->mflags &   USE_LOCK_BIT)
+#define enable_lock(M)        ((M)->mflags |=  USE_LOCK_BIT)
+#define disable_lock(M)       ((M)->mflags &= ~USE_LOCK_BIT)
+#define use_mmap(M)           ((M)->mflags &   USE_MMAP_BIT)
+#define enable_mmap(M)        ((M)->mflags |=  USE_MMAP_BIT)
+#define disable_mmap(M)       ((M)->mflags &= ~USE_MMAP_BIT)
+#define use_noncontiguous(M)  ((M)->mflags &   USE_NONCONTIGUOUS_BIT)
+#define disable_contiguous(M) ((M)->mflags |=  USE_NONCONTIGUOUS_BIT)
+#define set_lock(M,L)\
+ ((M)->mflags = (L)?\
+  ((M)->mflags | USE_LOCK_BIT) :\
+  ((M)->mflags & ~USE_LOCK_BIT))
+/* page-align a size */
+#define page_align(S)\
+ (((S) + (mparams.page_size)) & ~(mparams.page_size - SIZE_T_ONE))
+/* granularity-align a size */
+#define granularity_align(S)\
+  (((S) + (mparams.granularity)) & ~(mparams.granularity - SIZE_T_ONE))
+#define is_page_aligned(S)\
+   (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0)
+#define is_granularity_aligned(S)\
+   (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0)
+/*  True if segment S holds address A */
+#define segment_holds(S, A)\
+  ((char*)(A) >= S->base && (char*)(A) < S->base + S->size)
+/* Return segment holding given address */
+static msegmentptr segment_holding(mstate m, char* addr) {
+  msegmentptr sp = &m->seg;
+  for (;;) {
+    if (addr >= sp->base && addr < sp->base + sp->size)
+      return sp;
+    if ((sp = sp->next) == 0)
+      return 0;
+  }
+}
+/* Return true if segment contains a segment link */
+static int has_segment_link(mstate m, msegmentptr ss) {
+  msegmentptr sp = &m->seg;
+  for (;;) {
+    if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size)
+      return 1;
+    if ((sp = sp->next) == 0)
+      return 0;
+  }
+}
+#ifndef MORECORE_CANNOT_TRIM
+#define should_trim(M,s)  ((s) > (M)->trim_check)
+#else  /* MORECORE_CANNOT_TRIM */
+#define should_trim(M,s)  (0)
+#endif /* MORECORE_CANNOT_TRIM */
+/*
+  TOP_FOOT_SIZE is padding at the end of a segment, including space
+  that may be needed to place segment records and fenceposts when new
+  noncontiguous segments are added.
+*/
+#define TOP_FOOT_SIZE\
+  (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
+/* -------------------------------  Hooks -------------------------------- */
+/*
+  PREACTION should be defined to return 0 on success, and nonzero on
+  failure. If you are not using locking, you can redefine these to do
+  anything you like.
+*/
+#if USE_LOCKS
+/* Ensure locks are initialized */
+#define GLOBALLY_INITIALIZE() (mparams.page_size == 0 && init_mparams())
+#define PREACTION(M)  ((GLOBALLY_INITIALIZE() || use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0)
+#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); }
+#else /* USE_LOCKS */
+#ifndef PREACTION
+#define PREACTION(M) (0)
+#endif  /* PREACTION */
+#ifndef POSTACTION
+#define POSTACTION(M)
+#endif  /* POSTACTION */
+#endif /* USE_LOCKS */
+/*
+  CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses.
+  USAGE_ERROR_ACTION is triggered on detected bad frees and
+  reallocs. The argument p is an address that might have triggered the
+  fault. It is ignored by the two predefined actions, but might be
+  useful in custom actions that try to help diagnose errors.
+*/
+#if PROCEED_ON_ERROR
+/* A count of the number of corruption errors causing resets */
+int malloc_corruption_error_count;
+/* default corruption action */
+static void reset_on_error(mstate m);
+#define CORRUPTION_ERROR_ACTION(m)  reset_on_error(m)
+#define USAGE_ERROR_ACTION(m, p)
+#else /* PROCEED_ON_ERROR */
+#ifndef CORRUPTION_ERROR_ACTION
+#define CORRUPTION_ERROR_ACTION(m) ABORT
+#endif /* CORRUPTION_ERROR_ACTION */
+#ifndef USAGE_ERROR_ACTION
+#define USAGE_ERROR_ACTION(m,p) ABORT
+#endif /* USAGE_ERROR_ACTION */
+#endif /* PROCEED_ON_ERROR */
+/* -------------------------- Debugging setup ---------------------------- */
+#if ! DEBUG
+#define check_free_chunk(M,P)
+#define check_inuse_chunk(M,P)
+#define check_malloced_chunk(M,P,N)
+#define check_mmapped_chunk(M,P)
+#define check_malloc_state(M)
+#define check_top_chunk(M,P)
+#else /* DEBUG */
+#define check_free_chunk(M,P)       do_check_free_chunk(M,P)
+#define check_inuse_chunk(M,P)      do_check_inuse_chunk(M,P)
+#define check_top_chunk(M,P)        do_check_top_chunk(M,P)
+#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N)
+#define check_mmapped_chunk(M,P)    do_check_mmapped_chunk(M,P)
+#define check_malloc_state(M)       do_check_malloc_state(M)
+static void   do_check_any_chunk(mstate m, mchunkptr p);
+static void   do_check_top_chunk(mstate m, mchunkptr p);
+static void   do_check_mmapped_chunk(mstate m, mchunkptr p);
+static void   do_check_inuse_chunk(mstate m, mchunkptr p);
+static void   do_check_free_chunk(mstate m, mchunkptr p);
+static void   do_check_malloced_chunk(mstate m, void* mem, size_t s);
+static void   do_check_tree(mstate m, tchunkptr t);
+static void   do_check_treebin(mstate m, bindex_t i);
+static void   do_check_smallbin(mstate m, bindex_t i);
+static void   do_check_malloc_state(mstate m);
+static int    bin_find(mstate m, mchunkptr x);
+static size_t traverse_and_check(mstate m);
+#endif /* DEBUG */
+/* ---------------------------- Indexing Bins ---------------------------- */
+#define is_small(s)         (((s) >> SMALLBIN_SHIFT) < NSMALLBINS)
+#define small_index(s)      ((s)  >> SMALLBIN_SHIFT)
+#define small_index2size(i) ((i)  << SMALLBIN_SHIFT)
+#define MIN_SMALL_INDEX     (small_index(MIN_CHUNK_SIZE))
+/* addressing by index. See above about smallbin repositioning */
+#define smallbin_at(M, i)   ((sbinptr)((char*)&((M)->smallbins[(i)<<1])))
+#define treebin_at(M,i)     (&((M)->treebins[i]))
+/* assign tree index for size S to variable I */
+#if defined(__GNUC__) && defined(i386)
+#define compute_tree_index(S, I)\
+{\
+  size_t X = S >> TREEBIN_SHIFT;\
+  if (X == 0)\
+    I = 0;\
+  else if (X > 0xFFFF)\
+    I = NTREEBINS-1;\
+  else {\
+    unsigned int K;\
+    asm("bsrl %1,%0\n\t" : "=r" (K) : "rm"  (X));\
+    I =  (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
+  }\
+}
+#else /* GNUC */
+#define compute_tree_index(S, I)\
+{\
+  size_t X = S >> TREEBIN_SHIFT;\
+  if (X == 0)\
+    I = 0;\
+  else if (X > 0xFFFF)\
+    I = NTREEBINS-1;\
+  else {\
+    unsigned int Y = (unsigned int)X;\
+    unsigned int N = ((Y - 0x100) >> 16) & 8;\
+    unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\
+    N += K;\
+    N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\
+    K = 14 - N + ((Y <<= K) >> 15);\
+    I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
+  }\
+}
+#endif /* GNUC */
+/* Bit representing maximum resolved size in a treebin at i */
+#define bit_for_tree_index(i) \
+   (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2)
+/* Shift placing maximum resolved bit in a treebin at i as sign bit */
+#define leftshift_for_tree_index(i) \
+   ((i == NTREEBINS-1)? 0 : \
+    ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2)))
+/* The size of the smallest chunk held in bin with index i */
+#define minsize_for_tree_index(i) \
+   ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) |  \
+   (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1)))
+/* ------------------------ Operations on bin maps ----------------------- */
+/* bit corresponding to given index */
+#define idx2bit(i)              ((binmap_t)(1) << (i))
+/* Mark/Clear bits with given index */
+#define mark_smallmap(M,i)      ((M)->smallmap |=  idx2bit(i))
+#define clear_smallmap(M,i)     ((M)->smallmap &= ~idx2bit(i))
+#define smallmap_is_marked(M,i) ((M)->smallmap &   idx2bit(i))
+#define mark_treemap(M,i)       ((M)->treemap  |=  idx2bit(i))
+#define clear_treemap(M,i)      ((M)->treemap  &= ~idx2bit(i))
+#define treemap_is_marked(M,i)  ((M)->treemap  &   idx2bit(i))
+/* index corresponding to given bit */
+#if defined(__GNUC__) && defined(i386)
+#define compute_bit2idx(X, I)\
+{\
+  unsigned int J;\
+  asm("bsfl %1,%0\n\t" : "=r" (J) : "rm" (X));\
+  I = (bindex_t)J;\
+}
+#else /* GNUC */
+#if  USE_BUILTIN_FFS
+#define compute_bit2idx(X, I) I = ffs(X)-1
+#else /* USE_BUILTIN_FFS */
+#define compute_bit2idx(X, I)\
+{\
+  unsigned int Y = X - 1;\
+  unsigned int K = Y >> (16-4) & 16;\
+  unsigned int N = K;        Y >>= K;\
+  N += K = Y >> (8-3) &  8;  Y >>= K;\
+  N += K = Y >> (4-2) &  4;  Y >>= K;\
+  N += K = Y >> (2-1) &  2;  Y >>= K;\
+  N += K = Y >> (1-0) &  1;  Y >>= K;\
+  I = (bindex_t)(N + Y);\
+}
+#endif /* USE_BUILTIN_FFS */
+#endif /* GNUC */
+/* isolate the least set bit of a bitmap */
+#define least_bit(x)         ((x) & -(x))
+/* mask with all bits to left of least bit of x on */
+#define left_bits(x)         ((x<<1) | -(x<<1))
+/* mask with all bits to left of or equal to least bit of x on */
+#define same_or_left_bits(x) ((x) | -(x))
+/* ----------------------- Runtime Check Support ------------------------- */
+/*
+  For security, the main invariant is that malloc/free/etc never
+  writes to a static address other than malloc_state, unless static
+  malloc_state itself has been corrupted, which cannot occur via
+  malloc (because of these checks). In essence this means that we
+  believe all pointers, sizes, maps etc held in malloc_state, but
+  check all of those linked or offsetted from other embedded data
+  structures.  These checks are interspersed with main code in a way
+  that tends to minimize their run-time cost.
+  When FOOTERS is defined, in addition to range checking, we also
+  verify footer fields of inuse chunks, which can be used guarantee
+  that the mstate controlling malloc/free is intact.  This is a
+  streamlined version of the approach described by William Robertson
+  et al in "Run-time Detection of Heap-based Overflows" LISA'03
+  http://www.usenix.org/events/lisa03/tech/robertson.html The footer
+  of an inuse chunk holds the xor of its mstate and a random seed,
+  that is checked upon calls to free() and realloc().  This is
+  (probablistically) unguessable from outside the program, but can be
+  computed by any code successfully malloc'ing any chunk, so does not
+  itself provide protection against code that has already broken
+  security through some other means.  Unlike Robertson et al, we
+  always dynamically check addresses of all offset chunks (previous,
+  next, etc). This turns out to be cheaper than relying on hashes.
+*/
+#if !INSECURE
+/* Check if address a is at least as high as any from MORECORE or MMAP */
+#define ok_address(M, a) ((char*)(a) >= (M)->least_addr)
+/* Check if address of next chunk n is higher than base chunk p */
+#define ok_next(p, n)    ((char*)(p) < (char*)(n))
+/* Check if p has its cinuse bit on */
+#define ok_cinuse(p)     cinuse(p)
+/* Check if p has its pinuse bit on */
+#define ok_pinuse(p)     pinuse(p)
+#else /* !INSECURE */
+#define ok_address(M, a) (1)
+#define ok_next(b, n)    (1)
+#define ok_cinuse(p)     (1)
+#define ok_pinuse(p)     (1)
+#endif /* !INSECURE */
+#if (FOOTERS && !INSECURE)
+/* Check if (alleged) mstate m has expected magic field */
+#define ok_magic(M)      ((M)->magic == mparams.magic)
+#else  /* (FOOTERS && !INSECURE) */
+#define ok_magic(M)      (1)
+#endif /* (FOOTERS && !INSECURE) */
+/* In gcc, use __builtin_expect to minimize impact of checks */
+#if !INSECURE
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define RTCHECK(e)  __builtin_expect(e, 1)
+#else /* GNUC */
+#define RTCHECK(e)  (e)
+#endif /* GNUC */
+#else /* !INSECURE */
+#define RTCHECK(e)  (1)
+#endif /* !INSECURE */
+/* macros to set up inuse chunks with or without footers */
+#if !FOOTERS
+#define mark_inuse_foot(M,p,s)
+/* Set cinuse bit and pinuse bit of next chunk */
+#define set_inuse(M,p,s)\
+  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
+  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
+/* Set cinuse and pinuse of this chunk and pinuse of next chunk */
+#define set_inuse_and_pinuse(M,p,s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
+/* Set size, cinuse and pinuse bit of this chunk */
+#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT))
+#else /* FOOTERS */
+/* Set foot of inuse chunk to be xor of mstate and seed */
+#define mark_inuse_foot(M,p,s)\
+  (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic))
+#define get_mstate_for(p)\
+  ((mstate)(((mchunkptr)((char*)(p) +\
+    (chunksize(p))))->prev_foot ^ mparams.magic))
+#define set_inuse(M,p,s)\
+  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
+  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \
+  mark_inuse_foot(M,p,s))
+#define set_inuse_and_pinuse(M,p,s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\
+ mark_inuse_foot(M,p,s))
+#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  mark_inuse_foot(M, p, s))
+#endif /* !FOOTERS */
+/* ---------------------------- setting mparams -------------------------- */
+/* Initialize mparams */
+static int init_mparams(void) {
+  if (mparams.page_size == 0) {
+    size_t s;
+    mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
+    mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
+#if MORECORE_CONTIGUOUS
+    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT;
+#else  /* MORECORE_CONTIGUOUS */
+    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT;
+#endif /* MORECORE_CONTIGUOUS */
+#if (FOOTERS && !INSECURE)
+    {
+#if USE_DEV_RANDOM
+      int fd;
+      unsigned char buf[sizeof(size_t)];
+      /* Try to use /dev/urandom, else fall back on using time */
+      if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
+          read(fd, buf, sizeof(buf)) == sizeof(buf)) {
+        s = *((size_t *) buf);
+        close(fd);
+      }
+      else
+#endif /* USE_DEV_RANDOM */
+        s = (size_t)(time(0) ^ (size_t)0x55555555U);
+      s |= (size_t)8U;    /* ensure nonzero */
+      s &= ~(size_t)7U;   /* improve chances of fault for bad values */
+    }
+#else /* (FOOTERS && !INSECURE) */
+    s = (size_t)0x58585858U;
+#endif /* (FOOTERS && !INSECURE) */
+    ACQUIRE_MAGIC_INIT_LOCK();
+    if (mparams.magic == 0) {
+      mparams.magic = s;
+      /* Set up lock for main malloc area */
+      INITIAL_LOCK(&gm->mutex);
+      gm->mflags = mparams.default_mflags;
+    }
+    RELEASE_MAGIC_INIT_LOCK();
+#ifndef WIN32
+    mparams.page_size = malloc_getpagesize;
+    mparams.granularity = ((DEFAULT_GRANULARITY != 0)?
+                           DEFAULT_GRANULARITY : mparams.page_size);
+#else /* WIN32 */
+    {
+      SYSTEM_INFO system_info;
+      GetSystemInfo(&system_info);
+      mparams.page_size = system_info.dwPageSize;
+      mparams.granularity = system_info.dwAllocationGranularity;
+    }
+#endif /* WIN32 */
+    /* Sanity-check configuration:
+       size_t must be unsigned and as wide as pointer type.
+       ints must be at least 4 bytes.
+       alignment must be at least 8.
+       Alignment, min chunk size, and page size must all be powers of 2.
+    */
+    if ((sizeof(size_t) != sizeof(char*)) ||
+        (MAX_SIZE_T < MIN_CHUNK_SIZE)  ||
+        (sizeof(int) < 4)  ||
+        (MALLOC_ALIGNMENT < (size_t)8U) ||
+        ((MALLOC_ALIGNMENT    & (MALLOC_ALIGNMENT-SIZE_T_ONE))    != 0) ||
+        ((MCHUNK_SIZE         & (MCHUNK_SIZE-SIZE_T_ONE))         != 0) ||
+        ((mparams.granularity & (mparams.granularity-SIZE_T_ONE)) != 0) ||
+        ((mparams.page_size   & (mparams.page_size-SIZE_T_ONE))   != 0))
+      ABORT;
+  }
+  return 0;
+}
+/* support for mallopt */
+static int change_mparam(int param_number, int value) {
+  size_t val = (size_t)value;
+  init_mparams();
+  switch(param_number) {
+  case M_TRIM_THRESHOLD:
+    mparams.trim_threshold = val;
+    return 1;
+  case M_GRANULARITY:
+    if (val >= mparams.page_size && ((val & (val-1)) == 0)) {
+      mparams.granularity = val;
+      return 1;
+    }
+    else
+      return 0;
+  case M_MMAP_THRESHOLD:
+    mparams.mmap_threshold = val;
+    return 1;
+  default:
+    return 0;
+  }
+}
+#if DEBUG
+/* ------------------------- Debugging Support --------------------------- */
+/* Check properties of any chunk, whether free, inuse, mmapped etc  */
+static void do_check_any_chunk(mstate m, mchunkptr p) {
+  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+  assert(ok_address(m, p));
+}
+/* Check properties of top chunk */
+static void do_check_top_chunk(mstate m, mchunkptr p) {
+  msegmentptr sp = segment_holding(m, (char*)p);
+  size_t  sz = chunksize(p);
+  assert(sp != 0);
+  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+  assert(ok_address(m, p));
+  assert(sz == m->topsize);
+  assert(sz > 0);
+  assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE);
+  assert(pinuse(p));
+  assert(!next_pinuse(p));
+}
+/* Check properties of (inuse) mmapped chunks */
+static void do_check_mmapped_chunk(mstate m, mchunkptr p) {
+  size_t  sz = chunksize(p);
+  size_t len = (sz + (p->prev_foot & ~IS_MMAPPED_BIT) + MMAP_FOOT_PAD);
+  assert(is_mmapped(p));
+  assert(use_mmap(m));
+  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+  assert(ok_address(m, p));
+  assert(!is_small(sz));
+  assert((len & (mparams.page_size-SIZE_T_ONE)) == 0);
+  assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
+  assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0);
+}
+/* Check properties of inuse chunks */
+static void do_check_inuse_chunk(mstate m, mchunkptr p) {
+  do_check_any_chunk(m, p);
+  assert(cinuse(p));
+  assert(next_pinuse(p));
+  /* If not pinuse and not mmapped, previous chunk has OK offset */
+  assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
+  if (is_mmapped(p))
+    do_check_mmapped_chunk(m, p);
+}
+/* Check properties of free chunks */
+static void do_check_free_chunk(mstate m, mchunkptr p) {
+  size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT);
+  mchunkptr next = chunk_plus_offset(p, sz);
+  do_check_any_chunk(m, p);
+  assert(!cinuse(p));
+  assert(!next_pinuse(p));
+  assert (!is_mmapped(p));
+  if (p != m->dv && p != m->top) {
+    if (sz >= MIN_CHUNK_SIZE) {
+      assert((sz & CHUNK_ALIGN_MASK) == 0);
+      assert(is_aligned(chunk2mem(p)));
+      assert(next->prev_foot == sz);
+      assert(pinuse(p));
+      assert (next == m->top || cinuse(next));
+      assert(p->fd->bk == p);
+      assert(p->bk->fd == p);
+    }
+    else  /* markers are always of size SIZE_T_SIZE */
+      assert(sz == SIZE_T_SIZE);
+  }
+}
+/* Check properties of malloced chunks at the point they are malloced */
+static void do_check_malloced_chunk(mstate m, void* mem, size_t s) {
+  if (mem != 0) {
+    mchunkptr p = mem2chunk(mem);
+    size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT);
+    do_check_inuse_chunk(m, p);
+    assert((sz & CHUNK_ALIGN_MASK) == 0);
+    assert(sz >= MIN_CHUNK_SIZE);
+    assert(sz >= s);
+    /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
+    assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
+  }
+}
+/* Check a tree and its subtrees.  */
+static void do_check_tree(mstate m, tchunkptr t) {
+  tchunkptr head = 0;
+  tchunkptr u = t;
+  bindex_t tindex = t->index;
+  size_t tsize = chunksize(t);
+  bindex_t idx;
+  compute_tree_index(tsize, idx);
+  assert(tindex == idx);
+  assert(tsize >= MIN_LARGE_SIZE);
+  assert(tsize >= minsize_for_tree_index(idx));
+  assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1))));
+  do { /* traverse through chain of same-sized nodes */
+    do_check_any_chunk(m, ((mchunkptr)u));
+    assert(u->index == tindex);
+    assert(chunksize(u) == tsize);
+    assert(!cinuse(u));
+    assert(!next_pinuse(u));
+    assert(u->fd->bk == u);
+    assert(u->bk->fd == u);
+    if (u->parent == 0) {
+      assert(u->child[0] == 0);
+      assert(u->child[1] == 0);
+    }
+    else {
+      assert(head == 0); /* only one node on chain has parent */
+      head = u;
+      assert(u->parent != u);
+      assert (u->parent->child[0] == u ||
+              u->parent->child[1] == u ||
+              *((tbinptr*)(u->parent)) == u);
+      if (u->child[0] != 0) {
+        assert(u->child[0]->parent == u);
+        assert(u->child[0] != u);
+        do_check_tree(m, u->child[0]);
+      }
+      if (u->child[1] != 0) {
+        assert(u->child[1]->parent == u);
+        assert(u->child[1] != u);
+        do_check_tree(m, u->child[1]);
+      }
+      if (u->child[0] != 0 && u->child[1] != 0) {
+        assert(chunksize(u->child[0]) < chunksize(u->child[1]));
+      }
+    }
+    u = u->fd;
+  } while (u != t);
+  assert(head != 0);
+}
+/*  Check all the chunks in a treebin.  */
+static void do_check_treebin(mstate m, bindex_t i) {
+  tbinptr* tb = treebin_at(m, i);
+  tchunkptr t = *tb;
+  int empty = (m->treemap & (1U << i)) == 0;
+  if (t == 0)
+    assert(empty);
+  if (!empty)
+    do_check_tree(m, t);
+}
+/*  Check all the chunks in a smallbin.  */
+static void do_check_smallbin(mstate m, bindex_t i) {
+  sbinptr b = smallbin_at(m, i);
+  mchunkptr p = b->bk;
+  unsigned int empty = (m->smallmap & (1U << i)) == 0;
+  if (p == b)
+    assert(empty);
+  if (!empty) {
+    for (; p != b; p = p->bk) {
+      size_t size = chunksize(p);
+      mchunkptr q;
+      /* each chunk claims to be free */
+      do_check_free_chunk(m, p);
+      /* chunk belongs in bin */
+      assert(small_index(size) == i);
+      assert(p->bk == b || chunksize(p->bk) == chunksize(p));
+      /* chunk is followed by an inuse chunk */
+      q = next_chunk(p);
+      if (q->head != FENCEPOST_HEAD)
+        do_check_inuse_chunk(m, q);
+    }
+  }
+}
+/* Find x in a bin. Used in other check functions. */
+static int bin_find(mstate m, mchunkptr x) {
+  size_t size = chunksize(x);
+  if (is_small(size)) {
+    bindex_t sidx = small_index(size);
+    sbinptr b = smallbin_at(m, sidx);
+    if (smallmap_is_marked(m, sidx)) {
+      mchunkptr p = b;
+      do {
+        if (p == x)
+          return 1;
+      } while ((p = p->fd) != b);
+    }
+  }
+  else {
+    bindex_t tidx;
+    compute_tree_index(size, tidx);
+    if (treemap_is_marked(m, tidx)) {
+      tchunkptr t = *treebin_at(m, tidx);
+      size_t sizebits = size << leftshift_for_tree_index(tidx);
+      while (t != 0 && chunksize(t) != size) {
+        t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
+        sizebits <<= 1;
+      }
+      if (t != 0) {
+        tchunkptr u = t;
+        do {
+          if (u == (tchunkptr)x)
+            return 1;
+        } while ((u = u->fd) != t);
+      }
+    }
+  }
+  return 0;
+}
+/* Traverse each chunk and check it; return total */
+static size_t traverse_and_check(mstate m) {
+  size_t sum = 0;
+  if (is_initialized(m)) {
+    msegmentptr s = &m->seg;
+    sum += m->topsize + TOP_FOOT_SIZE;
+    while (s != 0) {
+      mchunkptr q = align_as_chunk(s->base);
+      mchunkptr lastq = 0;
+      assert(pinuse(q));
+      while (segment_holds(s, q) &&
+             q != m->top && q->head != FENCEPOST_HEAD) {
+        sum += chunksize(q);
+        if (cinuse(q)) {
+          assert(!bin_find(m, q));
+          do_check_inuse_chunk(m, q);
+        }
+        else {
+          assert(q == m->dv || bin_find(m, q));
+          assert(lastq == 0 || cinuse(lastq)); /* Not 2 consecutive free */
+          do_check_free_chunk(m, q);
+        }
+        lastq = q;
+        q = next_chunk(q);
+      }
+      s = s->next;
+    }
+  }
+  return sum;
+}
+/* Check all properties of malloc_state. */
+static void do_check_malloc_state(mstate m) {
+  bindex_t i;
+  size_t total;
+  /* check bins */
+  for (i = 0; i < NSMALLBINS; ++i)
+    do_check_smallbin(m, i);
+  for (i = 0; i < NTREEBINS; ++i)
+    do_check_treebin(m, i);
+  if (m->dvsize != 0) { /* check dv chunk */
+    do_check_any_chunk(m, m->dv);
+    assert(m->dvsize == chunksize(m->dv));
+    assert(m->dvsize >= MIN_CHUNK_SIZE);
+    assert(bin_find(m, m->dv) == 0);
+  }
+  if (m->top != 0) {   /* check top chunk */
+    do_check_top_chunk(m, m->top);
+    assert(m->topsize == chunksize(m->top));
+    assert(m->topsize > 0);
+    assert(bin_find(m, m->top) == 0);
+  }
+  total = traverse_and_check(m);
+  assert(total <= m->footprint);
+  assert(m->footprint <= m->max_footprint);
+}
+#endif /* DEBUG */
+/* ----------------------------- statistics ------------------------------ */
+#if !NO_MALLINFO
+static struct mallinfo internal_mallinfo(mstate m) {
+  struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+  if (!PREACTION(m)) {
+    check_malloc_state(m);
+    if (is_initialized(m)) {
+      size_t nfree = SIZE_T_ONE; /* top always free */
+      size_t mfree = m->topsize + TOP_FOOT_SIZE;
+      size_t sum = mfree;
+      msegmentptr s = &m->seg;
+      while (s != 0) {
+        mchunkptr q = align_as_chunk(s->base);
+        while (segment_holds(s, q) &&
+               q != m->top && q->head != FENCEPOST_HEAD) {
+          size_t sz = chunksize(q);
+          sum += sz;
+          if (!cinuse(q)) {
+            mfree += sz;
+            ++nfree;
+          }
+          q = next_chunk(q);
+        }
+        s = s->next;
+      }
+      nm.arena    = sum;
+      nm.ordblks  = nfree;
+      nm.hblkhd   = m->footprint - sum;
+      nm.usmblks  = m->max_footprint;
+      nm.uordblks = m->footprint - mfree;
+      nm.fordblks = mfree;
+      nm.keepcost = m->topsize;
+    }
+    POSTACTION(m);
+  }
+  return nm;
+}
+#endif /* !NO_MALLINFO */
+static void internal_malloc_stats(mstate m) {
+  if (!PREACTION(m)) {
+    size_t maxfp = 0;
+    size_t fp = 0;
+    size_t used = 0;
+    check_malloc_state(m);
+    if (is_initialized(m)) {
+      msegmentptr s = &m->seg;
+      maxfp = m->max_footprint;
+      fp = m->footprint;
+      used = fp - (m->topsize + TOP_FOOT_SIZE);
+      while (s != 0) {
+        mchunkptr q = align_as_chunk(s->base);
+        while (segment_holds(s, q) &&
+               q != m->top && q->head != FENCEPOST_HEAD) {
+          if (!cinuse(q))
+            used -= chunksize(q);
+          q = next_chunk(q);
+        }
+        s = s->next;
+      }
+    }
+    fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp));
+    fprintf(stderr, "system bytes     = %10lu\n", (unsigned long)(fp));
+    fprintf(stderr, "in use bytes     = %10lu\n", (unsigned long)(used));
+    POSTACTION(m);
+  }
+}
+/* ----------------------- Operations on smallbins ----------------------- */
+/*
+  Various forms of linking and unlinking are defined as macros.  Even
+  the ones for trees, which are very long but have very short typical
+  paths.  This is ugly but reduces reliance on inlining support of
+  compilers.
+*/
+/* Link a free chunk into a smallbin  */
+#define insert_small_chunk(M, P, S) {\
+  bindex_t I  = small_index(S);\
+  mchunkptr B = smallbin_at(M, I);\
+  mchunkptr F = B;\
+  assert(S >= MIN_CHUNK_SIZE);\
+  if (!smallmap_is_marked(M, I))\
+    mark_smallmap(M, I);\
+  else if (RTCHECK(ok_address(M, B->fd)))\
+    F = B->fd;\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+  B->fd = P;\
+  F->bk = P;\
+  P->fd = F;\
+  P->bk = B;\
+}
+/* Unlink a chunk from a smallbin  */
+#define unlink_small_chunk(M, P, S) {\
+  mchunkptr F = P->fd;\
+  mchunkptr B = P->bk;\
+  bindex_t I = small_index(S);\
+  assert(P != B);\
+  assert(P != F);\
+  assert(chunksize(P) == small_index2size(I));\
+  if (F == B)\
+    clear_smallmap(M, I);\
+  else if (RTCHECK((F == smallbin_at(M,I) || ok_address(M, F)) &&\
+                   (B == smallbin_at(M,I) || ok_address(M, B)))) {\
+    F->bk = B;\
+    B->fd = F;\
+  }\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+}
+/* Unlink the first chunk from a smallbin */
+#define unlink_first_small_chunk(M, B, P, I) {\
+  mchunkptr F = P->fd;\
+  assert(P != B);\
+  assert(P != F);\
+  assert(chunksize(P) == small_index2size(I));\
+  if (B == F)\
+    clear_smallmap(M, I);\
+  else if (RTCHECK(ok_address(M, F))) {\
+    B->fd = F;\
+    F->bk = B;\
+  }\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+}
+/* Replace dv node, binning the old one */
+/* Used only when dvsize known to be small */
+#define replace_dv(M, P, S) {\
+  size_t DVS = M->dvsize;\
+  if (DVS != 0) {\
+    mchunkptr DV = M->dv;\
+    assert(is_small(DVS));\
+    insert_small_chunk(M, DV, DVS);\
+  }\
+  M->dvsize = S;\
+  M->dv = P;\
+}
+/* ------------------------- Operations on trees ------------------------- */
+/* Insert chunk into tree */
+#define insert_large_chunk(M, X, S) {\
+  tbinptr* H;\
+  bindex_t I;\
+  compute_tree_index(S, I);\
+  H = treebin_at(M, I);\
+  X->index = I;\
+  X->child[0] = X->child[1] = 0;\
+  if (!treemap_is_marked(M, I)) {\
+    mark_treemap(M, I);\
+    *H = X;\
+    X->parent = (tchunkptr)H;\
+    X->fd = X->bk = X;\
+  }\
+  else {\
+    tchunkptr T = *H;\
+    size_t K = S << leftshift_for_tree_index(I);\
+    for (;;) {\
+      if (chunksize(T) != S) {\
+        tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\
+        K <<= 1;\
+        if (*C != 0)\
+          T = *C;\
+        else if (RTCHECK(ok_address(M, C))) {\
+          *C = X;\
+          X->parent = T;\
+          X->fd = X->bk = X;\
+          break;\
+        }\
+        else {\
+          CORRUPTION_ERROR_ACTION(M);\
+          break;\
+        }\
+      }\
+      else {\
+        tchunkptr F = T->fd;\
+        if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\
+          T->fd = F->bk = X;\
+          X->fd = F;\
+          X->bk = T;\
+          X->parent = 0;\
+          break;\
+        }\
+        else {\
+          CORRUPTION_ERROR_ACTION(M);\
+          break;\
+        }\
+      }\
+    }\
+  }\
+}
+/*
+  Unlink steps:
+. If x is a chained node, unlink it from its same-sized fd/bk links
+     and choose its bk node as its replacement.
+. If x was the last node of its size, but not a leaf node, it must
+     be replaced with a leaf node (not merely one with an open left or
+     right), to make sure that lefts and rights of descendents
+     correspond properly to bit masks.  We use the rightmost descendent
+     of x.  We could use any other leaf, but this is easy to locate and
+     tends to counteract removal of leftmosts elsewhere, and so keeps
+     paths shorter than minimally guaranteed.  This doesn't loop much
+     because on average a node in a tree is near the bottom.
+. If x is the base of a chain (i.e., has parent links) relink
+     x's parent and children to x's replacement (or null if none).
+*/
+#define unlink_large_chunk(M, X) {\
+  tchunkptr XP = X->parent;\
+  tchunkptr R;\
+  if (X->bk != X) {\
+    tchunkptr F = X->fd;\
+    R = X->bk;\
+    if (RTCHECK(ok_address(M, F))) {\
+      F->bk = R;\
+      R->fd = F;\
+    }\
+    else {\
+      CORRUPTION_ERROR_ACTION(M);\
+    }\
+  }\
+  else {\
+    tchunkptr* RP;\
+    if (((R = *(RP = &(X->child[1]))) != 0) ||\
+        ((R = *(RP = &(X->child[0]))) != 0)) {\
+      tchunkptr* CP;\
+      while ((*(CP = &(R->child[1])) != 0) ||\
+             (*(CP = &(R->child[0])) != 0)) {\
+        R = *(RP = CP);\
+      }\
+      if (RTCHECK(ok_address(M, RP)))\
+        *RP = 0;\
+      else {\
+        CORRUPTION_ERROR_ACTION(M);\
+      }\
+    }\
+  }\
+  if (XP != 0) {\
+    tbinptr* H = treebin_at(M, X->index);\
+    if (X == *H) {\
+      if ((*H = R) == 0) \
+        clear_treemap(M, X->index);\
+    }\
+    else if (RTCHECK(ok_address(M, XP))) {\
+      if (XP->child[0] == X) \
+        XP->child[0] = R;\
+      else \
+        XP->child[1] = R;\
+    }\
+    else\
+      CORRUPTION_ERROR_ACTION(M);\
+    if (R != 0) {\
+      if (RTCHECK(ok_address(M, R))) {\
+        tchunkptr C0, C1;\
+        R->parent = XP;\
+        if ((C0 = X->child[0]) != 0) {\
+          if (RTCHECK(ok_address(M, C0))) {\
+            R->child[0] = C0;\
+            C0->parent = R;\
+          }\
+          else\
+            CORRUPTION_ERROR_ACTION(M);\
+        }\
+        if ((C1 = X->child[1]) != 0) {\
+          if (RTCHECK(ok_address(M, C1))) {\
+            R->child[1] = C1;\
+            C1->parent = R;\
+          }\
+          else\
+            CORRUPTION_ERROR_ACTION(M);\
+        }\
+      }\
+      else\
+        CORRUPTION_ERROR_ACTION(M);\
+    }\
+  }\
+}
+/* Relays to large vs small bin operations */
+#define insert_chunk(M, P, S)\
+  if (is_small(S)) insert_small_chunk(M, P, S)\
+  else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
+#define unlink_chunk(M, P, S)\
+  if (is_small(S)) unlink_small_chunk(M, P, S)\
+  else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); }
+/* Relays to internal calls to malloc/free from realloc, memalign etc */
+#if ONLY_MSPACES
+#define internal_malloc(m, b) mspace_malloc(m, b)
+#define internal_free(m, mem) mspace_free(m,mem);
+#else /* ONLY_MSPACES */
+#if MSPACES
+#define internal_malloc(m, b)\
+   (m == gm)? dlmalloc(b) : mspace_malloc(m, b)
+#define internal_free(m, mem)\
+   if (m == gm) dlfree(mem); else mspace_free(m,mem);
+#else /* MSPACES */
+#define internal_malloc(m, b) dlmalloc(b)
+#define internal_free(m, mem) dlfree(mem)
+#endif /* MSPACES */
+#endif /* ONLY_MSPACES */
+/* -----------------------  Direct-mmapping chunks ----------------------- */
+/*
+  Directly mmapped chunks are set up with an offset to the start of
+  the mmapped region stored in the prev_foot field of the chunk. This
+  allows reconstruction of the required argument to MUNMAP when freed,
+  and also allows adjustment of the returned chunk to meet alignment
+  requirements (especially in memalign).  There is also enough space
+  allocated to hold a fake next chunk of size SIZE_T_SIZE to maintain
+  the PINUSE bit so frees can be checked.
+*/
+/* Malloc using mmap */
+static void* mmap_alloc(mstate m, size_t nb) {
+  size_t mmsize = granularity_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+  if (mmsize > nb) {     /* Check for wrap around 0 */
+    char* mm = (char*)(DIRECT_MMAP(mmsize));
+    if (mm != CMFAIL) {
+      size_t offset = align_offset(chunk2mem(mm));
+      size_t psize = mmsize - offset - MMAP_FOOT_PAD;
+      mchunkptr p = (mchunkptr)(mm + offset);
+      p->prev_foot = offset | IS_MMAPPED_BIT;
+      (p)->head = (psize|CINUSE_BIT);
+      mark_inuse_foot(m, p, psize);
+      chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
+      chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0;
+      if (mm < m->least_addr)
+        m->least_addr = mm;
+      if ((m->footprint += mmsize) > m->max_footprint)
+        m->max_footprint = m->footprint;
+      assert(is_aligned(chunk2mem(p)));
+      check_mmapped_chunk(m, p);
+      return chunk2mem(p);
+    }
+  }
+  return 0;
+}
+/* Realloc using mmap */
+static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb) {
+  size_t oldsize = chunksize(oldp);
+  if (is_small(nb)) /* Can't shrink mmap regions below small size */
+    return 0;
+  /* Keep old chunk if big enough but not too big */
+  if (oldsize >= nb + SIZE_T_SIZE &&
+      (oldsize - nb) <= (mparams.granularity << 1))
+    return oldp;
+  else {
+    size_t offset = oldp->prev_foot & ~IS_MMAPPED_BIT;
+    size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
+    size_t newmmsize = granularity_align(nb + SIX_SIZE_T_SIZES +
+                                         CHUNK_ALIGN_MASK);
+    char* cp = (char*)CALL_MREMAP((char*)oldp - offset,
+                                  oldmmsize, newmmsize, 1);
+    if (cp != CMFAIL) {
+      mchunkptr newp = (mchunkptr)(cp + offset);
+      size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
+      newp->head = (psize|CINUSE_BIT);
+      mark_inuse_foot(m, newp, psize);
+      chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
+      chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0;
+      if (cp < m->least_addr)
+        m->least_addr = cp;
+      if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
+        m->max_footprint = m->footprint;
+      check_mmapped_chunk(m, newp);
+      return newp;
+    }
+  }
+  return 0;
+}
+/* -------------------------- mspace management -------------------------- */
+/* Initialize top chunk and its size */
+static void init_top(mstate m, mchunkptr p, size_t psize) {
+  /* Ensure alignment */
+  size_t offset = align_offset(chunk2mem(p));
+  p = (mchunkptr)((char*)p + offset);
+  psize -= offset;
+  m->top = p;
+  m->topsize = psize;
+  p->head = psize | PINUSE_BIT;
+  /* set size of fake trailing chunk holding overhead space only once */
+  chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
+  m->trim_check = mparams.trim_threshold; /* reset on each update */
+}
+/* Initialize bins for a new mstate that is otherwise zeroed out */
+static void init_bins(mstate m) {
+  /* Establish circular links for smallbins */
+  bindex_t i;
+  for (i = 0; i < NSMALLBINS; ++i) {
+    sbinptr bin = smallbin_at(m,i);
+    bin->fd = bin->bk = bin;
+  }
+}
+#if PROCEED_ON_ERROR
+/* default corruption action */
+static void reset_on_error(mstate m) {
+  int i;
+  ++malloc_corruption_error_count;
+  /* Reinitialize fields to forget about all memory */
+  m->smallbins = m->treebins = 0;
+  m->dvsize = m->topsize = 0;
+  m->seg.base = 0;
+  m->seg.size = 0;
+  m->seg.next = 0;
+  m->top = m->dv = 0;
+  for (i = 0; i < NTREEBINS; ++i)
+    *treebin_at(m, i) = 0;
+  init_bins(m);
+}
+#endif /* PROCEED_ON_ERROR */
+/* Allocate chunk and prepend remainder with chunk in successor base. */
+static void* prepend_alloc(mstate m, char* newbase, char* oldbase,
+                           size_t nb) {
+  mchunkptr p = align_as_chunk(newbase);
+  mchunkptr oldfirst = align_as_chunk(oldbase);
+  size_t psize = (char*)oldfirst - (char*)p;
+  mchunkptr q = chunk_plus_offset(p, nb);
+  size_t qsize = psize - nb;
+  set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+  assert((char*)oldfirst > (char*)q);
+  assert(pinuse(oldfirst));
+  assert(qsize >= MIN_CHUNK_SIZE);
+  /* consolidate remainder with first chunk of old base */
+  if (oldfirst == m->top) {
+    size_t tsize = m->topsize += qsize;
+    m->top = q;
+    q->head = tsize | PINUSE_BIT;
+    check_top_chunk(m, q);
+  }
+  else if (oldfirst == m->dv) {
+    size_t dsize = m->dvsize += qsize;
+    m->dv = q;
+    set_size_and_pinuse_of_free_chunk(q, dsize);
+  }
+  else {
+    if (!cinuse(oldfirst)) {
+      size_t nsize = chunksize(oldfirst);
+      unlink_chunk(m, oldfirst, nsize);
+      oldfirst = chunk_plus_offset(oldfirst, nsize);
+      qsize += nsize;
+    }
+    set_free_with_pinuse(q, qsize, oldfirst);
+    insert_chunk(m, q, qsize);
+    check_free_chunk(m, q);
+  }
+  check_malloced_chunk(m, chunk2mem(p), nb);
+  return chunk2mem(p);
+}
+/* Add a segment to hold a new noncontiguous region */
+static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {
+  /* Determine locations and sizes of segment, fenceposts, old top */
+  char* old_top = (char*)m->top;
+  msegmentptr oldsp = segment_holding(m, old_top);
+  char* old_end = oldsp->base + oldsp->size;
+  size_t ssize = pad_request(sizeof(struct malloc_segment));
+  char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+  size_t offset = align_offset(chunk2mem(rawsp));
+  char* asp = rawsp + offset;
+  char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp;
+  mchunkptr sp = (mchunkptr)csp;
+  msegmentptr ss = (msegmentptr)(chunk2mem(sp));
+  mchunkptr tnext = chunk_plus_offset(sp, ssize);
+  mchunkptr p = tnext;
+  int nfences = 0;
+  /* reset top to new space */
+  init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
+  /* Set up segment record */
+  assert(is_aligned(ss));
+  set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
+  *ss = m->seg; /* Push current record */
+  m->seg.base = tbase;
+  m->seg.size = tsize;
+  m->seg.sflags = mmapped;
+  m->seg.next = ss;
+  /* Insert trailing fenceposts */
+  for (;;) {
+    mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
+    p->head = FENCEPOST_HEAD;
+    ++nfences;
+    if ((char*)(&(nextp->head)) < old_end)
+      p = nextp;
+    else
+      break;
+  }
+  assert(nfences >= 2);
+  /* Insert the rest of old top into a bin as an ordinary free chunk */
+  if (csp != old_top) {
+    mchunkptr q = (mchunkptr)old_top;
+    size_t psize = csp - old_top;
+    mchunkptr tn = chunk_plus_offset(q, psize);
+    set_free_with_pinuse(q, psize, tn);
+    insert_chunk(m, q, psize);
+  }
+  check_top_chunk(m, m->top);
+}
+/* -------------------------- System allocation -------------------------- */
+/* Get memory from system using MORECORE or MMAP */
+static void* sys_alloc(mstate m, size_t nb) {
+  char* tbase = CMFAIL;
+  size_t tsize = 0;
+  flag_t mmap_flag = 0;
+  init_mparams();
+  /* Directly map large chunks */
+  if (use_mmap(m) && nb >= mparams.mmap_threshold) {
+    void* mem = mmap_alloc(m, nb);
+    if (mem != 0)
+      return mem;
+  }
+  /*
+    Try getting memory in any of three ways (in most-preferred to
+    least-preferred order):
+. A call to MORECORE that can normally contiguously extend memory.
+       (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
+       or main space is mmapped or a previous contiguous call failed)
+. A call to MMAP new space (disabled if not HAVE_MMAP).
+       Note that under the default settings, if MORECORE is unable to
+       fulfill a request, and HAVE_MMAP is true, then mmap is
+       used as a noncontiguous system allocator. This is a useful backup
+       strategy for systems with holes in address spaces -- in this case
+       sbrk cannot contiguously expand the heap, but mmap may be able to
+       find space.
+. A call to MORECORE that cannot usually contiguously extend memory.
+       (disabled if not HAVE_MORECORE)
+  */
+  if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
+    char* br = CMFAIL;
+    msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top);
+    size_t asize = 0;
+    ACQUIRE_MORECORE_LOCK();
+    if (ss == 0) {  /* First time through or recovery */
+      char* base = (char*)CALL_MORECORE(0);
+      if (base != CMFAIL) {
+        asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE);
+        /* Adjust to end on a page boundary */
+        if (!is_page_aligned(base))
+          asize += (page_align((size_t)base) - (size_t)base);
+        /* Can't call MORECORE if size is negative when treated as signed */
+        if (asize < HALF_MAX_SIZE_T &&
+            (br = (char*)(CALL_MORECORE(asize))) == base) {
+          tbase = base;
+          tsize = asize;
+        }
+      }
+    }
+    else {
+      /* Subtract out existing available top space from MORECORE request. */
+      asize = granularity_align(nb - m->topsize + TOP_FOOT_SIZE + SIZE_T_ONE);
+      /* Use mem here only if it did continuously extend old space */
+      if (asize < HALF_MAX_SIZE_T &&
+          (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) {
+        tbase = br;
+        tsize = asize;
+      }
+    }
+    if (tbase == CMFAIL) {    /* Cope with partial failure */
+      if (br != CMFAIL) {    /* Try to use/extend the space we did get */
+        if (asize < HALF_MAX_SIZE_T &&
+            asize < nb + TOP_FOOT_SIZE + SIZE_T_ONE) {
+          size_t esize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE - asize);
+          if (esize < HALF_MAX_SIZE_T) {
+            char* end = (char*)CALL_MORECORE(esize);
+            if (end != CMFAIL)
+              asize += esize;
+            else {            /* Can't use; try to release */
+              CALL_MORECORE(-asize);
+              br = CMFAIL;
+            }
+          }
+        }
+      }
+      if (br != CMFAIL) {    /* Use the space we did get */
+        tbase = br;
+        tsize = asize;
+      }
+      else
+        disable_contiguous(m); /* Don't try contiguous path in the future */
+    }
+    RELEASE_MORECORE_LOCK();
+  }
+  if (HAVE_MMAP && tbase == CMFAIL) {  /* Try MMAP */
+    size_t req = nb + TOP_FOOT_SIZE + SIZE_T_ONE;
+    size_t rsize = granularity_align(req);
+    if (rsize > nb) { /* Fail if wraps around zero */
+      char* mp = (char*)(CALL_MMAP(rsize));
+      if (mp != CMFAIL) {
+        tbase = mp;
+        tsize = rsize;
+        mmap_flag = IS_MMAPPED_BIT;
+      }
+    }
+  }
+  if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */
+    size_t asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE);
+    if (asize < HALF_MAX_SIZE_T) {
+      char* br = CMFAIL;
+      char* end = CMFAIL;
+      ACQUIRE_MORECORE_LOCK();
+      br = (char*)(CALL_MORECORE(asize));
+      end = (char*)(CALL_MORECORE(0));
+      RELEASE_MORECORE_LOCK();
+      if (br != CMFAIL && end != CMFAIL && br < end) {
+        size_t ssize = end - br;
+        if (ssize > nb + TOP_FOOT_SIZE) {
+          tbase = br;
+          tsize = ssize;
+        }
+      }
+    }
+  }
+  if (tbase != CMFAIL) {
+    if ((m->footprint += tsize) > m->max_footprint)
+      m->max_footprint = m->footprint;
+    if (!is_initialized(m)) { /* first-time initialization */
+      m->seg.base = m->least_addr = tbase;
+      m->seg.size = tsize;
+      m->seg.sflags = mmap_flag;
+      m->magic = mparams.magic;
+      init_bins(m);
+      if (is_global(m))
+        init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
+      else {
+        /* Offset top by embedded malloc_state */
+        mchunkptr mn = next_chunk(mem2chunk(m));
+        init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE);
+      }
+    }
+    else {
+      /* Try to merge with an existing segment */
+      msegmentptr sp = &m->seg;
+      while (sp != 0 && tbase != sp->base + sp->size)
+        sp = sp->next;
+      if (sp != 0 &&
+          !is_extern_segment(sp) &&
+          (sp->sflags & IS_MMAPPED_BIT) == mmap_flag &&
+          segment_holds(sp, m->top)) { /* append */
+        sp->size += tsize;
+        init_top(m, m->top, m->topsize + tsize);
+      }
+      else {
+        if (tbase < m->least_addr)
+          m->least_addr = tbase;
+        sp = &m->seg;
+        while (sp != 0 && sp->base != tbase + tsize)
+          sp = sp->next;
+        if (sp != 0 &&
+            !is_extern_segment(sp) &&
+            (sp->sflags & IS_MMAPPED_BIT) == mmap_flag) {
+          char* oldbase = sp->base;
+          sp->base = tbase;
+          sp->size += tsize;
+          return prepend_alloc(m, tbase, oldbase, nb);
+        }
+        else
+          add_segment(m, tbase, tsize, mmap_flag);
+      }
+    }
+    if (nb < m->topsize) { /* Allocate from new or extended top space */
+      size_t rsize = m->topsize -= nb;
+      mchunkptr p = m->top;
+      mchunkptr r = m->top = chunk_plus_offset(p, nb);
+      r->head = rsize | PINUSE_BIT;
+      set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+      check_top_chunk(m, m->top);
+      check_malloced_chunk(m, chunk2mem(p), nb);
+      return chunk2mem(p);
+    }
+  }
+  MALLOC_FAILURE_ACTION;
+  return 0;
+}
+/* -----------------------  system deallocation -------------------------- */
+/* Unmap and unlink any mmapped segments that don't contain used chunks */
+static size_t release_unused_segments(mstate m) {
+  size_t released = 0;
+  msegmentptr pred = &m->seg;
+  msegmentptr sp = pred->next;
+  while (sp != 0) {
+    char* base = sp->base;
+    size_t size = sp->size;
+    msegmentptr next = sp->next;
+    if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
+      mchunkptr p = align_as_chunk(base);
+      size_t psize = chunksize(p);
+      /* Can unmap if first chunk holds entire segment and not pinned */
+      if (!cinuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) {
+        tchunkptr tp = (tchunkptr)p;
+        assert(segment_holds(sp, (char*)sp));
+        if (p == m->dv) {
+          m->dv = 0;
+          m->dvsize = 0;
+        }
+        else {
+          unlink_large_chunk(m, tp);
+        }
+        if (CALL_MUNMAP(base, size) == 0) {
+          released += size;
+          m->footprint -= size;
+          /* unlink obsoleted record */
+          sp = pred;
+          sp->next = next;
+        }
+        else { /* back out if cannot unmap */
+          insert_large_chunk(m, tp, psize);
+        }
+      }
+    }
+    pred = sp;
+    sp = next;
+  }
+  return released;
+}
+static int sys_trim(mstate m, size_t pad) {
+  size_t released = 0;
+  if (pad < MAX_REQUEST && is_initialized(m)) {
+    pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */
+    if (m->topsize > pad) {
+      /* Shrink top space in granularity-size units, keeping at least one */
+      size_t unit = mparams.granularity;
+      size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
+                      SIZE_T_ONE) * unit;
+      msegmentptr sp = segment_holding(m, (char*)m->top);
+      if (!is_extern_segment(sp)) {
+        if (is_mmapped_segment(sp)) {
+          if (HAVE_MMAP &&
+              sp->size >= extra &&
+              !has_segment_link(m, sp)) { /* can't shrink if pinned */
+            /* Prefer mremap, fall back to munmap */
+            if ((CALL_MREMAP(sp->base, sp->size, sp->size - extra, 0) != MFAIL) ||
+                (CALL_MUNMAP(sp->base + sp->size - extra, extra) == 0)) {
+              released = extra;
+            }
+          }
+        }
+        else if (HAVE_MORECORE) {
+          if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */
+            extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
+          ACQUIRE_MORECORE_LOCK();
+          {
+            /* Make sure end of memory is where we last set it. */
+            char* old_br = (char*)(CALL_MORECORE(0));
+            if (old_br == sp->base + sp->size) {
+              char* rel_br = (char*)(CALL_MORECORE(-extra));
+              char* new_br = (char*)(CALL_MORECORE(0));
+              if (rel_br != CMFAIL && new_br < old_br)
+                released = old_br - new_br;
+            }
+          }
+          RELEASE_MORECORE_LOCK();
+        }
+      }
+      if (released != 0) {
+        sp->size -= released;
+        m->footprint -= released;
+        init_top(m, m->top, m->topsize - released);
+        check_top_chunk(m, m->top);
+      }
+    }
+    /* Unmap any unused mmapped segments */
+    if (HAVE_MMAP)
+      released += release_unused_segments(m);
+    /* On failure, disable autotrim to avoid repeated failed future calls */
+    if (released == 0)
+      m->trim_check = MAX_SIZE_T;
+  }
+  return (released != 0)? 1 : 0;
+}
+/* ---------------------------- malloc support --------------------------- */
+/* allocate a large request from the best fitting chunk in a treebin */
+static void* tmalloc_large(mstate m, size_t nb) {
+  tchunkptr v = 0;
+  size_t rsize = -nb; /* Unsigned negation */
+  tchunkptr t;
+  bindex_t idx;
+  compute_tree_index(nb, idx);
+  if ((t = *treebin_at(m, idx)) != 0) {
+    /* Traverse tree for this bin looking for node with size == nb */
+    size_t sizebits = nb << leftshift_for_tree_index(idx);
+    tchunkptr rst = 0;  /* The deepest untaken right subtree */
+    for (;;) {
+      tchunkptr rt;
+      size_t trem = chunksize(t) - nb;
+      if (trem < rsize) {
+        v = t;
+        if ((rsize = trem) == 0)
+          break;
+      }
+      rt = t->child[1];
+      t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
+      if (rt != 0 && rt != t)
+        rst = rt;
+      if (t == 0) {
+        t = rst; /* set t to least subtree holding sizes > nb */
+        break;
+      }
+      sizebits <<= 1;
+    }
+  }
+  if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */
+    binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
+    if (leftbits != 0) {
+      bindex_t i;
+      binmap_t leastbit = least_bit(leftbits);
+      compute_bit2idx(leastbit, i);
+      t = *treebin_at(m, i);
+    }
+  }
+  while (t != 0) { /* find smallest of tree or subtree */
+    size_t trem = chunksize(t) - nb;
+    if (trem < rsize) {
+      rsize = trem;
+      v = t;
+    }
+    t = leftmost_child(t);
+  }
+  /*  If dv is a better fit, return 0 so malloc will use it */
+  if (v != 0 && rsize < (size_t)(m->dvsize - nb)) {
+    if (RTCHECK(ok_address(m, v))) { /* split */
+      mchunkptr r = chunk_plus_offset(v, nb);
+      assert(chunksize(v) == rsize + nb);
+      if (RTCHECK(ok_next(v, r))) {
+        unlink_large_chunk(m, v);
+        if (rsize < MIN_CHUNK_SIZE)
+          set_inuse_and_pinuse(m, v, (rsize + nb));
+        else {
+          set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+          set_size_and_pinuse_of_free_chunk(r, rsize);
+          insert_chunk(m, r, rsize);
+        }
+        return chunk2mem(v);
+      }
+    }
+    CORRUPTION_ERROR_ACTION(m);
+  }
+  return 0;
+}
+/* allocate a small request from the best fitting chunk in a treebin */
+static void* tmalloc_small(mstate m, size_t nb) {
+  tchunkptr t, v;
+  size_t rsize;
+  bindex_t i;
+  binmap_t leastbit = least_bit(m->treemap);
+  compute_bit2idx(leastbit, i);
+  v = t = *treebin_at(m, i);
+  rsize = chunksize(t) - nb;
+  while ((t = leftmost_child(t)) != 0) {
+    size_t trem = chunksize(t) - nb;
+    if (trem < rsize) {
+      rsize = trem;
+      v = t;
+    }
+  }
+  if (RTCHECK(ok_address(m, v))) {
+    mchunkptr r = chunk_plus_offset(v, nb);
+    assert(chunksize(v) == rsize + nb);
+    if (RTCHECK(ok_next(v, r))) {
+      unlink_large_chunk(m, v);
+      if (rsize < MIN_CHUNK_SIZE)
+        set_inuse_and_pinuse(m, v, (rsize + nb));
+      else {
+        set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+        set_size_and_pinuse_of_free_chunk(r, rsize);
+        replace_dv(m, r, rsize);
+      }
+      return chunk2mem(v);
+    }
+  }
+  CORRUPTION_ERROR_ACTION(m);
+  return 0;
+}
+/* --------------------------- realloc support --------------------------- */
+static void* internal_realloc(mstate m, void* oldmem, size_t bytes) {
+  if (bytes >= MAX_REQUEST) {
+    MALLOC_FAILURE_ACTION;
+    return 0;
+  }
+  if (!PREACTION(m)) {
+    mchunkptr oldp = mem2chunk(oldmem);
+    size_t oldsize = chunksize(oldp);
+    mchunkptr next = chunk_plus_offset(oldp, oldsize);
+    mchunkptr newp = 0;
+    void* extra = 0;
+    /* Try to either shrink or extend into top. Else malloc-copy-free */
+    if (RTCHECK(ok_address(m, oldp) && ok_cinuse(oldp) &&
+                ok_next(oldp, next) && ok_pinuse(next))) {
+      size_t nb = request2size(bytes);
+      if (is_mmapped(oldp))
+        newp = mmap_resize(m, oldp, nb);
+      else if (oldsize >= nb) { /* already big enough */
+        size_t rsize = oldsize - nb;
+        newp = oldp;
+        if (rsize >= MIN_CHUNK_SIZE) {
+          mchunkptr remainder = chunk_plus_offset(newp, nb);
+          set_inuse(m, newp, nb);
+          set_inuse(m, remainder, rsize);
+          extra = chunk2mem(remainder);
+        }
+      }
+      else if (next == m->top && oldsize + m->topsize > nb) {
+        /* Expand into top */
+        size_t newsize = oldsize + m->topsize;
+        size_t newtopsize = newsize - nb;
+        mchunkptr newtop = chunk_plus_offset(oldp, nb);
+        set_inuse(m, oldp, nb);
+        newtop->head = newtopsize |PINUSE_BIT;
+        m->top = newtop;
+        m->topsize = newtopsize;
+        newp = oldp;
+      }
+    }
+    else {
+      USAGE_ERROR_ACTION(m, oldmem);
+      POSTACTION(m);
+      return 0;
+    }
+    POSTACTION(m);
+    if (newp != 0) {
+      if (extra != 0) {
+        internal_free(m, extra);
+      }
+      check_inuse_chunk(m, newp);
+      return chunk2mem(newp);
+    }
+    else {
+      void* newmem = internal_malloc(m, bytes);
+      if (newmem != 0) {
+        size_t oc = oldsize - overhead_for(oldp);
+        memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
+        internal_free(m, oldmem);
+      }
+      return newmem;
+    }
+  }
+  return 0;
+}
+/* --------------------------- memalign support -------------------------- */
+static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
+  if (alignment <= MALLOC_ALIGNMENT)    /* Can just use malloc */
+    return internal_malloc(m, bytes);
+  if (alignment <  MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */
+    alignment = MIN_CHUNK_SIZE;
+  if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */
+    size_t a = MALLOC_ALIGNMENT << 1;
+    while (a < alignment) a <<= 1;
+    alignment = a;
+  }
+  if (bytes >= MAX_REQUEST - alignment) {
+    if (m != 0)  { /* Test isn't needed but avoids compiler warning */
+      MALLOC_FAILURE_ACTION;
+    }
+  }
+  else {
+    size_t nb = request2size(bytes);
+    size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
+    char* mem = (char*)internal_malloc(m, req);
+    if (mem != 0) {
+      void* leader = 0;
+      void* trailer = 0;
+      mchunkptr p = mem2chunk(mem);
+      if (PREACTION(m)) return 0;
+      if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */
+        /*
+          Find an aligned spot inside chunk.  Since we need to give
+          back leading space in a chunk of at least MIN_CHUNK_SIZE, if
+          the first calculation places us at a spot with less than
+          MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
+          We've allocated enough total room so that this is always
+          possible.
+        */
+        char* br = (char*)mem2chunk((size_t)(((size_t)(mem +
+                                                       alignment -
+                                                       SIZE_T_ONE)) &
+                                             -alignment));
+        char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
+          br : br+alignment;
+        mchunkptr newp = (mchunkptr)pos;
+        size_t leadsize = pos - (char*)(p);
+        size_t newsize = chunksize(p) - leadsize;
+        if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */
+          newp->prev_foot = p->prev_foot + leadsize;
+          newp->head = (newsize|CINUSE_BIT);
+        }
+        else { /* Otherwise, give back leader, use the rest */
+          set_inuse(m, newp, newsize);
+          set_inuse(m, p, leadsize);
+          leader = chunk2mem(p);
+        }
+        p = newp;
+      }
+      /* Give back spare room at the end */
+      if (!is_mmapped(p)) {
+        size_t size = chunksize(p);
+        if (size > nb + MIN_CHUNK_SIZE) {
+          size_t remainder_size = size - nb;
+          mchunkptr remainder = chunk_plus_offset(p, nb);
+          set_inuse(m, p, nb);
+          set_inuse(m, remainder, remainder_size);
+          trailer = chunk2mem(remainder);
+        }
+      }
+      assert (chunksize(p) >= nb);
+      assert((((size_t)(chunk2mem(p))) % alignment) == 0);
+      check_inuse_chunk(m, p);
+      POSTACTION(m);
+      if (leader != 0) {
+        internal_free(m, leader);
+      }
+      if (trailer != 0) {
+        internal_free(m, trailer);
+      }
+      return chunk2mem(p);
+    }
+  }
+  return 0;
+}
+/* ------------------------ comalloc/coalloc support --------------------- */
+static void** ialloc(mstate m,
+                     size_t n_elements,
+                     size_t* sizes,
+                     int opts,
+                     void* chunks[]) {
+  /*
+    This provides common support for independent_X routines, handling
+    all of the combinations that can result.
+    The opts arg has:
+    bit 0 set if all elements are same size (using sizes[0])
+    bit 1 set if elements should be zeroed
+  */
+  size_t    element_size;   /* chunksize of each element, if all same */
+  size_t    contents_size;  /* total size of elements */
+  size_t    array_size;     /* request size of pointer array */
+  void*     mem;            /* malloced aggregate space */
+  mchunkptr p;              /* corresponding chunk */
+  size_t    remainder_size; /* remaining bytes while splitting */
+  void**    marray;         /* either "chunks" or malloced ptr array */
+  mchunkptr array_chunk;    /* chunk for malloced ptr array */
+  flag_t    was_enabled;    /* to disable mmap */
+  size_t    size;
+  size_t    i;
+  /* compute array length, if needed */
+  if (chunks != 0) {
+    if (n_elements == 0)
+      return chunks; /* nothing to do */
+    marray = chunks;
+    array_size = 0;
+  }
+  else {
+    /* if empty req, must still return chunk representing empty array */
+    if (n_elements == 0)
+      return (void**)internal_malloc(m, 0);
+    marray = 0;
+    array_size = request2size(n_elements * (sizeof(void*)));
+  }
+  /* compute total element size */
+  if (opts & 0x1) { /* all-same-size */
+    element_size = request2size(*sizes);
+    contents_size = n_elements * element_size;
+  }
+  else { /* add up all the sizes */
+    element_size = 0;
+    contents_size = 0;
+    for (i = 0; i != n_elements; ++i)
+      contents_size += request2size(sizes[i]);
+  }
+  size = contents_size + array_size;
+  /*
+     Allocate the aggregate chunk.  First disable direct-mmapping so
+     malloc won't use it, since we would not be able to later
+     free/realloc space internal to a segregated mmap region.
+  */
+  was_enabled = use_mmap(m);
+  disable_mmap(m);
+  mem = internal_malloc(m, size - CHUNK_OVERHEAD);
+  if (was_enabled)
+    enable_mmap(m);
+  if (mem == 0)
+    return 0;
+  if (PREACTION(m)) return 0;
+  p = mem2chunk(mem);
+  remainder_size = chunksize(p);
+  assert(!is_mmapped(p));
+  if (opts & 0x2) {       /* optionally clear the elements */
+    memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size);
+  }
+  /* If not provided, allocate the pointer array as final part of chunk */
+  if (marray == 0) {
+    size_t  array_chunk_size;
+    array_chunk = chunk_plus_offset(p, contents_size);
+    array_chunk_size = remainder_size - contents_size;
+    marray = (void**) (chunk2mem(array_chunk));
+    set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
+    remainder_size = contents_size;
+  }
+  /* split out elements */
+  for (i = 0; ; ++i) {
+    marray[i] = chunk2mem(p);
+    if (i != n_elements-1) {
+      if (element_size != 0)
+        size = element_size;
+      else
+        size = request2size(sizes[i]);
+      remainder_size -= size;
+      set_size_and_pinuse_of_inuse_chunk(m, p, size);
+      p = chunk_plus_offset(p, size);
+    }
+    else { /* the final element absorbs any overallocation slop */
+      set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
+      break;
+    }
+  }
+#if DEBUG
+  if (marray != chunks) {
+    /* final element must have exactly exhausted chunk */
+    if (element_size != 0) {
+      assert(remainder_size == element_size);
+    }
+    else {
+      assert(remainder_size == request2size(sizes[i]));
+    }
+    check_inuse_chunk(m, mem2chunk(marray));
+  }
+  for (i = 0; i != n_elements; ++i)
+    check_inuse_chunk(m, mem2chunk(marray[i]));
+#endif /* DEBUG */
+  POSTACTION(m);
+  return marray;
+}
+/* -------------------------- public routines ---------------------------- */
+#if !ONLY_MSPACES
+void* dlmalloc(size_t bytes) {
+  /*
+     Basic algorithm:
+     If a small request (< 256 bytes minus per-chunk overhead):
+. If one exists, use a remainderless chunk in associated smallbin.
+          (Remainderless means that there are too few excess bytes to
+          represent as a chunk.)
+. If it is big enough, use the dv chunk, which is normally the
+          chunk adjacent to the one used for the most recent small request.
+. If one exists, split the smallest available chunk in a bin,
+          saving remainder in dv.
+. If it is big enough, use the top chunk.
+. If available, get memory from system and use it
+     Otherwise, for a large request:
+. Find the smallest available binned chunk that fits, and use it
+          if it is better fitting than dv chunk, splitting if necessary.
+. If better fitting than any binned chunk, use the dv chunk.
+. If it is big enough, use the top chunk.
+. If request size >= mmap threshold, try to directly mmap this chunk.
+. If available, get memory from system and use it
+     The ugly goto's here ensure that postaction occurs along all paths.
+  */
+  if (!PREACTION(gm)) {
+    void* mem;
+    size_t nb;
+    if (bytes <= MAX_SMALL_REQUEST) {
+      bindex_t idx;
+      binmap_t smallbits;
+      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
+      idx = small_index(nb);
+      smallbits = gm->smallmap >> idx;
+      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
+        mchunkptr b, p;
+        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
+        b = smallbin_at(gm, idx);
+        p = b->fd;
+        assert(chunksize(p) == small_index2size(idx));
+        unlink_first_small_chunk(gm, b, p, idx);
+        set_inuse_and_pinuse(gm, p, small_index2size(idx));
+        mem = chunk2mem(p);
+        check_malloced_chunk(gm, mem, nb);
+        goto postaction;
+      }
+      else if (nb > gm->dvsize) {
+        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
+          mchunkptr b, p, r;
+          size_t rsize;
+          bindex_t i;
+          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
+          binmap_t leastbit = least_bit(leftbits);
+          compute_bit2idx(leastbit, i);
+          b = smallbin_at(gm, i);
+          p = b->fd;
+          assert(chunksize(p) == small_index2size(i));
+          unlink_first_small_chunk(gm, b, p, i);
+          rsize = small_index2size(i) - nb;
+          /* Fit here cannot be remainderless if 4byte sizes */
+          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+            set_inuse_and_pinuse(gm, p, small_index2size(i));
+          else {
+            set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+            r = chunk_plus_offset(p, nb);
+            set_size_and_pinuse_of_free_chunk(r, rsize);
+            replace_dv(gm, r, rsize);
+          }
+          mem = chunk2mem(p);
+          check_malloced_chunk(gm, mem, nb);
+          goto postaction;
+        }
+        else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) {
+          check_malloced_chunk(gm, mem, nb);
+          goto postaction;
+        }
+      }
+    }
+    else if (bytes >= MAX_REQUEST)
+      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
+    else {
+      nb = pad_request(bytes);
+      if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
+        check_malloced_chunk(gm, mem, nb);
+        goto postaction;
+      }
+    }
+    if (nb <= gm->dvsize) {
+      size_t rsize = gm->dvsize - nb;
+      mchunkptr p = gm->dv;
+      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
+        mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
+        gm->dvsize = rsize;
+        set_size_and_pinuse_of_free_chunk(r, rsize);
+        set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+      }
+      else { /* exhaust dv */
+        size_t dvs = gm->dvsize;
+        gm->dvsize = 0;
+        gm->dv = 0;
+        set_inuse_and_pinuse(gm, p, dvs);
+      }
+      mem = chunk2mem(p);
+      check_malloced_chunk(gm, mem, nb);
+      goto postaction;
+    }
+    else if (nb < gm->topsize) { /* Split top */
+      size_t rsize = gm->topsize -= nb;
+      mchunkptr p = gm->top;
+      mchunkptr r = gm->top = chunk_plus_offset(p, nb);
+      r->head = rsize | PINUSE_BIT;
+      set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+      mem = chunk2mem(p);
+      check_top_chunk(gm, gm->top);
+      check_malloced_chunk(gm, mem, nb);
+      goto postaction;
+    }
+    mem = sys_alloc(gm, nb);
+  postaction:
+    POSTACTION(gm);
+    return mem;
+  }
+  return 0;
+}
+void dlfree(void* mem) {
+  /*
+     Consolidate freed chunks with preceeding or succeeding bordering
+     free chunks, if they exist, and then place in a bin.  Intermixed
+     with special cases for top, dv, mmapped chunks, and usage errors.
+  */
+  if (mem != 0) {
+    mchunkptr p  = mem2chunk(mem);
+#if FOOTERS
+    mstate fm = get_mstate_for(p);
+    if (!ok_magic(fm)) {
+      USAGE_ERROR_ACTION(fm, p);
+      return;
+    }
+#else /* FOOTERS */
+#define fm gm
+#endif /* FOOTERS */
+    if (!PREACTION(fm)) {
+      check_inuse_chunk(fm, p);
+      if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
+        size_t psize = chunksize(p);
+        mchunkptr next = chunk_plus_offset(p, psize);
+        if (!pinuse(p)) {
+          size_t prevsize = p->prev_foot;
+          if ((prevsize & IS_MMAPPED_BIT) != 0) {
+            prevsize &= ~IS_MMAPPED_BIT;
+            psize += prevsize + MMAP_FOOT_PAD;
+            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
+              fm->footprint -= psize;
+            goto postaction;
+          }
+          else {
+            mchunkptr prev = chunk_minus_offset(p, prevsize);
+            psize += prevsize;
+            p = prev;
+            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
+              if (p != fm->dv) {
+                unlink_chunk(fm, p, prevsize);
+              }
+              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
+                fm->dvsize = psize;
+                set_free_with_pinuse(p, psize, next);
+                goto postaction;
+              }
+            }
+            else
+              goto erroraction;
+          }
+        }
+        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+          if (!cinuse(next)) {  /* consolidate forward */
+            if (next == fm->top) {
+              size_t tsize = fm->topsize += psize;
+              fm->top = p;
+              p->head = tsize | PINUSE_BIT;
+              if (p == fm->dv) {
+                fm->dv = 0;
+                fm->dvsize = 0;
+              }
+              if (should_trim(fm, tsize))
+                sys_trim(fm, 0);
+              goto postaction;
+            }
+            else if (next == fm->dv) {
+              size_t dsize = fm->dvsize += psize;
+              fm->dv = p;
+              set_size_and_pinuse_of_free_chunk(p, dsize);
+              goto postaction;
+            }
+            else {
+              size_t nsize = chunksize(next);
+              psize += nsize;
+              unlink_chunk(fm, next, nsize);
+              set_size_and_pinuse_of_free_chunk(p, psize);
+              if (p == fm->dv) {
+                fm->dvsize = psize;
+                goto postaction;
+              }
+            }
+          }
+          else
+            set_free_with_pinuse(p, psize, next);
+          insert_chunk(fm, p, psize);
+          check_free_chunk(fm, p);
+          goto postaction;
+        }
+      }
+    erroraction:
+      USAGE_ERROR_ACTION(fm, p);
+    postaction:
+      POSTACTION(fm);
+    }
+  }
+#if !FOOTERS
+#undef fm
+#endif /* FOOTERS */
+}
+void* dlcalloc(size_t n_elements, size_t elem_size) {
+  void* mem;
+  size_t req = 0;
+  if (n_elements != 0) {
+    req = n_elements * elem_size;
+    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
+        (req / n_elements != elem_size))
+      req = MAX_SIZE_T; /* force downstream failure on overflow */
+  }
+  mem = dlmalloc(req);
+  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+    memset(mem, 0, req);
+  return mem;
+}
+void* dlrealloc(void* oldmem, size_t bytes) {
+  if (oldmem == 0)
+    return dlmalloc(bytes);
+#ifdef REALLOC_ZERO_BYTES_FREES
+  if (bytes == 0) {
+    dlfree(oldmem);
+    return 0;
+  }
+#endif /* REALLOC_ZERO_BYTES_FREES */
+  else {
+#if ! FOOTERS
+    mstate m = gm;
+#else /* FOOTERS */
+    mstate m = get_mstate_for(mem2chunk(oldmem));
+    if (!ok_magic(m)) {
+      USAGE_ERROR_ACTION(m, oldmem);
+      return 0;
+    }
+#endif /* FOOTERS */
+    return internal_realloc(m, oldmem, bytes);
+  }
+}
+void* dlmemalign(size_t alignment, size_t bytes) {
+  return internal_memalign(gm, alignment, bytes);
+}
+void** dlindependent_calloc(size_t n_elements, size_t elem_size,
+                                 void* chunks[]) {
+  size_t sz = elem_size; /* serves as 1-element array */
+  return ialloc(gm, n_elements, &sz, 3, chunks);
+}
+void** dlindependent_comalloc(size_t n_elements, size_t sizes[],
+                                   void* chunks[]) {
+  return ialloc(gm, n_elements, sizes, 0, chunks);
+}
+void* dlvalloc(size_t bytes) {
+  size_t pagesz;
+  init_mparams();
+  pagesz = mparams.page_size;
+  return dlmemalign(pagesz, bytes);
+}
+void* dlpvalloc(size_t bytes) {
+  size_t pagesz;
+  init_mparams();
+  pagesz = mparams.page_size;
+  return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
+}
+int dlmalloc_trim(size_t pad) {
+  int result = 0;
+  if (!PREACTION(gm)) {
+    result = sys_trim(gm, pad);
+    POSTACTION(gm);
+  }
+  return result;
+}
+size_t dlmalloc_footprint(void) {
+  return gm->footprint;
+}
+size_t dlmalloc_max_footprint(void) {
+  return gm->max_footprint;
+}
+#if !NO_MALLINFO
+struct mallinfo dlmallinfo(void) {
+  return internal_mallinfo(gm);
+}
+#endif /* NO_MALLINFO */
+void dlmalloc_stats() {
+  internal_malloc_stats(gm);
+}
+size_t dlmalloc_usable_size(void* mem) {
+  if (mem != 0) {
+    mchunkptr p = mem2chunk(mem);
+    if (cinuse(p))
+      return chunksize(p) - overhead_for(p);
+  }
+  return 0;
+}
+int dlmallopt(int param_number, int value) {
+  return change_mparam(param_number, value);
+}
+#endif /* !ONLY_MSPACES */
+/* ----------------------------- user mspaces ---------------------------- */
+#if MSPACES
+static mstate init_user_mstate(char* tbase, size_t tsize) {
+  size_t msize = pad_request(sizeof(struct malloc_state));
+  mchunkptr mn;
+  mchunkptr msp = align_as_chunk(tbase);
+  mstate m = (mstate)(chunk2mem(msp));
+  memset(m, 0, msize);
+  INITIAL_LOCK(&m->mutex);
+  msp->head = (msize|PINUSE_BIT|CINUSE_BIT);
+  m->seg.base = m->least_addr = tbase;
+  m->seg.size = m->footprint = m->max_footprint = tsize;
+  m->magic = mparams.magic;
+  m->mflags = mparams.default_mflags;
+  disable_contiguous(m);
+  init_bins(m);
+  mn = next_chunk(mem2chunk(m));
+  init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE);
+  check_top_chunk(m, m->top);
+  return m;
+}
+mspace create_mspace(size_t capacity, int locked) {
+  mstate m = 0;
+  size_t msize = pad_request(sizeof(struct malloc_state));
+  init_mparams(); /* Ensure pagesize etc initialized */
+  if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
+    size_t rs = ((capacity == 0)? mparams.granularity :
+                 (capacity + TOP_FOOT_SIZE + msize));
+    size_t tsize = granularity_align(rs);
+    char* tbase = (char*)(CALL_MMAP(tsize));
+    if (tbase != CMFAIL) {
+      m = init_user_mstate(tbase, tsize);
+      m->seg.sflags = IS_MMAPPED_BIT;
+      set_lock(m, locked);
+    }
+  }
+  return (mspace)m;
+}
+mspace create_mspace_with_base(void* base, size_t capacity, int locked) {
+  mstate m = 0;
+  size_t msize = pad_request(sizeof(struct malloc_state));
+  init_mparams(); /* Ensure pagesize etc initialized */
+  if (capacity > msize + TOP_FOOT_SIZE &&
+      capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
+    m = init_user_mstate((char*)base, capacity);
+    m->seg.sflags = EXTERN_BIT;
+    set_lock(m, locked);
+  }
+  return (mspace)m;
+}
+size_t destroy_mspace(mspace msp) {
+  size_t freed = 0;
+  mstate ms = (mstate)msp;
+  if (ok_magic(ms)) {
+    msegmentptr sp = &ms->seg;
+    while (sp != 0) {
+      char* base = sp->base;
+      size_t size = sp->size;
+      flag_t flag = sp->sflags;
+      sp = sp->next;
+      if ((flag & IS_MMAPPED_BIT) && !(flag & EXTERN_BIT) &&
+          CALL_MUNMAP(base, size) == 0)
+        freed += size;
+    }
+  }
+  else {
+    USAGE_ERROR_ACTION(ms,ms);
+  }
+  return freed;
+}
+/*
+  mspace versions of routines are near-clones of the global
+  versions. This is not so nice but better than the alternatives.
+*/
+void* mspace_malloc(mspace msp, size_t bytes) {
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+    return 0;
+  }
+  if (!PREACTION(ms)) {
+    void* mem;
+    size_t nb;
+    if (bytes <= MAX_SMALL_REQUEST) {
+      bindex_t idx;
+      binmap_t smallbits;
+      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
+      idx = small_index(nb);
+      smallbits = ms->smallmap >> idx;
+      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
+        mchunkptr b, p;
+        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
+        b = smallbin_at(ms, idx);
+        p = b->fd;
+        assert(chunksize(p) == small_index2size(idx));
+        unlink_first_small_chunk(ms, b, p, idx);
+        set_inuse_and_pinuse(ms, p, small_index2size(idx));
+        mem = chunk2mem(p);
+        check_malloced_chunk(ms, mem, nb);
+        goto postaction;
+      }
+      else if (nb > ms->dvsize) {
+        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
+          mchunkptr b, p, r;
+          size_t rsize;
+          bindex_t i;
+          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
+          binmap_t leastbit = least_bit(leftbits);
+          compute_bit2idx(leastbit, i);
+          b = smallbin_at(ms, i);
+          p = b->fd;
+          assert(chunksize(p) == small_index2size(i));
+          unlink_first_small_chunk(ms, b, p, i);
+          rsize = small_index2size(i) - nb;
+          /* Fit here cannot be remainderless if 4byte sizes */
+          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+            set_inuse_and_pinuse(ms, p, small_index2size(i));
+          else {
+            set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+            r = chunk_plus_offset(p, nb);
+            set_size_and_pinuse_of_free_chunk(r, rsize);
+            replace_dv(ms, r, rsize);
+          }
+          mem = chunk2mem(p);
+          check_malloced_chunk(ms, mem, nb);
+          goto postaction;
+        }
+        else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) {
+          check_malloced_chunk(ms, mem, nb);
+          goto postaction;
+        }
+      }
+    }
+    else if (bytes >= MAX_REQUEST)
+      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
+    else {
+      nb = pad_request(bytes);
+      if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
+        check_malloced_chunk(ms, mem, nb);
+        goto postaction;
+      }
+    }
+    if (nb <= ms->dvsize) {
+      size_t rsize = ms->dvsize - nb;
+      mchunkptr p = ms->dv;
+      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
+        mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
+        ms->dvsize = rsize;
+        set_size_and_pinuse_of_free_chunk(r, rsize);
+        set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+      }
+      else { /* exhaust dv */
+        size_t dvs = ms->dvsize;
+        ms->dvsize = 0;
+        ms->dv = 0;
+        set_inuse_and_pinuse(ms, p, dvs);
+      }
+      mem = chunk2mem(p);
+      check_malloced_chunk(ms, mem, nb);
+      goto postaction;
+    }
+    else if (nb < ms->topsize) { /* Split top */
+      size_t rsize = ms->topsize -= nb;
+      mchunkptr p = ms->top;
+      mchunkptr r = ms->top = chunk_plus_offset(p, nb);
+      r->head = rsize | PINUSE_BIT;
+      set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+      mem = chunk2mem(p);
+      check_top_chunk(ms, ms->top);
+      check_malloced_chunk(ms, mem, nb);
+      goto postaction;
+    }
+    mem = sys_alloc(ms, nb);
+  postaction:
+    POSTACTION(ms);
+    return mem;
+  }
+  return 0;
+}
+void mspace_free(mspace msp, void* mem) {
+  if (mem != 0) {
+    mchunkptr p  = mem2chunk(mem);
+#if FOOTERS
+    mstate fm = get_mstate_for(p);
+#else /* FOOTERS */
+    mstate fm = (mstate)msp;
+#endif /* FOOTERS */
+    if (!ok_magic(fm)) {
+      USAGE_ERROR_ACTION(fm, p);
+      return;
+    }
+    if (!PREACTION(fm)) {
+      check_inuse_chunk(fm, p);
+      if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
+        size_t psize = chunksize(p);
+        mchunkptr next = chunk_plus_offset(p, psize);
+        if (!pinuse(p)) {
+          size_t prevsize = p->prev_foot;
+          if ((prevsize & IS_MMAPPED_BIT) != 0) {
+            prevsize &= ~IS_MMAPPED_BIT;
+            psize += prevsize + MMAP_FOOT_PAD;
+            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
+              fm->footprint -= psize;
+            goto postaction;
+          }
+          else {
+            mchunkptr prev = chunk_minus_offset(p, prevsize);
+            psize += prevsize;
+            p = prev;
+            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
+              if (p != fm->dv) {
+                unlink_chunk(fm, p, prevsize);
+              }
+              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
+                fm->dvsize = psize;
+                set_free_with_pinuse(p, psize, next);
+                goto postaction;
+              }
+            }
+            else
+              goto erroraction;
+          }
+        }
+        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+          if (!cinuse(next)) {  /* consolidate forward */
+            if (next == fm->top) {
+              size_t tsize = fm->topsize += psize;
+              fm->top = p;
+              p->head = tsize | PINUSE_BIT;
+              if (p == fm->dv) {
+                fm->dv = 0;
+                fm->dvsize = 0;
+              }
+              if (should_trim(fm, tsize))
+                sys_trim(fm, 0);
+              goto postaction;
+            }
+            else if (next == fm->dv) {
+              size_t dsize = fm->dvsize += psize;
+              fm->dv = p;
+              set_size_and_pinuse_of_free_chunk(p, dsize);
+              goto postaction;
+            }
+            else {
+              size_t nsize = chunksize(next);
+              psize += nsize;
+              unlink_chunk(fm, next, nsize);
+              set_size_and_pinuse_of_free_chunk(p, psize);
+              if (p == fm->dv) {
+                fm->dvsize = psize;
+                goto postaction;
+              }
+            }
+          }
+          else
+            set_free_with_pinuse(p, psize, next);
+          insert_chunk(fm, p, psize);
+          check_free_chunk(fm, p);
+          goto postaction;
+        }
+      }
+    erroraction:
+      USAGE_ERROR_ACTION(fm, p);
+    postaction:
+      POSTACTION(fm);
+    }
+  }
+}
+void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) {
+  void* mem;
+  size_t req = 0;
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+    return 0;
+  }
+  if (n_elements != 0) {
+    req = n_elements * elem_size;
+    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
+        (req / n_elements != elem_size))
+      req = MAX_SIZE_T; /* force downstream failure on overflow */
+  }
+  mem = internal_malloc(ms, req);
+  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+    memset(mem, 0, req);
+  return mem;
+}
+void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) {
+  if (oldmem == 0)
+    return mspace_malloc(msp, bytes);
+#ifdef REALLOC_ZERO_BYTES_FREES
+  if (bytes == 0) {
+    mspace_free(msp, oldmem);
+    return 0;
+  }
+#endif /* REALLOC_ZERO_BYTES_FREES */
+  else {
+#if FOOTERS
+    mchunkptr p  = mem2chunk(oldmem);
+    mstate ms = get_mstate_for(p);
+#else /* FOOTERS */
+    mstate ms = (mstate)msp;
+#endif /* FOOTERS */
+    if (!ok_magic(ms)) {
+      USAGE_ERROR_ACTION(ms,ms);
+      return 0;
+    }
+    return internal_realloc(ms, oldmem, bytes);
+  }
+}
+void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) {
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+    return 0;
+  }
+  return internal_memalign(ms, alignment, bytes);
+}
+void** mspace_independent_calloc(mspace msp, size_t n_elements,
+                                 size_t elem_size, void* chunks[]) {
+  size_t sz = elem_size; /* serves as 1-element array */
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+    return 0;
+  }
+  return ialloc(ms, n_elements, &sz, 3, chunks);
+}
+void** mspace_independent_comalloc(mspace msp, size_t n_elements,
+                                   size_t sizes[], void* chunks[]) {
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+    return 0;
+  }
+  return ialloc(ms, n_elements, sizes, 0, chunks);
+}
+int mspace_trim(mspace msp, size_t pad) {
+  int result = 0;
+  mstate ms = (mstate)msp;
+  if (ok_magic(ms)) {
+    if (!PREACTION(ms)) {
+      result = sys_trim(ms, pad);
+      POSTACTION(ms);
+    }
+  }
+  else {
+    USAGE_ERROR_ACTION(ms,ms);
+  }
+  return result;
+}
+void mspace_malloc_stats(mspace msp) {
+  mstate ms = (mstate)msp;
+  if (ok_magic(ms)) {
+    internal_malloc_stats(ms);
+  }
+  else {
+    USAGE_ERROR_ACTION(ms,ms);
+  }
+}
+size_t mspace_footprint(mspace msp) {
+  size_t result;
+  mstate ms = (mstate)msp;
+  if (ok_magic(ms)) {
+    result = ms->footprint;
+  }
+  USAGE_ERROR_ACTION(ms,ms);
+  return result;
+}
+size_t mspace_max_footprint(mspace msp) {
+  size_t result;
+  mstate ms = (mstate)msp;
+  if (ok_magic(ms)) {
+    result = ms->max_footprint;
+  }
+  USAGE_ERROR_ACTION(ms,ms);
+  return result;
+}
+#if !NO_MALLINFO
+struct mallinfo mspace_mallinfo(mspace msp) {
+  mstate ms = (mstate)msp;
+  if (!ok_magic(ms)) {
+    USAGE_ERROR_ACTION(ms,ms);
+  }
+  return internal_mallinfo(ms);
+}
+#endif /* NO_MALLINFO */
+int mspace_mallopt(int param_number, int value) {
+  return change_mparam(param_number, value);
+}
+#endif /* MSPACES */
+/* -------------------- Alternative MORECORE functions ------------------- */
+/*
+  Guidelines for creating a custom version of MORECORE:
+  * For best performance, MORECORE should allocate in multiples of pagesize.
+  * MORECORE may allocate more memory than requested. (Or even less,
+      but this will usually result in a malloc failure.)
+  * MORECORE must not allocate memory when given argument zero, but
+      instead return one past the end address of memory from previous
+      nonzero call.
+  * For best performance, consecutive calls to MORECORE with positive
+      arguments should return increasing addresses, indicating that
+      space has been contiguously extended.
+  * Even though consecutive calls to MORECORE need not return contiguous
+      addresses, it must be OK for malloc'ed chunks to span multiple
+      regions in those cases where they do happen to be contiguous.
+  * MORECORE need not handle negative arguments -- it may instead
+      just return MFAIL when given negative arguments.
+      Negative arguments are always multiples of pagesize. MORECORE
+      must not misinterpret negative args as large positive unsigned
+      args. You can suppress all such calls from even occurring by defining
+      MORECORE_CANNOT_TRIM,
+  As an example alternative MORECORE, here is a custom allocator
+  kindly contributed for pre-OSX macOS.  It uses virtually but not
+  necessarily physically contiguous non-paged memory (locked in,
+  present and won't get swapped out).  You can use it by uncommenting
+  this section, adding some #includes, and setting up the appropriate
+  defines above:
+      #define MORECORE osMoreCore
+  There is also a shutdown routine that should somehow be called for
+  cleanup upon program exit.
+  #define MAX_POOL_ENTRIES 100
+  #define MINIMUM_MORECORE_SIZE  (64 * 1024U)
+  static int next_os_pool;
+  void *our_os_pools[MAX_POOL_ENTRIES];
+  void *osMoreCore(int size)
+  {
+    void *ptr = 0;
+    static void *sbrk_top = 0;
+    if (size > 0)
+    {
+      if (size < MINIMUM_MORECORE_SIZE)
+         size = MINIMUM_MORECORE_SIZE;
+      if (CurrentExecutionLevel() == kTaskLevel)
+         ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
+      if (ptr == 0)
+      {
+        return (void *) MFAIL;
+      }
+      // save ptrs so they can be freed during cleanup
+      our_os_pools[next_os_pool] = ptr;
+      next_os_pool++;
+      ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
+      sbrk_top = (char *) ptr + size;
+      return ptr;
+    }
+    else if (size < 0)
+    {
+      // we don't currently support shrink behavior
+      return (void *) MFAIL;
+    }
+    else
+    {
+      return sbrk_top;
+    }
+  }
+  // cleanup any allocated memory pools
+  // called as last thing before shutting down driver
+  void osCleanupMem(void)
+  {
+    void **ptr;
+    for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
+      if (*ptr)
+      {
+         PoolDeallocate(*ptr);
+         *ptr = 0;
+      }
+  }
+*/
+/* -----------------------------------------------------------------------
+History:
+    V2.8.3 Thu Sep 22 11:16:32 2005  Doug Lea  (dl at gee)
+      * Add max_footprint functions
+      * Ensure all appropriate literals are size_t
+      * Fix conditional compilation problem for some #define settings
+      * Avoid concatenating segments with the one provided
+        in create_mspace_with_base
+      * Rename some variables to avoid compiler shadowing warnings
+      * Use explicit lock initialization.
+      * Better handling of sbrk interference.
+      * Simplify and fix segment insertion, trimming and mspace_destroy
+      * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x
+      * Thanks especially to Dennis Flanagan for help on these.
+    V2.8.2 Sun Jun 12 16:01:10 2005  Doug Lea  (dl at gee)
+      * Fix memalign brace error.
+    V2.8.1 Wed Jun  8 16:11:46 2005  Doug Lea  (dl at gee)
+      * Fix improper #endif nesting in C++
+      * Add explicit casts needed for C++
+    V2.8.0 Mon May 30 14:09:02 2005  Doug Lea  (dl at gee)
+      * Use trees for large bins
+      * Support mspaces
+      * Use segments to unify sbrk-based and mmap-based system allocation,
+        removing need for emulation on most platforms without sbrk.
+      * Default safety checks
+      * Optional footer checks. Thanks to William Robertson for the idea.
+      * Internal code refactoring
+      * Incorporate suggestions and platform-specific changes.
+        Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas,
+        Aaron Bachmann,  Emery Berger, and others.
+      * Speed up non-fastbin processing enough to remove fastbins.
+      * Remove useless cfree() to avoid conflicts with other apps.
+      * Remove internal memcpy, memset. Compilers handle builtins better.
+      * Remove some options that no one ever used and rename others.
+    V2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
+      * Fix malloc_state bitmap array misdeclaration
+    V2.7.1 Thu Jul 25 10:58:03 2002  Doug Lea  (dl at gee)
+      * Allow tuning of FIRST_SORTED_BIN_SIZE
+      * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte.
+      * Better detection and support for non-contiguousness of MORECORE.
+        Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger
+      * Bypass most of malloc if no frees. Thanks To Emery Berger.
+      * Fix freeing of old top non-contiguous chunk im sysmalloc.
+      * Raised default trim and map thresholds to 256K.
+      * Fix mmap-related #defines. Thanks to Lubos Lunak.
+      * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield.
+      * Branch-free bin calculation
+      * Default trim and mmap thresholds now 256K.
+    V2.7.0 Sun Mar 11 14:14:06 2001  Doug Lea  (dl at gee)
+      * Introduce independent_comalloc and independent_calloc.
+        Thanks to Michael Pachos for motivation and help.
+      * Make optional .h file available
+      * Allow > 2GB requests on 32bit systems.
+      * new WIN32 sbrk, mmap, munmap, lock code from <Walter@GeNeSys-e.de>.
+        Thanks also to Andreas Mueller <a.mueller at paradatec.de>,
+        and Anonymous.
+      * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for
+        helping test this.)
+      * memalign: check alignment arg
+      * realloc: don't try to shift chunks backwards, since this
+        leads to  more fragmentation in some programs and doesn't
+        seem to help in any others.
+      * Collect all cases in malloc requiring system memory into sysmalloc
+      * Use mmap as backup to sbrk
+      * Place all internal state in malloc_state
+      * Introduce fastbins (although similar to 2.5.1)
+      * Many minor tunings and cosmetic improvements
+      * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK
+      * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS
+        Thanks to Tony E. Bennett <tbennett@nvidia.com> and others.
+      * Include errno.h to support default failure action.
+    V2.6.6 Sun Dec  5 07:42:19 1999  Doug Lea  (dl at gee)
+      * return null for negative arguments
+      * Added Several WIN32 cleanups from Martin C. Fong <mcfong at yahoo.com>
+         * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h'
+          (e.g. WIN32 platforms)
+         * Cleanup header file inclusion for WIN32 platforms
+         * Cleanup code to avoid Microsoft Visual C++ compiler complaints
+         * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing
+           memory allocation routines
+         * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
+         * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
+           usage of 'assert' in non-WIN32 code
+         * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
+           avoid infinite loop
+      * Always call 'fREe()' rather than 'free()'
+    V2.6.5 Wed Jun 17 15:57:31 1998  Doug Lea  (dl at gee)
+      * Fixed ordering problem with boundary-stamping
+    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
+      * Added pvalloc, as recommended by H.J. Liu
+      * Added 64bit pointer support mainly from Wolfram Gloger
+      * Added anonymously donated WIN32 sbrk emulation
+      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
+      * malloc_extend_top: fix mask error that caused wastage after
+        foreign sbrks
+      * Add linux mremap support code from HJ Liu
+    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
+      * Integrated most documentation with the code.
+      * Add support for mmap, with help from
+        Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
+      * Use last_remainder in more cases.
+      * Pack bins using idea from  colin@nyx10.cs.du.edu
+      * Use ordered bins instead of best-fit threshhold
+      * Eliminate block-local decls to simplify tracing and debugging.
+      * Support another case of realloc via move into top
+      * Fix error occuring when initial sbrk_base not word-aligned.
+      * Rely on page size for units instead of SBRK_UNIT to
+        avoid surprises about sbrk alignment conventions.
+      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
+        (raymond@es.ele.tue.nl) for the suggestion.
+      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
+      * More precautions for cases where other routines call sbrk,
+        courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
+      * Added macros etc., allowing use in linux libc from
+        H.J. Lu (hjl@gnu.ai.mit.edu)
+      * Inverted this history list
+    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
+      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
+      * Removed all preallocation code since under current scheme
+        the work required to undo bad preallocations exceeds
+        the work saved in good cases for most test programs.
+      * No longer use return list or unconsolidated bins since
+        no scheme using them consistently outperforms those that don't
+        given above changes.
+      * Use best fit for very large chunks to prevent some worst-cases.
+      * Added some support for debugging
+    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
+      * Removed footers when chunks are in use. Thanks to
+        Paul Wilson (wilson@cs.texas.edu) for the suggestion.
+    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
+      * Added malloc_trim, with help from Wolfram Gloger
+        (wmglo@Dent.MED.Uni-Muenchen.DE).
+    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
+    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
+      * realloc: try to expand in both directions
+      * malloc: swap order of clean-bin strategy;
+      * realloc: only conditionally expand backwards
+      * Try not to scavenge used bins
+      * Use bin counts as a guide to preallocation
+      * Occasionally bin return list chunks in first scan
+      * Add a few optimizations from colin@nyx10.cs.du.edu
+    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
+      * faster bin computation & slightly different binning
+      * merged all consolidations to one part of malloc proper
+         (eliminating old malloc_find_space & malloc_clean_bin)
+      * Scan 2 returns chunks (not just 1)
+      * Propagate failure in realloc if malloc returns 0
+      * Add stuff to allow compilation on non-ANSI compilers
+          from kpv@research.att.com
+    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
+      * removed potential for odd address access in prev_chunk
+      * removed dependency on getpagesize.h
+      * misc cosmetics and a bit more internal documentation
+      * anticosmetics: mangled names in macros to evade debugger strangeness
+      * tested on sparc, hp-700, dec-mips, rs6000
+          with gcc & native cc (hp, dec only) allowing
+          Detlefs & Zorn comparison study (in SIGPLAN Notices.)
+    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
+      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
+         structure of old version,  but most details differ.)
+*/
+/** @}
+ */

 /trunk/uspace/lib/libc/Makefile.toolchain
 ,27 → 26,16
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \
-    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-    -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
-    -Wmissing-prototypes -Werror-implicit-function-declaration -nostdlib \
-    -nostdinc -pipe -g -D__$(ENDIANESS)__
+DEFS = -DARCH=$(ARCH)
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =
+#-Werror
-## Cross-toolchain prefix
-#
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 ## Setup platform configuration
 #
--include $(LIBC_PREFIX)/../../../Makefile.config
--include $(LIBC_PREFIX)/../../../config.defs
--include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
+include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,7 → 59,6
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,7 → 68,6
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 77,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /trunk/uspace/lib/libfs/libfs.c
 ,5 → 1,5
 /*
- * Copyright (c) 2009 Jakub Jermar
+ * Copyright (c) 2007 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,10 → 40,6
 #include <async.h>
 #include <ipc/ipc.h>
 #include <as.h>
-#include <assert.h>
-#include <dirent.h>
-#include <mem.h>
-#include <sys/stat.h>
 /** Register file system server.
  *
 ,7 → 66,7
      * out-of-order, when it knows that the operation succeeded or failed.
      */
     ipc_call_t answer;
-    aid_t req = async_send_0(vfs_phone, VFS_IN_REGISTER, &answer);
+    aid_t req = async_send_0(vfs_phone, VFS_REGISTER, &answer);
     /*
      * Send our VFS info structure to VFS.
 ,7 → 101,7
     }
     /*
-     * Pick up the answer for the request to the VFS_IN_REQUEST call.
+     * Pick up the answer for the request to the VFS_REQUEST call.
      */
     async_wait_for(req, NULL);
     reg->fs_handle = (int) IPC_GET_ARG1(answer);
 ,367 → 120,5
     return IPC_GET_RETVAL(answer);
 }
-void fs_node_initialize(fs_node_t *fn)
-{
-    memset(fn, 0, sizeof(fs_node_t));
-}
-void libfs_mount(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
-    ipc_call_t *request)
-{
-    dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-    fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
-    fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request);
-    dev_handle_t mr_dev_handle = (dev_handle_t) IPC_GET_ARG4(*request);
-    int res;
-    ipcarg_t rc;
-    ipc_call_t call;
-    ipc_callid_t callid;
-    /* accept the phone */
-    callid = async_get_call(&call);
-    int mountee_phone = (int)IPC_GET_ARG1(call);
-    if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) ||
-        mountee_phone < 0) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    ipc_answer_0(callid, EOK);  /* acknowledge the mountee_phone */
-    res = ipc_data_write_receive(&callid, NULL);
-    if (!res) {
-        ipc_hangup(mountee_phone);
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    fs_node_t *fn = ops->node_get(mp_dev_handle, mp_fs_index);
-    if (!fn) {
-        ipc_hangup(mountee_phone);
-        ipc_answer_0(callid, ENOENT);
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    if (fn->mp_data.mp_active) {
-        ipc_hangup(mountee_phone);
-        ops->node_put(fn);
-        ipc_answer_0(callid, EBUSY);
-        ipc_answer_0(rid, EBUSY);
-        return;
-    }
-    rc = async_req_0_0(mountee_phone, IPC_M_CONNECT_ME);
-    if (rc != 0) {
-        ipc_hangup(mountee_phone);
-        ops->node_put(fn);
-        ipc_answer_0(callid, rc);
-        ipc_answer_0(rid, rc);
-        return;
-    }
-    ipc_call_t answer;
-    aid_t msg = async_send_1(mountee_phone, VFS_OUT_MOUNTED, mr_dev_handle,
-        &answer);
-    ipc_forward_fast(callid, mountee_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-    async_wait_for(msg, &rc);
-    if (rc == EOK) {
-        fn->mp_data.mp_active = true;
-        fn->mp_data.fs_handle = mr_fs_handle;
-        fn->mp_data.dev_handle = mr_dev_handle;
-        fn->mp_data.phone = mountee_phone;
-    }
-    /*
-     * Do not release the FS node so that it stays in memory.
-     */
-    ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
-        IPC_GET_ARG3(answer));
-}
-/** Lookup VFS triplet by name in the file system name space.
- *
- * The path passed in the PLB must be in the canonical file system path format
- * as returned by the canonify() function.
- *
- * @param ops       libfs operations structure with function pointers to
- *                  file system implementation
- * @param fs_handle File system handle of the file system where to perform
- *                  the lookup.
- * @param rid       Request ID of the VFS_OUT_LOOKUP request.
- * @param request   VFS_OUT_LOOKUP request data itself.
- *
- */
-void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
-    ipc_call_t *request)
-{
-    unsigned first = IPC_GET_ARG1(*request);
-    unsigned last = IPC_GET_ARG2(*request);
-    unsigned next = first;
-    dev_handle_t dev_handle = IPC_GET_ARG3(*request);
-    int lflag = IPC_GET_ARG4(*request);
-    fs_index_t index = IPC_GET_ARG5(*request); /* when L_LINK specified */
-    char component[NAME_MAX + 1];
-    int len;
-    if (last < next)
-        last += PLB_SIZE;
-    fs_node_t *par = NULL;
-    fs_node_t *cur = ops->root_get(dev_handle);
-    fs_node_t *tmp = NULL;
-    if (cur->mp_data.mp_active) {
-        ipc_forward_slow(rid, cur->mp_data.phone, VFS_OUT_LOOKUP,
-            next, last, cur->mp_data.dev_handle, lflag, index,
-            IPC_FF_ROUTE_FROM_ME);
-        ops->node_put(cur);
-        return;
-    }
-    if (ops->plb_get_char(next) == '/')
-        next++;     /* eat slash */
-    while (next <= last && ops->has_children(cur)) {
-        /* collect the component */
-        len = 0;
-        while ((next <= last) &&  (ops->plb_get_char(next) != '/')) {
-            if (len + 1 == NAME_MAX) {
-                /* component length overflow */
-                ipc_answer_0(rid, ENAMETOOLONG);
-                goto out;
-            }
-            component[len++] = ops->plb_get_char(next);
-            next++; /* process next character */
-        }
-        assert(len);
-        component[len] = '\0';
-        next++;     /* eat slash */
-        /* match the component */
-        tmp = ops->match(cur, component);
-        if (tmp && tmp->mp_data.mp_active) {
-            if (next > last)
-                next = last = first;
-            else
-                next--;
-            ipc_forward_slow(rid, tmp->mp_data.phone,
-                VFS_OUT_LOOKUP, next, last, tmp->mp_data.dev_handle,
-                lflag, index, IPC_FF_ROUTE_FROM_ME);
-            ops->node_put(cur);
-            ops->node_put(tmp);
-            if (par)
-                ops->node_put(par);
-            return;
-        }
-        /* handle miss: match amongst siblings */
-        if (!tmp) {
-            if (next <= last) {
-                /* there are unprocessed components */
-                ipc_answer_0(rid, ENOENT);
-                goto out;
-            }
-            /* miss in the last component */
-            if (lflag & (L_CREATE | L_LINK)) {
-                /* request to create a new link */
-                if (!ops->is_directory(cur)) {
-                    ipc_answer_0(rid, ENOTDIR);
-                    goto out;
-                }
-                fs_node_t *fn;
-                if (lflag & L_CREATE)
-                    fn = ops->create(dev_handle, lflag);
-                else
-                    fn = ops->node_get(dev_handle,
-                        index);
-                if (fn) {
-                    int rc;
-                    rc = ops->link(cur, fn, component);
-                    if (rc != EOK) {
-                        if (lflag & L_CREATE) {
-                            (void)ops->destroy(fn);
-                        }
-                        ipc_answer_0(rid, rc);
-                    } else {
-                        ipc_answer_5(rid, EOK,
-                            fs_handle, dev_handle,
-                            ops->index_get(fn),
-                            ops->size_get(fn),
-                            ops->lnkcnt_get(fn));
-                        ops->node_put(fn);
-                    }
-                } else {
-                    ipc_answer_0(rid, ENOSPC);
-                }
-                goto out;
-            }
-            ipc_answer_0(rid, ENOENT);
-            goto out;
-        }
-        if (par)
-            ops->node_put(par);
-        /* descend one level */
-        par = cur;
-        cur = tmp;
-        tmp = NULL;
-    }
-    /* handle miss: excessive components */
-    if (next <= last && !ops->has_children(cur)) {
-        if (lflag & (L_CREATE | L_LINK)) {
-            if (!ops->is_directory(cur)) {
-                ipc_answer_0(rid, ENOTDIR);
-                goto out;
-            }
-            /* collect next component */
-            len = 0;
-            while (next <= last) {
-                if (ops->plb_get_char(next) == '/') {
-                    /* more than one component */
-                    ipc_answer_0(rid, ENOENT);
-                    goto out;
-                }
-                if (len + 1 == NAME_MAX) {
-                    /* component length overflow */
-                    ipc_answer_0(rid, ENAMETOOLONG);
-                    goto out;
-                }
-                component[len++] = ops->plb_get_char(next);
-                next++; /* process next character */
-            }
-            assert(len);
-            component[len] = '\0';
-            fs_node_t *fn;
-            if (lflag & L_CREATE)
-                fn = ops->create(dev_handle, lflag);
-            else
-                fn = ops->node_get(dev_handle, index);
-            if (fn) {
-                int rc;
-                rc = ops->link(cur, fn, component);
-                if (rc != EOK) {
-                    if (lflag & L_CREATE)
-                        (void)ops->destroy(fn);
-                    ipc_answer_0(rid, rc);
-                } else {
-                    ipc_answer_5(rid, EOK,
-                        fs_handle, dev_handle,
-                        ops->index_get(fn),
-                        ops->size_get(fn),
-                        ops->lnkcnt_get(fn));
-                    ops->node_put(fn);
-                }
-            } else {
-                ipc_answer_0(rid, ENOSPC);
-            }
-            goto out;
-        }
-        ipc_answer_0(rid, ENOENT);
-        goto out;
-    }
-    /* handle hit */
-    if (lflag & L_UNLINK) {
-        unsigned old_lnkcnt = ops->lnkcnt_get(cur);
-        int res = ops->unlink(par, cur, component);
-        ipc_answer_5(rid, (ipcarg_t)res, fs_handle, dev_handle,
-            ops->index_get(cur), ops->size_get(cur), old_lnkcnt);
-        goto out;
-    }
-    if (((lflag & (L_CREATE | L_EXCLUSIVE)) == (L_CREATE | L_EXCLUSIVE)) ||
-        (lflag & L_LINK)) {
-        ipc_answer_0(rid, EEXIST);
-        goto out;
-    }
-    if ((lflag & L_FILE) && (ops->is_directory(cur))) {
-        ipc_answer_0(rid, EISDIR);
-        goto out;
-    }
-    if ((lflag & L_DIRECTORY) && (ops->is_file(cur))) {
-        ipc_answer_0(rid, ENOTDIR);
-        goto out;
-    }
-    ipc_answer_5(rid, EOK, fs_handle, dev_handle, ops->index_get(cur),
-        ops->size_get(cur), ops->lnkcnt_get(cur));
-out:
-    if (par)
-        ops->node_put(par);
-    if (cur)
-        ops->node_put(cur);
-    if (tmp)
-        ops->node_put(tmp);
-}
-void libfs_stat(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
-    ipc_call_t *request)
-{
-    dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-    fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-    fs_node_t *fn = ops->node_get(dev_handle, index);
-    ipc_callid_t callid;
-    size_t size;
-    if (!ipc_data_read_receive(&callid, &size) ||
-        size != sizeof(struct stat)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    struct stat stat;
-    memset(&stat, 0, sizeof(struct stat));
-    stat.fs_handle = fs_handle;
-    stat.dev_handle = dev_handle;
-    stat.index = index;
-    stat.lnkcnt = ops->lnkcnt_get(fn);
-    stat.is_file = ops->is_file(fn);
-    stat.size = ops->size_get(fn);
-    ipc_data_read_finalize(callid, &stat, sizeof(struct stat));
-    ipc_answer_0(rid, EOK);
-}
-/** Open VFS triplet.
- *
- * @param ops       libfs operations structure with function pointers to
- *                  file system implementation
- * @param rid       Request ID of the VFS_OUT_OPEN_NODE request.
- * @param request   VFS_OUT_OPEN_NODE request data itself.
- *
- */
-void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
-    ipc_call_t *request)
-{
-    dev_handle_t dev_handle = IPC_GET_ARG1(*request);
-    fs_index_t index = IPC_GET_ARG2(*request);
-    fs_node_t *node = ops->node_get(dev_handle, index);
-    if (node == NULL) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    ipc_answer_5(rid, EOK, fs_handle, dev_handle, index,
-        ops->size_get(node), ops->lnkcnt_get(node));
-    ops->node_put(node);
-}
 /** @}
  */

 /trunk/uspace/lib/libfs/libfs.h
 ,5 → 1,5
 /*
- * Copyright (c) 2009 Jakub Jermar
+ * Copyright (c) 2007 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,69 → 26,37
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libfs
+/** @addtogroup libfs
  * @{
- */
+ */
 /**
  * @file
  */
 #ifndef LIBFS_LIBFS_H_
-#define LIBFS_LIBFS_H_
+#define LIBFS_LIBFS_H_
-#include <ipc/vfs.h>
+#include "../../srv/vfs/vfs.h"
 #include <stdint.h>
 #include <ipc/ipc.h>
 #include <async.h>
-#include <devmap.h>
 typedef struct {
-    bool mp_active;
-    int phone;
-    fs_handle_t fs_handle;
-    dev_handle_t dev_handle;
-} mp_data_t;
-typedef struct {
-    mp_data_t mp_data;  /**< Mount point info. */
-    void *data;         /**< Data of the file system implementation. */
-} fs_node_t;
-typedef struct {
-    fs_node_t * (* match)(fs_node_t *, const char *);
-    fs_node_t * (* node_get)(dev_handle_t, fs_index_t);
-    void (* node_put)(fs_node_t *);
-    fs_node_t * (* create)(dev_handle_t, int);
-    int (* destroy)(fs_node_t *);
-    int (* link)(fs_node_t *, fs_node_t *, const char *);
-    int (* unlink)(fs_node_t *, fs_node_t *, const char *);
-    fs_index_t (* index_get)(fs_node_t *);
-    size_t (* size_get)(fs_node_t *);
-    unsigned (* lnkcnt_get)(fs_node_t *);
-    bool (* has_children)(fs_node_t *);
-    fs_node_t *(* root_get)(dev_handle_t);
-    char (* plb_get_char)(unsigned pos);
-    bool (* is_directory)(fs_node_t *);
-    bool (* is_file)(fs_node_t *);
-} libfs_ops_t;
-typedef struct {
-    int fs_handle;           /**< File system handle. */
-    ipcarg_t vfs_phonehash;  /**< Initial VFS phonehash. */
-    uint8_t *plb_ro;         /**< Read-only PLB view. */
+    int fs_handle;      /**< File system handle. */
+    ipcarg_t vfs_phonehash; /**< Initial VFS phonehash. */
+    uint8_t *plb_ro;    /**< Read-only PLB view. */
 } fs_reg_t;
 extern int fs_register(int, fs_reg_t *, vfs_info_t *, async_client_conn_t);
-extern void fs_node_initialize(fs_node_t *);
+extern int block_read(int, unsigned long, void *);
+extern int block_write(int, unsigned long, void *);
-extern void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
-    ipc_call_t *);
+extern void node_add_mp(int, unsigned long);
+extern void node_del_mp(int, unsigned long);
+extern bool node_is_mp(int, unsigned long);
 #endif
 /** @}
  */

 /trunk/uspace/lib/libfs/Makefile
 ,7 → 31,6
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 57,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 libfs.a: depend $(OBJECTS)
     $(AR) rc libfs.a $(OBJECTS)

 /trunk/uspace/lib/softfloat/arch/ppc64/include/functions.h
 ,0 → 1,76
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ /** @addtogroup softfloatppc64 ppc64
+ * @ingroup sfl
+ * @brief softfloat architecture dependent definitions
+ * @{
+ */
+/** @file
+ */
+#ifndef __SOFTFLOAT_FUNCTIONS_H__
+#define __SOFTFLOAT_FUNCTIONS_H__
+#define float32_to_int(X) float32_to_int32(X);
+#define float32_to_long(X) float32_to_int64(X);
+#define float32_to_longlong(X) float32_to_int64(X);
+#define float64_to_int(X) float64_to_int32(X);
+#define float64_to_long(X) float64_to_int64(X);
+#define float64_to_longlong(X) float64_to_int64(X);
+#define float32_to_uint(X) float32_to_uint32(X);
+#define float32_to_ulong(X) float32_to_uint64(X);
+#define float32_to_ulonglong(X) float32_to_uint64(X);
+#define float64_to_uint(X) float64_to_uint32(X);
+#define float64_to_ulong(X) float64_to_uint64(X);
+#define float64_to_ulonglong(X) float64_to_uint64(X);
+#define int_to_float32(X) int32_to_float32(X);
+#define long_to_float32(X) int64_to_float32(X);
+#define longlong_to_float32(X) int64_to_float32(X);
+#define int_to_float64(X) int32_to_float64(X);
+#define long_to_float64(X) int64_to_float64(X);
+#define longlong_to_float64(X) int64_to_float64(X);
+#define uint_to_float32(X) uint32_to_float32(X);
+#define ulong_to_float32(X) uint64_to_float32(X);
+#define ulonglong_to_float32(X) uint64_to_float32(X);
+#define uint_to_float64(X) uint32_to_float64(X);
+#define ulong_to_float64(X) uint64_to_float64(X);
+#define ulonglong_to_float64(X) uint64_to_float64(X);
+#endif
+ /** @}
+ */

 /trunk/uspace/lib/softfloat/include/sftypes.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup softfloat
+ /** @addtogroup softfloat
  * @{
  */
 /** @file
 ,46 → 35,46
 #ifndef __SFTYPES_H__
 #define __SFTYPES_H__
-#include <byteorder.h>
+#include <endian.h>
 #include <stdint.h>
 typedef union {
     float f;
     uint32_t binary;
+    struct  {
+        #if __BYTE_ORDER == __BIG_ENDIAN
+        uint32_t sign:1;
+        uint32_t exp:8;
+        uint32_t fraction:23;
+        #elif __BYTE_ORDER == __LITTLE_ENDIAN
+        uint32_t fraction:23;
+        uint32_t exp:8;
+        uint32_t sign:1;
+        #else
+            #error "Unknown endians."
+        #endif
+        } parts __attribute__ ((packed));
+    } float32;
-    struct {
-#if defined(__BE__)
-        uint32_t sign : 1;
-        uint32_t exp : 8;
-        uint32_t fraction : 23;
-#elif defined(__LE__)
-        uint32_t fraction : 23;
-        uint32_t exp : 8;
-        uint32_t sign : 1;
-#else
-    #error Unknown endianess
-#endif
-        } parts __attribute__ ((packed));
-} float32;
 typedef union {
     double d;
     uint64_t binary;
-    struct {
-#if defined(__BE__)
-        uint64_t sign : 1;
-        uint64_t exp : 11;
-        uint64_t fraction : 52;
-#elif defined(__LE__)
-        uint64_t fraction : 52;
-        uint64_t exp : 11;
-        uint64_t sign : 1;
-#else
-    #error Unknown endianess
-#endif
-    } parts __attribute__ ((packed));
-} float64;
+    struct  {
+        #if __BYTE_ORDER == __BIG_ENDIAN
+        uint64_t sign:1;
+        uint64_t exp:11;
+        uint64_t fraction:52;
+        #elif __BYTE_ORDER == __LITTLE_ENDIAN
+        uint64_t fraction:52;
+        uint64_t exp:11;
+        uint64_t sign:1;
+        #else
+            #error "Unknown endians."
+        #endif
+        } parts __attribute__ ((packed));
+    } float64;
 #define FLOAT32_MAX 0x7f800000
 #define FLOAT32_MIN 0xff800000
 ,10 → 81,7
 #define FLOAT64_MAX
 #define FLOAT64_MIN
-/*
- * For recognizing NaNs or infinity use isFloat32NaN and is Float32Inf,
- * comparing with these constants is not sufficient.
- */
+/* For recognizing NaNs or infinity use isFloat32NaN and is Float32Inf, comparing with this constants is not sufficient */
 #define FLOAT32_NAN 0x7FC00001
 #define FLOAT32_SIGNAN 0x7F800001
 #define FLOAT32_INF 0x7F800000
 ,5 → 106,7
 #endif
-/** @}
+ /** @}
  */

 /trunk/uspace/lib/softfloat/Makefile
 ,26 → 30,25
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
 ## Sources
 #
-GENERIC_SOURCES = \
-    generic/add.c \
-    generic/common.c \
-    generic/comparison.c \
-    generic/conversion.c \
-    generic/div.c \
-    generic/mul.c \
-    generic/other.c \
-    generic/softfloat.c \
+GENERIC_SOURCES =       \
+    generic/add.c       \
+    generic/common.c    \
+    generic/comparison.c    \
+    generic/conversion.c    \
+    generic/div.c       \
+    generic/mul.c       \
+    generic/other.c     \
+    generic/softfloat.c \
     generic/sub.c
 ARCH_SOURCES =
 ,7 → 66,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /trunk/uspace/lib/softint/Makefile
 ,7 → 30,6
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

/trunk/uspace/app/bdsh/cmds/mknewcmd
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /trunk/uspace/app/ash/tools/mksyntax.c
 ,0 → 1,428
+/*  $NetBSD: mksyntax.c,v 1.23 2000/07/18 19:13:21 cgd Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef lint
+static const char copyright[] =
+    "@(#) Copyright (c) 1991, 1993\n\
+    The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)mksyntax.c  8.2 (Berkeley) 5/4/95";
+#else
+static const char rcsid[] =
+    "$NetBSD: mksyntax.c,v 1.23 2000/07/18 19:13:21 cgd Exp $";
+#endif
+#endif /* not lint */
+/*
+ * This program creates syntax.h and syntax.c.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include "../parser.h"
+struct synclass {
+    char *name;
+    char *comment;
+};
+/* Syntax classes */
+struct synclass synclass[] = {
+    { "CWORD",  "character is nothing special" },
+    { "CNL",    "newline character" },
+    { "CBACK",  "a backslash character" },
+    { "CSQUOTE",    "single quote" },
+    { "CDQUOTE",    "double quote" },
+    { "CENDQUOTE",  "a terminating quote" },
+    { "CBQUOTE",    "backwards single quote" },
+    { "CVAR",   "a dollar sign" },
+    { "CENDVAR",    "a '}' character" },
+    { "CLP",    "a left paren in arithmetic" },
+    { "CRP",    "a right paren in arithmetic" },
+    { "CEOF",   "end of file" },
+    { "CCTL",   "like CWORD, except it must be escaped" },
+    { "CSPCL",  "these terminate a word" },
+    { NULL,     NULL }
+};
+/*
+ * Syntax classes for is_ functions.  Warning:  if you add new classes
+ * you may have to change the definition of the is_in_name macro.
+ */
+struct synclass is_entry[] = {
+    { "ISDIGIT",    "a digit" },
+    { "ISUPPER",    "an upper case letter" },
+    { "ISLOWER",    "a lower case letter" },
+    { "ISUNDER",    "an underscore" },
+    { "ISSPECL",    "the name of a special parameter" },
+    { NULL,     NULL }
+};
+static char writer[] = "\
+/*\n\
+ * This file was generated by the mksyntax program.\n\
+ */\n\
+\n";
+static FILE *cfile;
+static FILE *hfile;
+static char *syntax[513];
+static int base;
+static int size;    /* number of values which a char variable can have */
+static int nbits;   /* number of bits in a character */
+static int digit_contig;/* true if digits are contiguous */
+static void filltable(char *);
+static void init(void);
+static void add(char *, char *);
+static void print(char *);
+static void output_type_macros(void);
+static void digit_convert(void);
+int main(int, char **);
+int
+main(argc, argv)
+    int argc;
+    char **argv;
+{
+#ifdef  TARGET_CHAR
+    TARGET_CHAR c;
+    TARGET_CHAR d;
+#else
+    char c;
+    char d;
+#endif
+    int sign;
+    int i;
+    char buf[80];
+    int pos;
+    static char digit[] = "0123456789";
+    /* Create output files */
+    if ((cfile = fopen("syntax.c", "w")) == NULL) {
+        perror("syntax.c");
+        exit(2);
+    }
+    if ((hfile = fopen("syntax.h", "w")) == NULL) {
+        perror("syntax.h");
+        exit(2);
+    }
+    fputs(writer, hfile);
+    fputs(writer, cfile);
+    /* Determine the characteristics of chars. */
+    c = -1;
+    if (c <= 0)
+        sign = 1;
+    else
+        sign = 0;
+    for (nbits = 1 ; ; nbits++) {
+        d = (1 << nbits) - 1;
+        if (d == c)
+            break;
+    }
+    printf("%s %d bit chars\n", sign? "signed" : "unsigned", nbits);
+    if (nbits > 9) {
+        fputs("Characters can't have more than 9 bits\n", stderr);
+        exit(2);
+    }
+    size = (1 << nbits) + 1;
+    base = 1;
+    if (sign)
+        base += 1 << (nbits - 1);
+    digit_contig = 1;
+    for (i = 0 ; i < 10 ; i++) {
+        if (digit[i] != '0' + i)
+            digit_contig = 0;
+    }
+    fputs("#include <sys/cdefs.h>\n", hfile);
+    fputs("#include <ctype.h>\n", hfile);
+    /* Generate the #define statements in the header file */
+    fputs("/* Syntax classes */\n", hfile);
+    for (i = 0 ; synclass[i].name ; i++) {
+        sprintf(buf, "#define %s %d", synclass[i].name, i);
+        fputs(buf, hfile);
+        for (pos = strlen(buf) ; pos < 32 ; pos = (pos + 8) & ~07)
+            putc('\t', hfile);
+        fprintf(hfile, "/* %s */\n", synclass[i].comment);
+    }
+    putc('\n', hfile);
+    fputs("/* Syntax classes for is_ functions */\n", hfile);
+    for (i = 0 ; is_entry[i].name ; i++) {
+        sprintf(buf, "#define %s %#o", is_entry[i].name, 1 << i);
+        fputs(buf, hfile);
+        for (pos = strlen(buf) ; pos < 32 ; pos = (pos + 8) & ~07)
+            putc('\t', hfile);
+        fprintf(hfile, "/* %s */\n", is_entry[i].comment);
+    }
+    putc('\n', hfile);
+    fprintf(hfile, "#define SYNBASE %d\n", base);
+    fprintf(hfile, "#define PEOF %d\n\n", -base);
+    if (sign)
+        fprintf(hfile, "#define UPEOF %d\n\n", -base);
+    else
+        fprintf(hfile, "#define UPEOF ((unsigned char) %d)\n\n", -base);
+    putc('\n', hfile);
+    fputs("#define BASESYNTAX (basesyntax + SYNBASE)\n", hfile);
+    fputs("#define DQSYNTAX (dqsyntax + SYNBASE)\n", hfile);
+    fputs("#define SQSYNTAX (sqsyntax + SYNBASE)\n", hfile);
+    fputs("#define ARISYNTAX (arisyntax + SYNBASE)\n", hfile);
+    putc('\n', hfile);
+    output_type_macros();       /* is_digit, etc. */
+    putc('\n', hfile);
+    /* Generate the syntax tables. */
+    fputs("#include \"shell.h\"\n", cfile);
+    fputs("#include \"syntax.h\"\n\n", cfile);
+    init();
+    fputs("/* syntax table used when not in quotes */\n", cfile);
+    add("\n", "CNL");
+    add("\\", "CBACK");
+    add("'", "CSQUOTE");
+    add("\"", "CDQUOTE");
+    add("`", "CBQUOTE");
+    add("$", "CVAR");
+    add("}", "CENDVAR");
+    add("<>();&| \t", "CSPCL");
+    print("basesyntax");
+    init();
+    fputs("\n/* syntax table used when in double quotes */\n", cfile);
+    add("\n", "CNL");
+    add("\\", "CBACK");
+    add("\"", "CENDQUOTE");
+    add("`", "CBQUOTE");
+    add("$", "CVAR");
+    add("}", "CENDVAR");
+    /* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
+    add("!*?[=~:/-]", "CCTL");
+    print("dqsyntax");
+    init();
+    fputs("\n/* syntax table used when in single quotes */\n", cfile);
+    add("\n", "CNL");
+    add("'", "CENDQUOTE");
+    /* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
+    add("!*?[=~:/-]\\", "CCTL");
+    print("sqsyntax");
+    init();
+    fputs("\n/* syntax table used when in arithmetic */\n", cfile);
+    add("\n", "CNL");
+    add("\\", "CBACK");
+    add("`", "CBQUOTE");
+    add("'", "CSQUOTE");
+    add("\"", "CDQUOTE");
+    add("$", "CVAR");
+    add("}", "CENDVAR");
+    add("(", "CLP");
+    add(")", "CRP");
+    print("arisyntax");
+    filltable("0");
+    fputs("\n/* character classification table */\n", cfile);
+    add("0123456789", "ISDIGIT");
+    add("abcdefghijklmnopqrstucvwxyz", "ISLOWER");
+    add("ABCDEFGHIJKLMNOPQRSTUCVWXYZ", "ISUPPER");
+    add("_", "ISUNDER");
+    add("#?$!-*@", "ISSPECL");
+    print("is_type");
+    if (! digit_contig)
+        digit_convert();
+    exit(0);
+    /* NOTREACHED */
+}
+/*
+ * Clear the syntax table.
+ */
+static void
+filltable(dftval)
+    char *dftval;
+{
+    int i;
+    for (i = 0 ; i < size ; i++)
+        syntax[i] = dftval;
+}
+/*
+ * Initialize the syntax table with default values.
+ */
+static void
+init()
+{
+    filltable("CWORD");
+    syntax[0] = "CEOF";
+#ifdef TARGET_CHAR
+    syntax[base + (TARGET_CHAR)CTLESC] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLVAR] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLENDVAR] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLBACKQ] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLBACKQ + (TARGET_CHAR)CTLQUOTE] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLARI] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLENDARI] = "CCTL";
+    syntax[base + (TARGET_CHAR)CTLQUOTEMARK] = "CCTL";
+#else
+    syntax[base + CTLESC] = "CCTL";
+    syntax[base + CTLVAR] = "CCTL";
+    syntax[base + CTLENDVAR] = "CCTL";
+    syntax[base + CTLBACKQ] = "CCTL";
+    syntax[base + CTLBACKQ + CTLQUOTE] = "CCTL";
+    syntax[base + CTLARI] = "CCTL";
+    syntax[base + CTLENDARI] = "CCTL";
+    syntax[base + CTLQUOTEMARK] = "CCTL";
+#endif /* TARGET_CHAR */
+}
+/*
+ * Add entries to the syntax table.
+ */
+static void
+add(p, type)
+    char *p, *type;
+{
+    while (*p)
+        syntax[*p++ + base] = type;
+}
+/*
+ * Output the syntax table.
+ */
+static void
+print(name)
+    char *name;
+{
+    int i;
+    int col;
+    fprintf(hfile, "extern const char %s[];\n", name);
+    fprintf(cfile, "const char %s[%d] = {\n", name, size);
+    col = 0;
+    for (i = 0 ; i < size ; i++) {
+        if (i == 0) {
+            fputs("      ", cfile);
+        } else if ((i & 03) == 0) {
+            fputs(",\n      ", cfile);
+            col = 0;
+        } else {
+            putc(',', cfile);
+            while (++col < 9 * (i & 03))
+                putc(' ', cfile);
+        }
+        fputs(syntax[i], cfile);
+        col += strlen(syntax[i]);
+    }
+    fputs("\n};\n", cfile);
+}
+/*
+ * Output character classification macros (e.g. is_digit).  If digits are
+ * contiguous, we can test for them quickly.
+ */
+static char *macro[] = {
+    "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)",
+    "#define is_alpha(c)\t((c) != UPEOF && ((c) < CTLESC || (c) > CTLENDARI) && isalpha((unsigned char) (c)))",
+    "#define is_name(c)\t((c) != UPEOF && ((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalpha((unsigned char) (c))))",
+    "#define is_in_name(c)\t((c) != UPEOF && ((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalnum((unsigned char) (c))))",
+    "#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))",
+    NULL
+};
+static void
+output_type_macros()
+{
+    char **pp;
+    if (digit_contig)
+        macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
+    for (pp = macro ; *pp ; pp++)
+        fprintf(hfile, "%s\n", *pp);
+    if (digit_contig)
+        fputs("#define digit_val(c)\t((c) - '0')\n", hfile);
+    else
+        fputs("#define digit_val(c)\t(digit_value[c])\n", hfile);
+}
+/*
+ * Output digit conversion table (if digits are not contiguous).
+ */
+static void
+digit_convert()
+{
+    int maxdigit;
+    static char digit[] = "0123456789";
+    char *p;
+    int i;
+    maxdigit = 0;
+    for (p = digit ; *p ; p++)
+        if (*p > maxdigit)
+            maxdigit = *p;
+    fputs("extern const char digit_value[];\n", hfile);
+    fputs("\n\nconst char digit_value[] = {\n", cfile);
+    for (i = 0 ; i <= maxdigit ; i++) {
+        for (p = digit ; *p && *p != i ; p++);
+        if (*p == '\0')
+            p = digit;
+        fprintf(cfile, "      %ld,\n", (long)(p - digit));
+    }
+    fputs("};\n", cfile);
+}

 /trunk/uspace/app/ash/tools/Makefile
 ,0 → 1,56
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+SOURCES = \
+    mkinit.c \
+    mknodes.c \
+    mksyntax.c \
+    mksignames.c
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+OUTPUT := $(addprefix ../,$(basename $(SOURCES)))
+.PHONY: all clean move-output
+all: $(OUTPUT)
+$(OUTPUT): $(OBJECTS)
+    $(CC) $< $(LFLAGS) -o $@
+clean:
+    -rm -f $(OUTPUT) $(OBJECTS)
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /trunk/uspace/app/ash/tools/mksignames.c
 ,0 → 1,400
+/* signames.c -- Create and write `signames.c', which contains an array of
+   signal names. */
+/* Copyright (C) 1992 Free Software Foundation, Inc.
+   This file is part of GNU Bash, the Bourne Again SHell.
+   Bash is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2, or (at your option) any later
+   version.
+   Bash is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+   You should have received a copy of the GNU General Public License along
+   with Bash; see the file COPYING.  If not, write to the Free Software
+   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#include <stdio.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <stdlib.h>
+#if !defined (NSIG)
+#  define NSIG 64
+#endif
+char *signal_names[2 * NSIG];
+char *progname;
+#if defined (SIGRTMAX) || defined (SIGRTMIN)
+#  define RTLEN 14
+#  define RTLIM 256
+#endif
+void
+initialize_signames ()
+{
+  register int i;
+#if defined (SIGRTMAX) || defined (SIGRTMIN)
+  int rtmin, rtmax, rtcnt;
+#endif
+  for (i = 1; i < sizeof(signal_names)/sizeof(signal_names[0]); i++)
+    signal_names[i] = (char *)NULL;
+  /* `signal' 0 is what we do on exit. */
+  signal_names[0] = "EXIT";
+  /* Place signal names which can be aliases for more common signal
+     names first.  This allows (for example) SIGABRT to overwrite SIGLOST. */
+  /* POSIX 1003.1b-1993 real time signals, but take care of incomplete
+     implementations. Acoording to the standard, both, SIGRTMIN and
+     SIGRTMAX must be defined, SIGRTMIN must be stricly less than
+     SIGRTMAX, and the difference must be at least 7, that is, there
+     must be at least eight distinct real time signals. */
+  /* The generated signal names are SIGRTMIN, SIGRTMIN+1, ...,
+     SIGRTMIN+x, SIGRTMAX-x, ..., SIGRTMAX-1, SIGRTMAX. If the number
+     of RT signals is odd, there is an extra SIGRTMIN+(x+1).
+     These names are the ones used by ksh and /usr/xpg4/bin/sh on SunOS5. */
+#if defined (SIGRTMIN)
+  rtmin = SIGRTMIN;
+  signal_names[rtmin] = "SIGRTMIN";
+#endif
+#if defined (SIGRTMAX)
+  rtmax = SIGRTMAX;
+  signal_names[rtmax] = "SIGRTMAX";
+#endif
+#if defined (SIGRTMAX) && defined (SIGRTMIN)
+  if (rtmax > rtmin)
+    {
+      rtcnt = (rtmax - rtmin - 1) / 2;
+      /* croak if there are too many RT signals */
+      if (rtcnt >= RTLIM/2)
+    {
+      rtcnt = RTLIM/2-1;
+      fprintf(stderr, "%s: error: more than %i real time signals, fix `%s'\n",
+          progname, RTLIM, progname);
+    }
+      for (i = 1; i <= rtcnt; i++)
+    {
+      signal_names[rtmin+i] = (char *)malloc(RTLEN);
+      sprintf (signal_names[rtmin+i], "SIGRTMIN+%d", i);
+      signal_names[rtmax-i] = (char *)malloc(RTLEN);
+      sprintf (signal_names[rtmax-i], "SIGRTMAX-%d", i);
+    }
+      if (rtcnt < RTLIM/2-1 && rtcnt != (rtmax-rtmin)/2)
+    {
+      /* Need an extra RTMIN signal */
+      signal_names[rtmin+rtcnt+1] = (char *)malloc(RTLEN);
+      sprintf (signal_names[rtmin+rtcnt+1], "SIGRTMIN+%d", rtcnt+1);
+    }
+    }
+#endif /* SIGRTMIN && SIGRTMAX */
+/* AIX */
+#if defined (SIGLOST)   /* resource lost (eg, record-lock lost) */
+  signal_names[SIGLOST] = "SIGLOST";
+#endif
+#if defined (SIGMSG)    /* HFT input data pending */
+  signal_names[SIGMSG] = "SIGMSG";
+#endif
+#if defined (SIGDANGER) /* system crash imminent */
+  signal_names[SIGDANGER] = "SIGDANGER";
+#endif
+#if defined (SIGMIGRATE) /* migrate process to another CPU */
+  signal_names[SIGMIGRATE] = "SIGMIGRATE";
+#endif
+#if defined (SIGPRE)    /* programming error */
+  signal_names[SIGPRE] = "SIGPRE";
+#endif
+#if defined (SIGVIRT)   /* AIX virtual time alarm */
+  signal_names[SIGVIRT] = "SIGVIRT";
+#endif
+#if defined (SIGALRM1)  /* m:n condition variables */
+  signal_names[SIGALRM1] = "SIGALRM1";
+#endif
+#if defined (SIGWAITING)    /* m:n scheduling */
+  signal_names[SIGWAITING] = "SIGWAITING";
+#endif
+#if defined (SIGGRANT)  /* HFT monitor mode granted */
+  signal_names[SIGGRANT] = "SIGGRANT";
+#endif
+#if defined (SIGKAP)    /* keep alive poll from native keyboard */
+  signal_names[SIGKAP] = "SIGKAP";
+#endif
+#if defined (SIGRETRACT) /* HFT monitor mode retracted */
+  signal_names[SIGRETRACT] = "SIGRETRACT";
+#endif
+#if defined (SIGSOUND)  /* HFT sound sequence has completed */
+  signal_names[SIGSOUND] = "SIGSOUND";
+#endif
+#if defined (SIGSAK)    /* Secure Attention Key */
+  signal_names[SIGSAK] = "SIGSAK";
+#endif
+/* SunOS5 */
+#if defined (SIGLWP)    /* special signal used by thread library */
+  signal_names[SIGLWP] = "SIGLWP";
+#endif
+#if defined (SIGFREEZE) /* special signal used by CPR */
+  signal_names[SIGFREEZE] = "SIGFREEZE";
+#endif
+#if defined (SIGTHAW)   /* special signal used by CPR */
+  signal_names[SIGTHAW] = "SIGTHAW";
+#endif
+#if defined (SIGCANCEL) /* thread cancellation signal used by libthread */
+  signal_names[SIGCANCEL] = "SIGCANCEL";
+#endif
+/* HP-UX */
+#if defined (SIGDIL)    /* DIL signal (?) */
+  signal_names[SIGDIL] = "SIGDIL";
+#endif
+/* System V */
+#if defined (SIGCLD)    /* Like SIGCHLD.  */
+  signal_names[SIGCLD] = "SIGCLD";
+#endif
+#if defined (SIGPWR)    /* power state indication */
+  signal_names[SIGPWR] = "SIGPWR";
+#endif
+#if defined (SIGPOLL)   /* Pollable event (for streams)  */
+  signal_names[SIGPOLL] = "SIGPOLL";
+#endif
+/* Unknown */
+#if defined (SIGWINDOW)
+  signal_names[SIGWINDOW] = "SIGWINDOW";
+#endif
+/* Common */
+#if defined (SIGHUP)    /* hangup */
+  signal_names[SIGHUP] = "SIGHUP";
+#endif
+#if defined (SIGINT)    /* interrupt */
+  signal_names[SIGINT] = "SIGINT";
+#endif
+#if defined (SIGQUIT)   /* quit */
+  signal_names[SIGQUIT] = "SIGQUIT";
+#endif
+#if defined (SIGILL)    /* illegal instruction (not reset when caught) */
+  signal_names[SIGILL] = "SIGILL";
+#endif
+#if defined (SIGTRAP)   /* trace trap (not reset when caught) */
+  signal_names[SIGTRAP] = "SIGTRAP";
+#endif
+#if defined (SIGIOT)    /* IOT instruction */
+  signal_names[SIGIOT] = "SIGIOT";
+#endif
+#if defined (SIGABRT)   /* Cause current process to dump core. */
+  signal_names[SIGABRT] = "SIGABRT";
+#endif
+#if defined (SIGEMT)    /* EMT instruction */
+  signal_names[SIGEMT] = "SIGEMT";
+#endif
+#if defined (SIGFPE)    /* floating point exception */
+  signal_names[SIGFPE] = "SIGFPE";
+#endif
+#if defined (SIGKILL)   /* kill (cannot be caught or ignored) */
+  signal_names[SIGKILL] = "SIGKILL";
+#endif
+#if defined (SIGBUS)    /* bus error */
+  signal_names[SIGBUS] = "SIGBUS";
+#endif
+#if defined (SIGSEGV)   /* segmentation violation */
+  signal_names[SIGSEGV] = "SIGSEGV";
+#endif
+#if defined (SIGSYS)    /* bad argument to system call */
+  signal_names[SIGSYS] = "SIGSYS";
+#endif
+#if defined (SIGPIPE)   /* write on a pipe with no one to read it */
+  signal_names[SIGPIPE] = "SIGPIPE";
+#endif
+#if defined (SIGALRM)   /* alarm clock */
+  signal_names[SIGALRM] = "SIGALRM";
+#endif
+#if defined (SIGTERM)   /* software termination signal from kill */
+  signal_names[SIGTERM] = "SIGTERM";
+#endif
+#if defined (SIGURG)    /* urgent condition on IO channel */
+  signal_names[SIGURG] = "SIGURG";
+#endif
+#if defined (SIGSTOP)   /* sendable stop signal not from tty */
+  signal_names[SIGSTOP] = "SIGSTOP";
+#endif
+#if defined (SIGTSTP)   /* stop signal from tty */
+  signal_names[SIGTSTP] = "SIGTSTP";
+#endif
+#if defined (SIGCONT)   /* continue a stopped process */
+  signal_names[SIGCONT] = "SIGCONT";
+#endif
+#if defined (SIGCHLD)   /* to parent on child stop or exit */
+  signal_names[SIGCHLD] = "SIGCHLD";
+#endif
+#if defined (SIGTTIN)   /* to readers pgrp upon background tty read */
+  signal_names[SIGTTIN] = "SIGTTIN";
+#endif
+#if defined (SIGTTOU)   /* like TTIN for output if (tp->t_local&LTOSTOP) */
+  signal_names[SIGTTOU] = "SIGTTOU";
+#endif
+#if defined (SIGIO) /* input/output possible signal */
+  signal_names[SIGIO] = "SIGIO";
+#endif
+#if defined (SIGXCPU)   /* exceeded CPU time limit */
+  signal_names[SIGXCPU] = "SIGXCPU";
+#endif
+#if defined (SIGXFSZ)   /* exceeded file size limit */
+  signal_names[SIGXFSZ] = "SIGXFSZ";
+#endif
+#if defined (SIGVTALRM) /* virtual time alarm */
+  signal_names[SIGVTALRM] = "SIGVTALRM";
+#endif
+#if defined (SIGPROF)   /* profiling time alarm */
+  signal_names[SIGPROF] = "SIGPROF";
+#endif
+#if defined (SIGWINCH)  /* window changed */
+  signal_names[SIGWINCH] = "SIGWINCH";
+#endif
+/* 4.4 BSD */
+#if defined (SIGINFO) && !defined (_SEQUENT_)   /* information request */
+  signal_names[SIGINFO] = "SIGINFO";
+#endif
+#if defined (SIGUSR1)   /* user defined signal 1 */
+  signal_names[SIGUSR1] = "SIGUSR1";
+#endif
+#if defined (SIGUSR2)   /* user defined signal 2 */
+  signal_names[SIGUSR2] = "SIGUSR2";
+#endif
+#if defined (SIGKILLTHR)    /* BeOS: Kill Thread */
+  signal_names[SIGKILLTHR] = "SIGKILLTHR";
+#endif
+  for (i = 0; i < NSIG; i++)
+    if (signal_names[i] == (char *)NULL)
+      {
+    signal_names[i] = (char *)malloc (18);
+    sprintf (signal_names[i], "SIGJUNK(%d)", i);
+      }
+  signal_names[NSIG] = "DEBUG";
+}
+void
+write_signames (stream)
+     FILE *stream;
+{
+  register int i;
+  fprintf (stream, "/* This file was automatically created by %s.\n",
+       progname);
+  fprintf (stream, "   Do not edit.  Edit support/mksignames.c instead. */\n\n");
+  fprintf (stream, "#include <signal.h>\n\n");
+  fprintf (stream,
+       "/* A translation list so we can be polite to our users. */\n");
+  fprintf (stream, "char *signal_names[NSIG + 2] = {\n");
+  for (i = 0; i <= NSIG; i++)
+    fprintf (stream, "    \"%s\",\n", signal_names[i]);
+  fprintf (stream, "    (char *)0x0,\n");
+  fprintf (stream, "};\n");
+}
+int
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  char *stream_name;
+  FILE *stream;
+  progname = argv[0];
+  if (argc == 1)
+    {
+      stream_name = "signames.c";
+    }
+  else if (argc == 2)
+    {
+      stream_name = argv[1];
+    }
+  else
+    {
+      fprintf (stderr, "Usage: %s [output-file]\n", progname);
+      exit (1);
+    }
+  stream = fopen (stream_name, "w");
+  if (!stream)
+    {
+      fprintf (stderr, "%s: %s: cannot open for writing\n",
+           progname, stream_name);
+      exit (2);
+    }
+  initialize_signames ();
+  write_signames (stream);
+  exit (0);
+}

 /trunk/uspace/app/ash/tools/mknodes.c
 ,0 → 1,492
+/*  $NetBSD: mknodes.c,v 1.18 2000/07/27 04:06:49 cgd Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef lint
+static const char copyright[] =
+    "@(#) Copyright (c) 1991, 1993\n\
+    The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)mknodes.c   8.2 (Berkeley) 5/4/95";
+#else
+static const char rcsid[] =
+    "$NetBSD: mknodes.c,v 1.18 2000/07/27 04:06:49 cgd Exp $";
+#endif
+#endif /* not lint */
+/*
+ * This program reads the nodetypes file and nodes.c.pat file.  It generates
+ * the files nodes.h and nodes.c.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#define MAXTYPES 50     /* max number of node types */
+#define MAXFIELDS 20        /* max fields in a structure */
+#define BUFLEN 100      /* size of character buffers */
+/* field types */
+#define T_NODE 1        /* union node *field */
+#define T_NODELIST 2        /* struct nodelist *field */
+#define T_STRING 3
+#define T_INT 4         /* int field */
+#define T_OTHER 5       /* other */
+#define T_TEMP 6        /* don't copy this field */
+struct field {          /* a structure field */
+    char *name;     /* name of field */
+    int type;           /* type of field */
+    char *decl;     /* declaration of field */
+};
+struct str {            /* struct representing a node structure */
+    char *tag;      /* structure tag */
+    int nfields;        /* number of fields in the structure */
+    struct field field[MAXFIELDS];  /* the fields of the structure */
+    int done;           /* set if fully parsed */
+};
+static int ntypes;          /* number of node types */
+static char *nodename[MAXTYPES];    /* names of the nodes */
+static struct str *nodestr[MAXTYPES];   /* type of structure used by the node */
+static int nstr;            /* number of structures */
+static struct str str[MAXTYPES];    /* the structures */
+static struct str *curstr;      /* current structure */
+static FILE *infp;
+static char line[1024];
+static int linno;
+static char *linep;
+static void parsenode(void);
+static void parsefield(void);
+static void output(char *);
+static void outsizes(FILE *);
+static void outfunc(FILE *, int);
+static void indent(int, FILE *);
+static int nextfield(char *);
+static void skipbl(void);
+static int readline(void);
+static void error(const char *, ...);
+static char *savestr(const char *);
+int main(int, char **);
+int
+main(argc, argv)
+    int argc;
+    char **argv;
+{
+    /*
+     * some versions of linux complain: initializer element is not
+     * constant if this is done at compile time.
+     */
+    infp = stdin;
+    if (argc != 3)
+        error("usage: mknodes file");
+    if ((infp = fopen(argv[1], "r")) == NULL)
+        error("Can't open %s", argv[1]);
+    while (readline()) {
+        if (line[0] == ' ' || line[0] == '\t')
+            parsefield();
+        else if (line[0] != '\0')
+            parsenode();
+    }
+    output(argv[2]);
+    exit(0);
+    /* NOTREACHED */
+}
+static void
+parsenode()
+{
+    char name[BUFLEN];
+    char tag[BUFLEN];
+    struct str *sp;
+    if (curstr && curstr->nfields > 0)
+        curstr->done = 1;
+    nextfield(name);
+    if (! nextfield(tag))
+        error("Tag expected");
+    if (*linep != '\0')
+        error("Garbage at end of line");
+    nodename[ntypes] = savestr(name);
+    for (sp = str ; sp < str + nstr ; sp++) {
+        if (strcmp(sp->tag, tag) == 0)
+            break;
+    }
+    if (sp >= str + nstr) {
+        sp->tag = savestr(tag);
+        sp->nfields = 0;
+        curstr = sp;
+        nstr++;
+    }
+    nodestr[ntypes] = sp;
+    ntypes++;
+}
+static void
+parsefield()
+{
+    char name[BUFLEN];
+    char type[BUFLEN];
+    char decl[2 * BUFLEN];
+    struct field *fp;
+    if (curstr == NULL || curstr->done)
+        error("No current structure to add field to");
+    if (! nextfield(name))
+        error("No field name");
+    if (! nextfield(type))
+        error("No field type");
+    fp = &curstr->field[curstr->nfields];
+    fp->name = savestr(name);
+    if (strcmp(type, "nodeptr") == 0) {
+        fp->type = T_NODE;
+        sprintf(decl, "union node *%s", name);
+    } else if (strcmp(type, "nodelist") == 0) {
+        fp->type = T_NODELIST;
+        sprintf(decl, "struct nodelist *%s", name);
+    } else if (strcmp(type, "string") == 0) {
+        fp->type = T_STRING;
+        sprintf(decl, "char *%s", name);
+    } else if (strcmp(type, "int") == 0) {
+        fp->type = T_INT;
+        sprintf(decl, "int %s", name);
+    } else if (strcmp(type, "other") == 0) {
+        fp->type = T_OTHER;
+    } else if (strcmp(type, "temp") == 0) {
+        fp->type = T_TEMP;
+    } else {
+        error("Unknown type %s", type);
+    }
+    if (fp->type == T_OTHER || fp->type == T_TEMP) {
+        skipbl();
+        fp->decl = savestr(linep);
+    } else {
+        if (*linep)
+            error("Garbage at end of line");
+        fp->decl = savestr(decl);
+    }
+    curstr->nfields++;
+}
+char writer[] = "\
+/*\n\
+ * This file was generated by the mknodes program.\n\
+ */\n\
+\n";
+static void
+output(file)
+    char *file;
+{
+    FILE *hfile;
+    FILE *cfile;
+    FILE *patfile;
+    int i;
+    struct str *sp;
+    struct field *fp;
+    char *p;
+    if ((patfile = fopen(file, "r")) == NULL)
+        error("Can't open %s", file);
+    if ((hfile = fopen("nodes.h", "w")) == NULL)
+        error("Can't create nodes.h");
+    if ((cfile = fopen("nodes.c", "w")) == NULL)
+        error("Can't create nodes.c");
+    fputs(writer, hfile);
+    for (i = 0 ; i < ntypes ; i++)
+        fprintf(hfile, "#define %s %d\n", nodename[i], i);
+    fputs("\n\n\n", hfile);
+    for (sp = str ; sp < &str[nstr] ; sp++) {
+        fprintf(hfile, "struct %s {\n", sp->tag);
+        for (i = sp->nfields, fp = sp->field ; --i >= 0 ; fp++) {
+            fprintf(hfile, "      %s;\n", fp->decl);
+        }
+        fputs("};\n\n\n", hfile);
+    }
+    fputs("union node {\n", hfile);
+    fprintf(hfile, "      int type;\n");
+    for (sp = str ; sp < &str[nstr] ; sp++) {
+        fprintf(hfile, "      struct %s %s;\n", sp->tag, sp->tag);
+    }
+    fputs("};\n\n\n", hfile);
+    fputs("struct nodelist {\n", hfile);
+    fputs("\tstruct nodelist *next;\n", hfile);
+    fputs("\tunion node *n;\n", hfile);
+    fputs("};\n\n\n", hfile);
+    fputs("#ifdef __STDC__\n", hfile);
+    fputs("union node *copyfunc(union node *);\n", hfile);
+    fputs("void freefunc(union node *);\n", hfile);
+    fputs("#else\n", hfile);
+    fputs("union node *copyfunc();\n", hfile);
+    fputs("void freefunc();\n", hfile);
+    fputs("#endif\n", hfile);
+    fputs(writer, cfile);
+    while (fgets(line, sizeof line, patfile) != NULL) {
+        for (p = line ; *p == ' ' || *p == '\t' ; p++);
+        if (strcmp(p, "%SIZES\n") == 0)
+            outsizes(cfile);
+        else if (strcmp(p, "%CALCSIZE\n") == 0)
+            outfunc(cfile, 1);
+        else if (strcmp(p, "%COPY\n") == 0)
+            outfunc(cfile, 0);
+        else
+            fputs(line, cfile);
+    }
+}
+static void
+outsizes(cfile)
+    FILE *cfile;
+{
+    int i;
+    fprintf(cfile, "static const short nodesize[%d] = {\n", ntypes);
+    for (i = 0 ; i < ntypes ; i++) {
+        fprintf(cfile, "      ALIGN(sizeof (struct %s)),\n", nodestr[i]->tag);
+    }
+    fprintf(cfile, "};\n");
+}
+static void
+outfunc(cfile, calcsize)
+    FILE *cfile;
+    int calcsize;
+{
+    struct str *sp;
+    struct field *fp;
+    int i;
+    fputs("      if (n == NULL)\n", cfile);
+    if (calcsize)
+        fputs("     return;\n", cfile);
+    else
+        fputs("     return NULL;\n", cfile);
+    if (calcsize)
+        fputs("      funcblocksize += nodesize[n->type];\n", cfile);
+    else {
+        fputs("      new = funcblock;\n", cfile);
+        fputs("      funcblock = (char *) funcblock + nodesize[n->type];\n", cfile);
+    }
+    fputs("      switch (n->type) {\n", cfile);
+    for (sp = str ; sp < &str[nstr] ; sp++) {
+        for (i = 0 ; i < ntypes ; i++) {
+            if (nodestr[i] == sp)
+                fprintf(cfile, "      case %s:\n", nodename[i]);
+        }
+        for (i = sp->nfields ; --i >= 1 ; ) {
+            fp = &sp->field[i];
+            switch (fp->type) {
+            case T_NODE:
+                if (calcsize) {
+                    indent(12, cfile);
+                    fprintf(cfile, "calcsize(n->%s.%s);\n",
+                        sp->tag, fp->name);
+                } else {
+                    indent(12, cfile);
+                    fprintf(cfile, "new->%s.%s = copynode(n->%s.%s);\n",
+                        sp->tag, fp->name, sp->tag, fp->name);
+                }
+                break;
+            case T_NODELIST:
+                if (calcsize) {
+                    indent(12, cfile);
+                    fprintf(cfile, "sizenodelist(n->%s.%s);\n",
+                        sp->tag, fp->name);
+                } else {
+                    indent(12, cfile);
+                    fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s);\n",
+                        sp->tag, fp->name, sp->tag, fp->name);
+                }
+                break;
+            case T_STRING:
+                if (calcsize) {
+                    indent(12, cfile);
+                    fprintf(cfile, "funcstringsize += strlen(n->%s.%s) + 1;\n",
+                        sp->tag, fp->name);
+                } else {
+                    indent(12, cfile);
+                    fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s);\n",
+                        sp->tag, fp->name, sp->tag, fp->name);
+                }
+                break;
+            case T_INT:
+            case T_OTHER:
+                if (! calcsize) {
+                    indent(12, cfile);
+                    fprintf(cfile, "new->%s.%s = n->%s.%s;\n",
+                        sp->tag, fp->name, sp->tag, fp->name);
+                }
+                break;
+            }
+        }
+        indent(12, cfile);
+        fputs("break;\n", cfile);
+    }
+    fputs("      };\n", cfile);
+    if (! calcsize)
+        fputs("      new->type = n->type;\n", cfile);
+}
+static void
+indent(amount, fp)
+    int amount;
+    FILE *fp;
+{
+    while (amount >= 8) {
+        putc('\t', fp);
+        amount -= 8;
+    }
+    while (--amount >= 0) {
+        putc(' ', fp);
+    }
+}
+static int
+nextfield(buf)
+    char *buf;
+{
+    char *p, *q;
+    p = linep;
+    while (*p == ' ' || *p == '\t')
+        p++;
+    q = buf;
+    while (*p != ' ' && *p != '\t' && *p != '\0')
+        *q++ = *p++;
+    *q = '\0';
+    linep = p;
+    return (q > buf);
+}
+static void
+skipbl()
+{
+    while (*linep == ' ' || *linep == '\t')
+        linep++;
+}
+static int
+readline()
+{
+    char *p;
+    if (fgets(line, 1024, infp) == NULL)
+        return 0;
+    for (p = line ; *p != '#' && *p != '\n' && *p != '\0' ; p++);
+    while (p > line && (p[-1] == ' ' || p[-1] == '\t'))
+        p--;
+    *p = '\0';
+    linep = line;
+    linno++;
+    if (p - line > BUFLEN)
+        error("Line too long");
+    return 1;
+}
+static void
+#ifdef __STDC__
+error(const char *msg, ...)
+#else
+error(va_alist)
+    va_dcl
+#endif
+{
+    va_list va;
+#ifdef __STDC__
+    va_start(va, msg);
+#else
+    char *msg;
+    va_start(va);
+    msg = va_arg(va, char *);
+#endif
+    (void) fprintf(stderr, "line %d: ", linno);
+    (void) vfprintf(stderr, msg, va);
+    (void) fputc('\n', stderr);
+    va_end(va);
+    exit(2);
+    /* NOTREACHED */
+}
+static char *
+savestr(s)
+    const char *s;
+{
+    char *p;
+    if ((p = malloc(strlen(s) + 1)) == NULL)
+        error("Out of space");
+    (void) strcpy(p, s);
+    return p;
+}

 /trunk/uspace/app/ash/tools/mkinit.c
 ,0 → 1,525
+/*  $NetBSD: mkinit.c,v 1.20 2000/07/18 19:13:20 cgd Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef lint
+static const char copyright[] =
+    "@(#) Copyright (c) 1991, 1993\n\
+    The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)mkinit.c    8.2 (Berkeley) 5/4/95";
+#else
+static const char rcsid[] =
+    "$NetBSD: mkinit.c,v 1.20 2000/07/18 19:13:20 cgd Exp $";
+#endif
+#endif /* not lint */
+/*
+ * This program scans all the source files for code to handle various
+ * special events and combines this code into one file.  This (allegedly)
+ * improves the structure of the program since there is no need for
+ * anyone outside of a module to know that that module performs special
+ * operations on particular events.
+ *
+ * Usage:  mkinit sourcefile...
+ */
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+/*
+ * OUTFILE is the name of the output file.  Output is initially written
+ * to the file OUTTEMP, which is then moved to OUTFILE.
+ */
+#define OUTFILE "init.c"
+#define OUTTEMP "init.c.new"
+/*
+ * A text structure is basicly just a string that grows as more characters
+ * are added onto the end of it.  It is implemented as a linked list of
+ * blocks of characters.  The routines addstr and addchar append a string
+ * or a single character, respectively, to a text structure.  Writetext
+ * writes the contents of a text structure to a file.
+ */
+#define BLOCKSIZE 512
+struct text {
+    char *nextc;
+    int nleft;
+    struct block *start;
+    struct block *last;
+};
+struct block {
+    struct block *next;
+    char text[BLOCKSIZE];
+};
+/*
+ * There is one event structure for each event that mkinit handles.
+ */
+struct event {
+    char *name;     /* name of event (e.g. INIT) */
+    char *routine;      /* name of routine called on event */
+    char *comment;      /* comment describing routine */
+    struct text code;   /* code for handling event */
+};
+char writer[] = "\
+/*\n\
+ * This file was generated by the mkinit program.\n\
+ */\n\
+\n";
+char init[] = "\
+/*\n\
+ * Initialization code.\n\
+ */\n";
+char reset[] = "\
+/*\n\
+ * This routine is called when an error or an interrupt occurs in an\n\
+ * interactive shell and control is returned to the main command loop.\n\
+ */\n";
+char shellproc[] = "\
+/*\n\
+ * This routine is called to initialize the shell to run a shell procedure.\n\
+ */\n";
+struct event event[] = {
+    {"INIT", "init", init},
+    {"RESET", "reset", reset},
+    {"SHELLPROC", "initshellproc", shellproc},
+    {NULL, NULL}
+};
+char *curfile;              /* current file */
+int linno;              /* current line */
+char *header_files[200];        /* list of header files */
+struct text defines;            /* #define statements */
+struct text decls;          /* declarations */
+int amiddecls;              /* for formatting */
+void readfile(char *);
+int match(char *, char *);
+int gooddefine(char *);
+void doevent(struct event *, FILE *, char *);
+void doinclude(char *);
+void dodecl(char *, FILE *);
+void output(void);
+void addstr(char *, struct text *);
+void addchar(int, struct text *);
+void writetext(struct text *, FILE *);
+FILE *ckfopen(char *, char *);
+void *ckmalloc(int);
+char *savestr(char *);
+void error(char *);
+int main(int, char **);
+#define equal(s1, s2)   (strcmp(s1, s2) == 0)
+int
+main(argc, argv)
+    int argc;
+    char **argv;
+{
+    char **ap;
+    header_files[0] = "\"shell.h\"";
+    header_files[1] = "\"mystring.h\"";
+    header_files[2] = "\"init.h\"";
+    for (ap = argv + 1 ; *ap ; ap++)
+        readfile(*ap);
+    output();
+    rename(OUTTEMP, OUTFILE);
+    exit(0);
+    /* NOTREACHED */
+}
+/*
+ * Parse an input file.
+ */
+void
+readfile(fname)
+    char *fname;
+    {
+    FILE *fp;
+    char line[1024];
+    struct event *ep;
+    fp = ckfopen(fname, "r");
+    curfile = fname;
+    linno = 0;
+    amiddecls = 0;
+    while (fgets(line, sizeof line, fp) != NULL) {
+        linno++;
+        for (ep = event ; ep->name ; ep++) {
+            if (line[0] == ep->name[0] && match(ep->name, line)) {
+                doevent(ep, fp, fname);
+                break;
+            }
+        }
+        if (line[0] == 'I' && match("INCLUDE", line))
+            doinclude(line);
+        if (line[0] == 'M' && match("MKINIT", line))
+            dodecl(line, fp);
+        if (line[0] == '#' && gooddefine(line))
+            addstr(line, &defines);
+        if (line[0] == '#' && gooddefine(line)) {
+                char *cp;
+            char line2[1024];
+            static const char undef[] = "#undef ";
+            strcpy(line2, line);
+            memcpy(line2, undef, sizeof(undef) - 1);
+            cp = line2 + sizeof(undef) - 1;
+            while(*cp && (*cp == ' ' || *cp == '\t'))
+                    cp++;
+            while(*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
+                    cp++;
+            *cp++ = '\n'; *cp = '\0';
+            addstr(line2, &defines);
+            addstr(line, &defines);
+        }
+    }
+    fclose(fp);
+}
+int
+match(name, line)
+    char *name;
+    char *line;
+{
+    char *p, *q;
+    p = name, q = line;
+    while (*p) {
+        if (*p++ != *q++)
+            return 0;
+    }
+    if (*q != '{' && *q != ' ' && *q != '\t' && *q != '\n')
+        return 0;
+    return 1;
+}
+int
+gooddefine(line)
+    char *line;
+{
+    char *p;
+    if (! match("#define", line))
+        return 0;           /* not a define */
+    p = line + 7;
+    while (*p == ' ' || *p == '\t')
+        p++;
+    while (*p != ' ' && *p != '\t') {
+        if (*p == '(')
+            return 0;       /* macro definition */
+        p++;
+    }
+    while (*p != '\n' && *p != '\0')
+        p++;
+    if (p[-1] == '\\')
+        return 0;           /* multi-line definition */
+    return 1;
+}
+void
+doevent(ep, fp, fname)
+    struct event *ep;
+    FILE *fp;
+    char *fname;
+    {
+    char line[1024];
+    int indent;
+    char *p;
+    sprintf(line, "\n      /* from %s: */\n", fname);
+    addstr(line, &ep->code);
+    addstr("      {\n", &ep->code);
+    for (;;) {
+        linno++;
+        if (fgets(line, sizeof line, fp) == NULL)
+            error("Unexpected EOF");
+        if (equal(line, "}\n"))
+            break;
+        indent = 6;
+        for (p = line ; *p == '\t' ; p++)
+            indent += 8;
+        for ( ; *p == ' ' ; p++)
+            indent++;
+        if (*p == '\n' || *p == '#')
+            indent = 0;
+        while (indent >= 8) {
+            addchar('\t', &ep->code);
+            indent -= 8;
+        }
+        while (indent > 0) {
+            addchar(' ', &ep->code);
+            indent--;
+        }
+        addstr(p, &ep->code);
+    }
+    addstr("      }\n", &ep->code);
+}
+void
+doinclude(line)
+    char *line;
+    {
+    char *p;
+    char *name;
+    char **pp;
+    for (p = line ; *p != '"' && *p != '<' && *p != '\0' ; p++);
+    if (*p == '\0')
+        error("Expecting '\"' or '<'");
+    name = p;
+    while (*p != ' ' && *p != '\t' && *p != '\n')
+        p++;
+    if (p[-1] != '"' && p[-1] != '>')
+        error("Missing terminator");
+    *p = '\0';
+    /* name now contains the name of the include file */
+    for (pp = header_files ; *pp && ! equal(*pp, name) ; pp++);
+    if (*pp == NULL)
+        *pp = savestr(name);
+}
+void
+dodecl(line1, fp)
+    char *line1;
+    FILE *fp;
+    {
+    char line[1024];
+    char *p, *q;
+    if (strcmp(line1, "MKINIT\n") == 0) { /* start of struct/union decl */
+        addchar('\n', &decls);
+        do {
+            linno++;
+            if (fgets(line, sizeof line, fp) == NULL)
+                error("Unterminated structure declaration");
+            addstr(line, &decls);
+        } while (line[0] != '}');
+        amiddecls = 0;
+    } else {
+        if (! amiddecls)
+            addchar('\n', &decls);
+        q = NULL;
+        for (p = line1 + 6 ; *p && strchr("=/\n", *p) == NULL; p++)
+            continue;
+        if (*p == '=') {        /* eliminate initialization */
+            for (q = p ; *q && *q != ';' ; q++);
+            if (*q == '\0')
+                q = NULL;
+            else {
+                while (p[-1] == ' ')
+                    p--;
+                *p = '\0';
+            }
+        }
+        addstr("extern", &decls);
+        addstr(line1 + 6, &decls);
+        if (q != NULL)
+            addstr(q, &decls);
+        amiddecls = 1;
+    }
+}
+/*
+ * Write the output to the file OUTTEMP.
+ */
+void
+output() {
+    FILE *fp;
+    char **pp;
+    struct event *ep;
+    fp = ckfopen(OUTTEMP, "w");
+    fputs(writer, fp);
+    for (pp = header_files ; *pp ; pp++)
+        fprintf(fp, "#include %s\n", *pp);
+    fputs("\n\n\n", fp);
+    writetext(&defines, fp);
+    fputs("\n\n", fp);
+    writetext(&decls, fp);
+    for (ep = event ; ep->name ; ep++) {
+        fputs("\n\n\n", fp);
+        fputs(ep->comment, fp);
+        fprintf(fp, "\nvoid\n%s() {\n", ep->routine);
+        writetext(&ep->code, fp);
+        fprintf(fp, "}\n");
+    }
+    fclose(fp);
+}
+/*
+ * A text structure is simply a block of text that is kept in memory.
+ * Addstr appends a string to the text struct, and addchar appends a single
+ * character.
+ */
+void
+addstr(s, text)
+    char *s;
+    struct text *text;
+    {
+    while (*s) {
+        if (--text->nleft < 0)
+            addchar(*s++, text);
+        else
+            *text->nextc++ = *s++;
+    }
+}
+void
+addchar(c, text)
+    int c;
+    struct text *text;
+{
+    struct block *bp;
+    if (--text->nleft < 0) {
+        bp = ckmalloc(sizeof *bp);
+        if (text->start == NULL)
+            text->start = bp;
+        else
+            text->last->next = bp;
+        text->last = bp;
+        text->nextc = bp->text;
+        text->nleft = BLOCKSIZE - 1;
+    }
+    *text->nextc++ = c;
+}
+/*
+ * Write the contents of a text structure to a file.
+ */
+void
+writetext(text, fp)
+    struct text *text;
+    FILE *fp;
+    {
+    struct block *bp;
+    if (text->start != NULL) {
+        for (bp = text->start ; bp != text->last ; bp = bp->next)
+            fwrite(bp->text, sizeof (char), BLOCKSIZE, fp);
+        fwrite(bp->text, sizeof (char), BLOCKSIZE - text->nleft, fp);
+    }
+}
+FILE *
+ckfopen(file, mode)
+    char *file;
+    char *mode;
+    {
+    FILE *fp;
+    if ((fp = fopen(file, mode)) == NULL) {
+        fprintf(stderr, "Can't open %s\n", file);
+        exit(2);
+    }
+    return fp;
+}
+void *
+ckmalloc(nbytes)
+    int nbytes;
+{
+    char *p;
+    if ((p = malloc(nbytes)) == NULL)
+        error("Out of space");
+    return p;
+}
+char *
+savestr(s)
+    char *s;
+    {
+    char *p;
+    p = ckmalloc(strlen(s) + 1);
+    strcpy(p, s);
+    return p;
+}
+void
+error(msg)
+    char *msg;
+    {
+    if (curfile != NULL)
+        fprintf(stderr, "%s:%d: ", curfile, linno);
+    fprintf(stderr, "%s\n", msg);
+    exit(2);
+    /* NOTREACHED */
+}

 /trunk/uspace/app/ash/Makefile
 ,0 → 1,180
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+include ../../../version
+include ../../Makefile.config
+## Setup toolchain
+#
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+CFLAGS += \
+    -DSHELL \
+    -I. \
+    -DNO_HISTORY \
+    -DBSD=1 \
+    -DSMALL \
+    -D_GNU_SOURCE \
+    -DGLOB_BROKEN \
+    -D__COPYRIGHT\(x\)= \
+    -D__RCSID\(x\)=
+#   -D_DIAGASSERT\(x\)= \
+#   -DHETIO
+LIBS = $(LIBC_PREFIX)/libc.a
+DEFS += -DRELEASE=\"$(RELEASE)\"
+ifdef REVISION
+    DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
+## Sources
+#
+OUTPUT =    sh
+SHSRCS =    \
+    fake.c \
+    alias.c \
+    cd.c \
+    bltin/echo.c \
+    error.c \
+    eval.c \
+    exec.c \
+    expand.c \
+    hetio.c \
+    histedit.c \
+    input.c \
+    jobs.c \
+    mail.c \
+    main.c \
+    memalloc.c \
+    miscbltin.c \
+    mystring.c \
+    options.c \
+    output.c \
+    parser.c \
+    redir.c \
+    show.c \
+    setmode.c \
+    bltin/test.c \
+    bltin/times.c \
+    trap.c \
+    var.c
+GENSRCS = \
+    builtins.c \
+    init.c \
+    nodes.c \
+    syntax.c \
+    signames.c
+#   lex.yy.c \
+#   arith.c \
+#   arith.h \
+GENHEADERS = \
+    token.h \
+    nodes.h \
+    syntax.h \
+    builtins.h
+SOURCES = ${SHSRCS} ${GENSRCS}
+SUBDIRS = tools
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm all-subdirs
+all: all-subdirs $(OUTPUT) disasm
+all-subdirs:
+    for i in $(SUBDIRS); do \
+        echo "make all in $$i..."; \
+        make -C $$i all; \
+    done
+-include Makefile.depend
+.ORDER: builtins.c builtins.h
+builtins.c builtins.h: mkbuiltins builtins.def
+    sh mkbuiltins shell.h builtins.def `pwd`
+INIT_DEPS = alias.c eval.c exec.c input.c jobs.c options.c parser.c \
+    redir.c trap.c var.c output.c
+init.c: mkinit $(INIT_DEPS)
+    ./mkinit $(INIT_DEPS)
+signames.c: mksignames
+    ./mksignames
+nodes.c nodes.h: mknodes nodetypes nodes.c.pat
+    ./mknodes ./nodetypes ./nodes.c.pat
+syntax.c syntax.h: mksyntax
+    ./mksyntax
+#arith.c arith.h: arith.y
+#   yacc -d arith.y
+#   mv y.tab.h arith.h
+#   mv y.tab.c arith.c
+token.h: mktokens
+    sh ./mktokens
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(GENSRCS) $(GENHEADERS) $(OBJECTS)
+    for i in $(SUBDIRS); do \
+        echo "make clean in $$i..."; \
+        make -C $$i clean; \
+    done
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) $(GENHEADERS) > Makefile.depend
+$(OUTPUT): $(GENSRCS) $(GENHEADERS) $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /trunk/uspace/app/ash/setmode.c
 ,0 → 1,486
+/*  $NetBSD: setmode.c,v 1.28 2000/01/25 15:43:43 enami Exp $   */
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Dave Borman at Cray Research, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)setmode.c   8.2 (Berkeley) 3/25/94";
+#else
+__RCSID("$NetBSD: setmode.c,v 1.28 2000/01/25 15:43:43 enami Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#ifdef SETMODE_DEBUG
+#include <stdio.h>
+#endif
+#ifdef __weak_alias
+__weak_alias(getmode,_getmode)
+__weak_alias(setmode,_setmode)
+#endif
+#ifdef __GLIBC__
+#define S_ISTXT __S_ISVTX
+#endif
+#define SET_LEN 6       /* initial # of bitcmd struct to malloc */
+#define SET_LEN_INCR 4      /* # of bitcmd structs to add as needed */
+typedef struct bitcmd {
+    char    cmd;
+    char    cmd2;
+    mode_t  bits;
+} BITCMD;
+#define CMD2_CLR    0x01
+#define CMD2_SET    0x02
+#define CMD2_GBITS  0x04
+#define CMD2_OBITS  0x08
+#define CMD2_UBITS  0x10
+static BITCMD   *addcmd (BITCMD *, int, int, int, u_int);
+static void  compress_mode (BITCMD *);
+#ifdef SETMODE_DEBUG
+static void  dumpmode (BITCMD *);
+#endif
+/*
+ * Given the old mode and an array of bitcmd structures, apply the operations
+ * described in the bitcmd structures to the old mode, and return the new mode.
+ * Note that there is no '=' command; a strict assignment is just a '-' (clear
+ * bits) followed by a '+' (set bits).
+ */
+mode_t
+getmode(bbox, omode)
+    const void *bbox;
+    mode_t omode;
+{
+    const BITCMD *set;
+    mode_t clrval, newmode, value;
+    _DIAGASSERT(bbox != NULL);
+    set = (const BITCMD *)bbox;
+    newmode = omode;
+    for (value = 0;; set++)
+        switch(set->cmd) {
+        /*
+         * When copying the user, group or other bits around, we "know"
+         * where the bits are in the mode so that we can do shifts to
+         * copy them around.  If we don't use shifts, it gets real
+         * grundgy with lots of single bit checks and bit sets.
+         */
+        case 'u':
+            value = (newmode & S_IRWXU) >> 6;
+            goto common;
+        case 'g':
+            value = (newmode & S_IRWXG) >> 3;
+            goto common;
+        case 'o':
+            value = newmode & S_IRWXO;
+common:         if (set->cmd2 & CMD2_CLR) {
+                clrval =
+                    (set->cmd2 & CMD2_SET) ?  S_IRWXO : value;
+                if (set->cmd2 & CMD2_UBITS)
+                    newmode &= ~((clrval<<6) & set->bits);
+                if (set->cmd2 & CMD2_GBITS)
+                    newmode &= ~((clrval<<3) & set->bits);
+                if (set->cmd2 & CMD2_OBITS)
+                    newmode &= ~(clrval & set->bits);
+            }
+            if (set->cmd2 & CMD2_SET) {
+                if (set->cmd2 & CMD2_UBITS)
+                    newmode |= (value<<6) & set->bits;
+                if (set->cmd2 & CMD2_GBITS)
+                    newmode |= (value<<3) & set->bits;
+                if (set->cmd2 & CMD2_OBITS)
+                    newmode |= value & set->bits;
+            }
+            break;
+        case '+':
+            newmode |= set->bits;
+            break;
+        case '-':
+            newmode &= ~set->bits;
+            break;
+        case 'X':
+            if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
+                newmode |= set->bits;
+            break;
+        case '\0':
+        default:
+#ifdef SETMODE_DEBUG
+            (void)printf("getmode:%04o -> %04o\n", omode, newmode);
+#endif
+            return (newmode);
+        }
+}
+#define ADDCMD(a, b, c, d) do {                     \
+    if (set >= endset) {                        \
+        BITCMD *newset;                     \
+        setlen += SET_LEN_INCR;                 \
+        newset = realloc(saveset, sizeof(BITCMD) * setlen); \
+        if (newset == NULL) {                   \
+            free(saveset);                  \
+            return (NULL);                  \
+        }                           \
+        set = newset + (set - saveset);             \
+        saveset = newset;                   \
+        endset = newset + (setlen - 2);             \
+    }                               \
+    set = addcmd(set, (a), (b), (c), (d));              \
+} while (/*CONSTCOND*/0)
+#define STANDARD_BITS   (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
+void *
+setmode(p)
+    const char *p;
+{
+    int perm, who;
+    char op, *ep;
+    BITCMD *set, *saveset, *endset;
+    sigset_t sigset, sigoset;
+    mode_t mask;
+    int equalopdone = 0;    /* pacify gcc */
+    int permXbits, setlen;
+    if (!*p)
+        return (NULL);
+    /*
+     * Get a copy of the mask for the permissions that are mask relative.
+     * Flip the bits, we want what's not set.  Since it's possible that
+     * the caller is opening files inside a signal handler, protect them
+     * as best we can.
+     */
+    sigfillset(&sigset);
+    (void)sigprocmask(SIG_BLOCK, &sigset, &sigoset);
+    (void)umask(mask = umask(0));
+    mask = ~mask;
+    (void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
+    setlen = SET_LEN + 2;
+    if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
+        return (NULL);
+    saveset = set;
+    endset = set + (setlen - 2);
+    /*
+     * If an absolute number, get it and return; disallow non-octal digits
+     * or illegal bits.
+     */
+    if (isdigit((unsigned char)*p)) {
+        perm = (mode_t)strtol(p, &ep, 8);
+        if (*ep || perm & ~(STANDARD_BITS|S_ISTXT)) {
+            free(saveset);
+            return (NULL);
+        }
+        ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
+        set->cmd = 0;
+        return (saveset);
+    }
+    /*
+     * Build list of structures to set/clear/copy bits as described by
+     * each clause of the symbolic mode.
+     */
+    for (;;) {
+        /* First, find out which bits might be modified. */
+        for (who = 0;; ++p) {
+            switch (*p) {
+            case 'a':
+                who |= STANDARD_BITS;
+                break;
+            case 'u':
+                who |= S_ISUID|S_IRWXU;
+                break;
+            case 'g':
+                who |= S_ISGID|S_IRWXG;
+                break;
+            case 'o':
+                who |= S_IRWXO;
+                break;
+            default:
+                goto getop;
+            }
+        }
+getop:      if ((op = *p++) != '+' && op != '-' && op != '=') {
+            free(saveset);
+            return (NULL);
+        }
+        if (op == '=')
+            equalopdone = 0;
+        who &= ~S_ISTXT;
+        for (perm = 0, permXbits = 0;; ++p) {
+            switch (*p) {
+            case 'r':
+                perm |= S_IRUSR|S_IRGRP|S_IROTH;
+                break;
+            case 's':
+                /*
+                 * If specific bits where requested and
+                 * only "other" bits ignore set-id.
+                 */
+                if (who == 0 || (who & ~S_IRWXO))
+                    perm |= S_ISUID|S_ISGID;
+                break;
+            case 't':
+                /*
+                 * If specific bits where requested and
+                 * only "other" bits ignore set-id.
+                 */
+                if (who == 0 || (who & ~S_IRWXO)) {
+                    who |= S_ISTXT;
+                    perm |= S_ISTXT;
+                }
+                break;
+            case 'w':
+                perm |= S_IWUSR|S_IWGRP|S_IWOTH;
+                break;
+            case 'X':
+                permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
+                break;
+            case 'x':
+                perm |= S_IXUSR|S_IXGRP|S_IXOTH;
+                break;
+            case 'u':
+            case 'g':
+            case 'o':
+                /*
+                 * When ever we hit 'u', 'g', or 'o', we have
+                 * to flush out any partial mode that we have,
+                 * and then do the copying of the mode bits.
+                 */
+                if (perm) {
+                    ADDCMD(op, who, perm, mask);
+                    perm = 0;
+                }
+                if (op == '=')
+                    equalopdone = 1;
+                if (op == '+' && permXbits) {
+                    ADDCMD('X', who, permXbits, mask);
+                    permXbits = 0;
+                }
+                ADDCMD(*p, who, op, mask);
+                break;
+            default:
+                /*
+                 * Add any permissions that we haven't already
+                 * done.
+                 */
+                if (perm || (op == '=' && !equalopdone)) {
+                    if (op == '=')
+                        equalopdone = 1;
+                    ADDCMD(op, who, perm, mask);
+                    perm = 0;
+                }
+                if (permXbits) {
+                    ADDCMD('X', who, permXbits, mask);
+                    permXbits = 0;
+                }
+                goto apply;
+            }
+        }
+apply:      if (!*p)
+            break;
+        if (*p != ',')
+            goto getop;
+        ++p;
+    }
+    set->cmd = 0;
+#ifdef SETMODE_DEBUG
+    (void)printf("Before compress_mode()\n");
+    dumpmode(saveset);
+#endif
+    compress_mode(saveset);
+#ifdef SETMODE_DEBUG
+    (void)printf("After compress_mode()\n");
+    dumpmode(saveset);
+#endif
+    return (saveset);
+}
+static BITCMD *
+addcmd(set, op, who, oparg, mask)
+    BITCMD *set;
+    int oparg, who;
+    int op;
+    u_int mask;
+{
+    _DIAGASSERT(set != NULL);
+    switch (op) {
+    case '=':
+        set->cmd = '-';
+        set->bits = who ? who : STANDARD_BITS;
+        set++;
+        op = '+';
+        /* FALLTHROUGH */
+    case '+':
+    case '-':
+    case 'X':
+        set->cmd = op;
+        set->bits = (who ? who : mask) & oparg;
+        break;
+    case 'u':
+    case 'g':
+    case 'o':
+        set->cmd = op;
+        if (who) {
+            set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
+                    ((who & S_IRGRP) ? CMD2_GBITS : 0) |
+                    ((who & S_IROTH) ? CMD2_OBITS : 0);
+            set->bits = (mode_t)~0;
+        } else {
+            set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
+            set->bits = mask;
+        }
+        if (oparg == '+')
+            set->cmd2 |= CMD2_SET;
+        else if (oparg == '-')
+            set->cmd2 |= CMD2_CLR;
+        else if (oparg == '=')
+            set->cmd2 |= CMD2_SET|CMD2_CLR;
+        break;
+    }
+    return (set + 1);
+}
+#ifdef SETMODE_DEBUG
+static void
+dumpmode(set)
+    BITCMD *set;
+{
+    _DIAGASSERT(set != NULL);
+    for (; set->cmd; ++set)
+        (void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
+            set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
+            set->cmd2 & CMD2_CLR ? " CLR" : "",
+            set->cmd2 & CMD2_SET ? " SET" : "",
+            set->cmd2 & CMD2_UBITS ? " UBITS" : "",
+            set->cmd2 & CMD2_GBITS ? " GBITS" : "",
+            set->cmd2 & CMD2_OBITS ? " OBITS" : "");
+}
+#endif
+/*
+ * Given an array of bitcmd structures, compress by compacting consecutive
+ * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
+ * 'g' and 'o' commands continue to be separate.  They could probably be
+ * compacted, but it's not worth the effort.
+ */
+static void
+compress_mode(set)
+    BITCMD *set;
+{
+    BITCMD *nset;
+    int setbits, clrbits, Xbits, op;
+    _DIAGASSERT(set != NULL);
+    for (nset = set;;) {
+        /* Copy over any 'u', 'g' and 'o' commands. */
+        while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
+            *set++ = *nset++;
+            if (!op)
+                return;
+        }
+        for (setbits = clrbits = Xbits = 0;; nset++) {
+            if ((op = nset->cmd) == '-') {
+                clrbits |= nset->bits;
+                setbits &= ~nset->bits;
+                Xbits &= ~nset->bits;
+            } else if (op == '+') {
+                setbits |= nset->bits;
+                clrbits &= ~nset->bits;
+                Xbits &= ~nset->bits;
+            } else if (op == 'X')
+                Xbits |= nset->bits & ~setbits;
+            else
+                break;
+        }
+        if (clrbits) {
+            set->cmd = '-';
+            set->cmd2 = 0;
+            set->bits = clrbits;
+            set++;
+        }
+        if (setbits) {
+            set->cmd = '+';
+            set->cmd2 = 0;
+            set->bits = setbits;
+            set++;
+        }
+        if (Xbits) {
+            set->cmd = 'X';
+            set->cmd2 = 0;
+            set->bits = Xbits;
+            set++;
+        }
+    }
+}

 /trunk/uspace/app/ash/options.h
 ,0 → 1,115
+/*  $NetBSD: options.h,v 1.13 1999/07/09 03:05:50 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)options.h   8.2 (Berkeley) 5/4/95
+ */
+struct shparam {
+    int nparam;     /* # of positional parameters (without $0) */
+    unsigned char malloc;   /* if parameter list dynamically allocated */
+    char **p;       /* parameter list */
+    int optind;     /* next parameter to be processed by getopts */
+    int optoff;     /* used by getopts */
+};
+#define eflag optlist[0].val
+#define fflag optlist[1].val
+#define Iflag optlist[2].val
+#define iflag optlist[3].val
+#define mflag optlist[4].val
+#define nflag optlist[5].val
+#define sflag optlist[6].val
+#define xflag optlist[7].val
+#define vflag optlist[8].val
+#define Vflag optlist[9].val
+#define Eflag optlist[10].val
+#define Cflag optlist[11].val
+#define aflag optlist[12].val
+#define bflag optlist[13].val
+#define uflag optlist[14].val
+#define qflag optlist[15].val
+#define NOPTS   16
+struct optent {
+    const char *name;
+    const char letter;
+    char val;
+};
+#ifdef DEFINE_OPTIONS
+struct optent optlist[NOPTS] = {
+    { "errexit",    'e',    0 },
+    { "noglob", 'f',    0 },
+    { "ignoreeof",  'I',    0 },
+    { "interactive",'i',    0 },
+    { "monitor",    'm',    0 },
+    { "noexec", 'n',    0 },
+    { "stdin",  's',    0 },
+    { "xtrace", 'x',    0 },
+    { "verbose",    'v',    0 },
+    { "vi",     'V',    0 },
+    { "emacs",  'E',    0 },
+    { "noclobber",  'C',    0 },
+    { "allexport",  'a',    0 },
+    { "notify", 'b',    0 },
+    { "nounset",    'u',    0 },
+    { "quietprofile", 'q',  0 },
+};
+#else
+extern struct optent optlist[NOPTS];
+#endif
+extern char *minusc;        /* argument to -c option */
+extern char *arg0;      /* $0 */
+extern struct shparam shellparam;  /* $@ */
+extern char **argptr;       /* argument list for builtin commands */
+extern char *optarg;        /* set by nextopt */
+extern char *optptr;        /* used by nextopt */
+void procargs (int, char **);
+void optschanged (void);
+void setparam (char **);
+void freeparam (volatile struct shparam *);
+int shiftcmd (int, char **);
+int setcmd (int, char **);
+int getoptscmd (int, char **);
+int nextopt (const char *);
+void getoptsreset (const char *);

 /trunk/uspace/app/ash/mkbuiltins
 ,0 → 1,100
+#!/bin/sh -
+#   $NetBSD: mkbuiltins,v 1.15 1999/07/09 03:05:50 christos Exp $
+#
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)mkbuiltins  8.2 (Berkeley) 5/4/95
+temp=/tmp/ka$$
+havehist=1
+if [ "X$1" = "X-h" ]; then
+    havehist=0
+    shift
+fi
+shell=$1
+builtins=$2
+objdir=$3
+havejobs=0
+if grep '^#define JOBS[  ]*1' ${shell} > /dev/null
+then
+    havejobs=1
+fi
+exec > ${objdir}/builtins.c
+cat <<\!
+/*
+ * This file was generated by the mkbuiltins program.
+ */
+#include "shell.h"
+#include "builtins.h"
+!
+awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \
+    print $0}' ${builtins} | sed 's/-j//' > $temp
+awk '{  printf "int %s (int, char **);\n", $1}' $temp
+echo '
+int (*const builtinfunc[]) (int, char **) = {'
+awk '/^[^#]/ {  printf "\t%s,\n", $1}' $temp
+echo '};
+const struct builtincmd builtincmd[] = {'
+awk '{  for (i = 2 ; i <= NF ; i++) {
+        printf "\t{ \"%s\", %d },\n",  $i, NR-1
+    }}' $temp
+echo '  { NULL, 0 }
+};'
+exec > ${objdir}/builtins.h
+cat <<\!
+/*
+ * This file was generated by the mkbuiltins program.
+ */
+#include <sys/cdefs.h>
+!
+tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ < $temp |
+    awk '{  printf "#define %s %d\n", $1, NR-1}'
+echo '
+struct builtincmd {
+      const char *name;
+      int code;
+};
+extern int (*const builtinfunc[]) (int, char **);
+extern const struct builtincmd builtincmd[];'
+rm -f $temp

 /trunk/uspace/app/ash/fake.c
 ,0 → 1,50
+/*
+ * Copyright (c) 2008 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "fake.h"
+uid_t getuid(void)
+{
+    return 0;
+}
+uid_t geteuid(void)
+{
+    return 0;
+}
+uid_t getgid(void)
+{
+    return 0;
+}
+uid_t getegid(void)
+{
+    return 0;
+}

 /trunk/uspace/app/ash/init.h
 ,0 → 1,43
+/*  $NetBSD: init.h,v 1.8 1995/05/11 21:29:14 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)init.h  8.2 (Berkeley) 5/4/95
+ */
+void init (void);
+void reset (void);
+void initshellproc (void);

 /trunk/uspace/app/ash/fake.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2008 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef fake_h
+#define fake_h
+typedef int uid_t;
+uid_t getuid(void);
+uid_t geteuid(void);
+uid_t getgid(void);
+uid_t getegid(void);
+/* setjmp.h */
+typedef int jmp_buf[6];
+#endif

 /trunk/uspace/app/ash/sh.1
 ,0 → 1,1614
+.\" $NetBSD: sh.1,v 1.40 2000/11/20 17:48:05 christos Exp $
+.\" Copyright (c) 1991, 1993
+.\" The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Kenneth Almquist.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\" This product includes software developed by the University of
+.\" California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" @(#)sh.1    8.6 (Berkeley) 5/4/95
+.\"
+.Dd January 9, 1999
+.Os
+.Dt SH 1
+.Sh NAME
+sh \- command interpreter (shell)
+.Sh SYNOPSIS
+.Nm sh
+.Op Fl /+aCefnuvxIimqsVEbc
+.Op Fl o Ar longname
+.Bk -words
+.Op Ar target ...
+.Ek
+.Sh DESCRIPTION
+Sh is the standard command interpreter for the system. The current version
+of
+.Nm
+is in the process of being changed to conform with the
+.Tn POSIX
+.2 and 1003.2a specifications for the shell.  This version has many
+features which make it appear similar in some respects to the Korn shell,
+but it is not a Korn shell clone (see
+.Xr ksh 1 ) .
+Only features designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being incorporated into this shell.
+We expect
+.Tn POSIX
+conformance by the time 4.4 BSD is released. This man page is not intended
+to be a tutorial or a complete specification of the shell.
+.Ss Overview
+The shell is a command that reads lines from either a file or the
+terminal, interprets them, and generally executes other commands. It is
+the program that is running when a user logs into the system (although a
+user can select a different shell with the
+.Xr chsh 1
+command). The shell implements a language that has flow control
+constructs, a macro facility that provides a variety of features in
+addition to data storage, along with built in history and line editing
+capabilities.  It incorporates many features to aid interactive use and
+has the advantage that the interpretative language is common to both
+interactive and non-interactive use (shell scripts).  That is, commands
+can be typed directly to the running shell or can be put into a file and
+the file can be executed directly by the shell.
+.Ss Invocation
+If no args are present and if the standard input of the shell
+is connected to a terminal (or if the
+.Fl i
+flag is set),
+and the
+.Fl c
+option is not present, the shell is considered an interactive shell.  An
+interactive shell generally prompts before each command and handles
+programming and command errors differently (as described below). When
+first starting, the shell inspects argument 0, and if it begins with a
+dash
+.Sq - ,
+the shell is also considered
+a login shell.  This is normally done automatically by the system
+when the user first logs in. A login shell first reads commands
+from the files
+.Pa /etc/profile
+and
+.Pa .profile
+if they exist.
+If the environment variable
+.Ev ENV
+is set on entry to a shell, or is set in the
+.Pa .profile
+of a login shell, the shell next reads
+commands from the file named in
+.Ev ENV .
+Therefore, a user should place commands that are to be executed only at
+login time in the
+.Pa .profile
+file, and commands that are executed for every shell inside the
+.Ev ENV
+file.  To set the
+.Ev ENV
+variable to some file, place the following line in your
+.Pa .profile
+of your home directory
+.Pp
+.Dl ENV=$HOME/.shinit; export ENV
+.Pp
+substituting for
+.Dq .shinit
+any filename you wish. Since the
+.Ev ENV
+file is read for every invocation of the shell, including shell scripts
+and non-interactive shells, the following paradigm is useful for
+restricting commands in the
+.Ev ENV
+file to interactive invocations. Place commands within the
+.Dq case
+and
+.Dq esac
+below (these commands are described later):
+.Pp
+.Bl -item -compact -offset indent
+.It
+.Li case $- in *i*)
+.Bl -item -compact -offset indent
+.It
+.Li # commands for interactive use only
+.It
+.Li ...
+.El
+.It
+.Li esac
+.El
+.Pp
+If command line arguments besides the options have been specified, then
+the shell treats the first argument as the name of a file from which to
+read commands (a shell script), and the remaining arguments are set as the
+positional parameters of the shell ($1, $2, etc).  Otherwise, the shell
+reads commands from its standard input.
+.Ss Argument List Processing
+All of the single letter options have a corresponding name that can be
+used as an argument to the
+.Fl o
+option. The set
+.Fl o
+name is provided next to the single letter option in
+the description below. Specifying a dash
+.Dq -
+turns the option on, while using a plus
+.Dq +
+disables the option.
+The following options can be set from the command line or
+with the
+.Xr set 1
+builtin (described later).
+.Bl -tag -width aaaallexportfoo -offset indent
+.It Fl a Em allexport
+Export all variables assigned to. (UNIMPLEMENTED for 4.4alpha)
+.It Fl c
+Read commands from the command line.
+No commands will be read from the standard input.
+.It Fl C Em noclobber
+Don't overwrite existing files with
+.Dq > .
+(UNIMPLEMENTED for 4.4alpha)
+.It Fl e Em errexit
+If not interactive, exit immediately if any untested command fails.
+The exit status of a command is considered to be
+explicitly tested if the command is used to control
+an
+.Ic if ,
+.Ic elif ,
+.Ic while ,
+or
+.Ic until ;
+or if the command is the left hand operand of an
+.Dq &&
+or
+.Dq ||
+operator.
+.It Fl f Em noglob
+Disable pathname expansion.
+.It Fl n Em noexec
+If not interactive, read commands but do not execute them.  This is useful
+for checking the syntax of shell scripts.
+.It Fl u Em nounset
+Write a message to standard error when attempting to expand a variable
+that is not set, and if the shell is not interactive, exit immediately.
+(UNIMPLEMENTED for 4.4alpha)
+.It Fl v Em verbose
+The shell writes its input to standard error as it is read.  Useful for
+debugging.
+.It Fl x Em xtrace
+Write each command to standard error (preceded
+by a
+.Sq +\  )
+before it is executed.  Useful for debugging.
+.It Fl q Em quietprofile
+If the
+.Fl v
+or
+.Fl x
+options have been set, do not apply them when reading
+initialization files, these being
+.Pa /etc/profile ,
+.Pa .profile ,
+and the file specified by the
+.Ev ENV
+environment variable.
+.It Fl I Em ignoreeof
+Ignore EOF's from input when interactive.
+.It Fl i Em interactive
+Force the shell to behave interactively.
+.It Fl m Em monitor
+Turn on job control (set automatically when interactive).
+.It Fl s Em stdin
+Read commands from standard input (set automatically if no file arguments
+are present).  This option has no effect when set after the shell has
+already started running (i.e. with
+.Xr set 1 ) .
+.It Fl V Em vi
+Enable the built-in
+.Xr vi 1
+command line editor (disables
+.Fl E
+if it has been set).
+.It Fl E Em emacs
+Enable the built-in
+.Xr emacs 1
+command line editor (disables
+.Fl V
+if it has been set).
+.It Fl b Em notify
+Enable asynchronous notification of background job completion.
+(UNIMPLEMENTED for 4.4alpha)
+.El
+.Ss Lexical Structure
+The shell reads input in terms of lines from a file and breaks it up into
+words at whitespace (blanks and tabs), and at certain sequences of
+characters that are special to the shell called
+.Dq operators .
+There are two types of operators: control operators and redirection
+operators (their meaning is discussed later). Following is a list of operators:
+.Bl -ohang -offset indent
+.It "Control operators:"
+.Dl &  &&  (  )  ;  ;; | || <newline>
+.It "Redirection operator:"
+.Dl <  >  >|  <<  >>  <&  >&  <<-  <>
+.El
+.Ss Quoting
+Quoting is used to remove the special meaning of certain characters or
+words to the shell, such as operators, whitespace, or keywords.  There are
+three types of quoting: matched single quotes, matched double quotes, and
+backslash.
+.Ss Backslash
+A backslash preserves the literal meaning of the following
+character, with the exception of
+.Aq newline .
+A backslash preceding a
+.Aq newline
+is treated as a line continuation.
+.Ss Single Quotes
+Enclosing characters in single quotes preserves the literal meaning of all
+the characters (except single quotes, making it impossible to put
+single-quotes in a single-quoted string).
+.Ss Double Quotes
+Enclosing characters within double quotes preserves the literal
+meaning of all characters except dollarsign
+.Pq $ ,
+backquote
+.Pq ` ,
+and backslash
+.Pq \e .
+The backslash inside double quotes is historically weird, and serves to
+quote only the following characters:
+.Dl $  `  \*q  \e  <newline> .
+Otherwise it remains literal.
+.Ss Reserved Words
+Reserved words are words that have special meaning to the
+shell and are recognized at the beginning of a line and
+after a control operator.  The following are reserved words:
+.Bl -column while while while while while -offset indent
+.It ! Ta elif Ta fi Ta while Ta case
+.It else Ta for Ta then Ta { Ta }
+.It do Ta done Ta until Ta if Ta esac
+.El
+.Pp
+Their meaning is discussed later.
+.Ss Aliases
+An alias is a name and corresponding value set using the
+.Xr alias 1
+builtin command.  Whenever a reserved word may occur (see above),
+and after checking for reserved words, the shell
+checks the word to see if it matches an alias. If it does,
+it replaces it in the input stream with its value.  For example,
+if there is an alias called
+.Dq lf
+with the value
+.Dq "ls -F" ,
+then the input:
+.Pp
+.Dl lf foobar <return>
+.Pp
+would become
+.Pp
+.Dl ls -F foobar <return>
+.Pp
+Aliases provide a convenient way for naive users to create shorthands for
+commands without having to learn how to create functions with arguments.
+They can also be used to create lexically obscure code.  This use is
+discouraged.
+.Ss Commands
+The shell interprets the words it reads according to a language, the
+specification of which is outside the scope of this man page (refer to the
+BNF in the
+.Tn POSIX
+.2 document).  Essentially though, a line is read and if the first
+word of the line (or after a control operator) is not a reserved word,
+then the shell has recognized a simple command.  Otherwise, a complex
+command or some other special construct may have been recognized.
+.Ss Simple Commands
+If a simple command has been recognized, the shell performs
+the following actions:
+.Bl -enum -offset indent
+.It
+Leading words of the form
+.Dq name=value
+are stripped off and assigned to the environment of the simple command.
+Redirection operators and their arguments (as described below) are
+stripped off and saved for processing.
+.It
+The remaining words are expanded as described in
+the section called
+.Dq Expansions ,
+and the first remaining word is considered the command name and the
+command is located.  The remaining words are considered the arguments of
+the command. If no command name resulted, then the
+.Dq name=value
+variable assignments recognized in item 1 affect the current shell.
+.It
+Redirections are performed as described in the next section.
+.El
+.Ss Redirections
+Redirections are used to change where a command reads its input or sends
+its output.  In general, redirections open, close, or duplicate an
+existing reference to a file.  The overall format used for redirection is:
+.Pp
+.Dl [n] Va redir-op Ar file
+.Pp
+where
+.Va redir-op
+is one of the redirection operators mentioned previously.  Following is a
+list of the possible redirections. The
+.Bq n
+is an optional number, as in
+.Sq 3
+(not
+.Sq Bq 3 ,
+that refers to a file descriptor.
+.Bl -tag -width aaabsfiles -offset indent
+.It [n] Ns > file
+Redirect standard output (or n) to file.
+.It [n] Ns >| file
+Same, but override the
+.Fl C
+option.
+.It [n] Ns >> file
+Append standard output (or n) to file.
+.It [n] Ns < file
+Redirect standard input (or n) from file.
+.It [n1] Ns <& Ns n2
+Duplicate standard input (or n1) from file descriptor n2.
+.It [n] Ns <&-
+Close standard input (or n).
+.It [n1] Ns >& Ns n2
+Duplicate standard output (or n1) from n2.
+.It [n] Ns >&-
+Close standard output (or n).
+.It [n] Ns <> file
+Open file for reading and writing on standard input (or n).
+.El
+.Pp
+The following redirection is often called a
+.Dq here-document .
+.Bl -item -offset indent
+.It
+.Li [n]<< delimiter
+.Dl here-doc-text...
+.Li delimiter
+.El
+.Pp
+All the text on successive lines up to the delimiter is saved away and
+made available to the command on standard input, or file descriptor n if
+it is specified.  If the delimiter as specified on the initial line is
+quoted, then the here-doc-text is treated literally, otherwise the text is
+subjected to parameter expansion, command substitution, and arithmetic
+expansion (as described in the section on
+.Dq Expansions ) .
+If the operator is
+.Dq <<-
+instead of
+.Dq << ,
+then leading tabs in the here-doc-text are stripped.
+.Ss Search and Execution
+There are three types of commands: shell functions, builtin commands, and
+normal programs -- and the command is searched for (by name) in that
+order.  They each are executed in a different way.
+.Pp
+When a shell function is executed, all of the shell positional parameters
+(except $0, which remains unchanged) are set to the arguments of the shell
+function. The variables which are explicitly placed in the environment of
+the command (by placing assignments to them before the function name) are
+made local to the function and are set to the values given. Then the
+command given in the function definition is executed.  The positional
+parameters are restored to their original values when the command
+completes. This all occurs within the current shell.
+.Pp
+Shell builtins are executed internally to the shell, without spawning a
+new process.
+.Pp
+Otherwise, if the command name doesn't match a function or builtin, the
+command is searched for as a normal program in the filesystem (as
+described in the next section). When a normal program is executed, the
+shell runs the program, passing the arguments and the environment to the
+program. If the program is not a normal executable file (i.e., if it does
+not begin with the "magic number" whose
+.Tn ASCII
+representation is "#!", so
+.Xr execve 2
+returns
+.Er ENOEXEC
+then) the shell will interpret the program in a subshell.  The child shell
+will reinitialize itself in this case, so that the effect will be as if a
+new shell had been invoked to handle the ad-hoc shell script, except that
+the location of hashed commands located in the parent shell will be
+remembered by the child.
+.Pp
+Note that previous versions of this document and the source code itself
+misleadingly and sporadically refer to a shell script without a magic
+number as a "shell procedure".
+.Ss Path Search
+.Pp
+When locating a command, the shell first looks to see if it has a shell
+function by that name.  Then it looks for a builtin command by that name.
+If a builtin command is not found, one of two things happen:
+.Bl -enum
+.It
+Command names containing a slash are simply executed without performing
+any searches.
+.It
+The shell searches each entry in
+.Ev PATH
+in turn for the command. The value of the
+.Ev PATH
+variable should be a series of entries separated by colons.  Each entry
+consists of a directory name. The current directory may be indicated
+implicitly by an empty directory name, or explicitly by a single period.
+.El
+.Ss Command Exit Status
+Each command has an exit status that can influence the behavior
+of other shell commands.  The paradigm is that a command exits
+with zero for normal or success, and non-zero for failure,
+error, or a false indication.  The man page for each command
+should indicate the various exit codes and what they mean.
+Additionally, the builtin commands return exit codes, as does
+an executed shell function.
+.Ss Complex Commands
+Complex commands are combinations of simple commands with control
+operators or reserved words, together creating a larger complex command.
+More generally, a command is one of the following:
+.Bl -bullet
+.It
+simple command
+.It
+pipeline
+.It
+list or compound-list
+.It
+compound command
+.It
+function definition
+.El
+.Pp
+Unless otherwise stated, the exit status of a command is that of the last
+simple command executed by the command.
+.Ss Pipelines
+.Pp
+A pipeline is a sequence of one or more commands separated
+by the control operator |.  The standard output of all but
+the last command is connected to the standard input
+of the next command.  The standard output of the last
+command is inherited from the shell, as usual.
+.Pp
+The format for a pipeline is:
+.Pp
+.Dl [!] command1 [ | command2 ...]
+.Pp
+The standard output of command1 is connected to the standard input of
+command2. The standard input, standard output, or both of a command is
+considered to be assigned by the pipeline before any redirection specified
+by redirection operators that are part of the command.
+.Pp
+If the pipeline is not in the background (discussed later), the shell
+waits for all commands to complete.
+.Pp
+If the reserved word ! does not precede the pipeline, the exit status is
+the exit status of the last command specified in the pipeline.
+Otherwise, the exit status is the logical NOT of the exit status of the
+last command.  That is, if the last command returns zero, the exit status
+is 1; if the last command returns greater than zero, the exit status is
+zero.
+.Pp
+Because pipeline assignment of standard input or standard output or both
+takes place before redirection, it can be modified by redirection.  For
+example:
+.Pp
+.Dl $ command1 2>&1 | command2
+.Pp
+sends both the standard output and standard error of command1
+to the standard input of command2.
+.Pp
+A ; or <newline> terminator causes the preceding AND-OR-list (described
+next) to be executed sequentially; a & causes asynchronous execution of
+the preceding AND-OR-list.
+.Pp
+Note that unlike some other shells, each process in the pipeline is a
+child of the invoking shell (unless it is a shell builtin, in which case
+it executes in the current shell -- but any effect it has on the
+environment is wiped).
+.Ss Background Commands -- &
+If a command is terminated by the control operator ampersand (&), the
+shell executes the command asynchronously -- that is, the shell does not
+wait for the command to finish before executing the next command.
+.Pp
+The format for running a command in background is:
+.Pp
+.Dl command1 & [command2 & ...]
+.Pp
+If the shell is not interactive, the standard input of an asynchronous
+command is set to
+.Pa /dev/null .
+.Ss Lists -- Generally Speaking
+A list is a sequence of zero or more commands separated by newlines,
+semicolons, or ampersands, and optionally terminated by one of these three
+characters. The commands in a list are executed in the order they are
+written. If command is followed by an ampersand, the shell starts the
+command and immediately proceed onto the next command; otherwise it waits
+for the command to terminate before proceeding to the next one.
+.Ss Short-Circuit List Operators
+.Dq &&
+and
+.Dq ||
+are AND-OR list operators.
+.Dq &&
+executes the first command, and then executes the second command iff the
+exit status of the first command is zero.
+.Dq ||
+is similar, but executes the second command iff the exit status of the first
+command is nonzero.
+.Dq &&
+and
+.Dq ||
+both have the same priority.
+.Ss Flow-Control Constructs -- if, while, for, case
+The syntax of the if command is
+.Bd -literal -offset indent
+if list
+then list
+[ elif list
+then    list ] ...
+[ else list ]
+fi
+.Ed
+.Pp
+The syntax of the while command is
+.Bd -literal -offset indent
+while list
+do   list
+done
+.Ed
+.Pp
+The two lists are executed repeatedly while the exit status of the
+first list is zero.  The until command is similar, but has the word
+until in place of while, which causes it to
+repeat until the exit status of the first list is zero.
+.Pp
+The syntax of the for command is
+.Bd -literal -offset indent
+for variable in word...
+do   list
+done
+.Ed
+.Pp
+The words are expanded, and then the list is executed repeatedly with the
+variable set to each word in turn.  do and done may be replaced with
+.Dq {
+and
+.Dq } .
+.Pp
+The syntax of the break and continue command is
+.Bd -literal -offset indent
+break [ num ]
+continue [ num ]
+.Ed
+.Pp
+Break terminates the num innermost for or while loops.
+Continue continues with the next iteration of the innermost loop.
+These are implemented as builtin commands.
+.Pp
+The syntax of the case command is
+.Bd -literal -offset indent
+case word in
+pattern) list ;;
+\&...
+esac
+.Ed
+.Pp
+The pattern can actually be one or more patterns (see Shell
+Patterns described later), separated by
+.Dq \*(Ba
+characters.
+.Ss Grouping Commands Together
+Commands may be grouped by writing either
+.Pp
+.Dl (list)
+.Pp
+or
+.Pp
+.Dl { list; }
+.Pp
+The first of these executes the commands in a subshell. Builtin commands
+grouped into a (list) will not affect the current shell. The second form
+does not fork another shell so is slightly more efficient. Grouping
+commands together this way allows you to redirect their output as though
+they were one program:
+.Pp
+.Bd -literal -offset indent
+{ echo \*q hello \\c\*q ; echo \*q world" } > greeting
+.Ed
+.Pp
+.Ss Functions
+The syntax of a function definition is
+.Pp
+.Dl name ( ) command
+.Pp
+A function definition is an executable statement; when executed it
+installs a function named name and returns an exit status of zero.  The
+command is normally a list enclosed between
+.Dq {
+and
+.Dq } .
+.Pp
+Variables may be declared to be local to a function by using a local
+command.  This should appear as the first statement of a function, and the
+syntax is
+.Pp
+.Dl local [ variable | - ] ...
+.Pp
+Local is implemented as a builtin command.
+.Pp
+When a variable is made local, it inherits the initial value and exported
+and readonly flags from the variable with the same name in the surrounding
+scope, if there is one.  Otherwise, the variable is initially unset.  The
+shell uses dynamic scoping, so that if you make the variable x local to
+function f, which then calls function g, references to the variable x made
+inside g will refer to the variable x declared inside f, not to the global
+variable named x.
+.Pp
+The only special parameter than can be made local is
+.Dq - .
+Making
+.Dq -
+local any shell options that are changed via the set command inside the
+function to be restored to their original values when the function
+returns.
+.Pp
+The syntax of the return command is
+.Pp
+.Dl return [ exitstatus ]
+.Pp
+It terminates the currently executing function.  Return is
+implemented as a builtin command.
+.Ss Variables and Parameters
+The shell maintains a set of parameters.  A parameter denoted by a name is
+called a variable. When starting up, the shell turns all the environment
+variables into shell variables.  New variables can be set using the form
+.Pp
+.Dl name=value
+.Pp
+Variables set by the user must have a name consisting solely of
+alphabetics, numerics, and underscores - the first of which must not be
+numeric.  A parameter can also be denoted by a number or a special
+character as explained below.
+.Ss Positional Parameters
+A positional parameter is a parameter denoted by a number (n > 0). The
+shell sets these initially to the values of its command line arguments
+that follow the name of the shell script. The
+.Xr set 1
+builtin can also be used to set or reset them.
+.Ss Special Parameters
+A special parameter is a parameter denoted by one of the following special
+characters.  The value of the parameter is listed next to its character.
+.Bl -tag -width thinhyphena
+.It *
+Expands to the positional parameters, starting from one.  When the
+expansion occurs within a double-quoted string it expands to a single
+field with the value of each parameter separated by the first character of
+the
+.Ev IFS
+variable, or by a <space> if
+.Ev IFS
+is unset.
+.It @
+Expands to the positional parameters, starting from one.  When
+the expansion occurs within double-quotes, each positional
+parameter expands as a separate argument.
+If there are no positional parameters, the
+expansion of @ generates zero arguments, even when @ is
+double-quoted.  What this basically means, for example, is
+if $1 is
+.Dq abc
+and $2 is
+.Dq def ghi ,
+then
+.Qq $@
+expands to
+the two arguments:
+.Pp
+.Sm off
+.Dl \*q abc \*q \  \*q def\ ghi \*q
+.Sm on
+.It #
+Expands to the number of positional parameters.
+.It ?
+Expands to the exit status of the most recent pipeline.
+.It - (Hyphen.)
+Expands to the current option flags (the single-letter
+option names concatenated into a string) as specified on
+invocation, by the set builtin command, or implicitly
+by the shell.
+.It $
+Expands to the process ID of the invoked shell.  A subshell
+retains the same value of $ as its parent.
+.It !
+Expands to the process ID of the most recent background
+command executed from the current shell.  For a
+pipeline, the process ID is that of the last command in the
+pipeline.
+.It 0 (Zero.)
+Expands to the name of the shell or shell script.
+.El
+.Ss Word Expansions
+This clause describes the various expansions that are performed on words.
+Not all expansions are performed on every word, as explained later.
+.Pp
+Tilde expansions, parameter expansions, command substitutions, arithmetic
+expansions, and quote removals that occur within a single word expand to a
+single field.  It is only field splitting or pathname expansion that can
+create multiple fields from a single word. The single exception to this
+rule is the expansion of the special parameter @ within double-quotes, as
+was described above.
+.Pp
+The order of word expansion is:
+.Bl -enum
+.It
+Tilde Expansion, Parameter Expansion, Command Substitution,
+Arithmetic Expansion (these all occur at the same time).
+.It
+Field Splitting is performed on fields
+generated by step (1) unless the
+.Ev IFS
+variable is null.
+.It
+Pathname Expansion (unless set
+.Fl f
+is in effect).
+.It
+Quote Removal.
+.El
+.Pp
+The $ character is used to introduce parameter expansion, command
+substitution, or arithmetic evaluation.
+.Ss Tilde Expansion (substituting a user's home directory)
+A word beginning with an unquoted tilde character (~) is
+subjected to tilde expansion.  All the characters up to
+a slash (/) or the end of the word are treated as a username
+and are replaced with the user's home directory.  If the
+username is missing (as in
+.Pa ~/foobar ) ,
+the tilde is replaced with the value of the
+.Va HOME
+variable (the current user's home directory).
+.Ss Parameter Expansion
+The format for parameter expansion is as follows:
+.Pp
+.Dl ${expression}
+.Pp
+where expression consists of all characters until the matching
+.Dq } .
+Any
+.Dq }
+escaped by a backslash or within a quoted string, and characters in
+embedded arithmetic expansions, command substitutions, and variable
+expansions, are not examined in determining the matching
+.Dq } .
+.Pp
+The simplest form for parameter expansion is:
+.Pp
+.Dl ${parameter}
+.Pp
+The value, if any, of parameter is substituted.
+.Pp
+The parameter name or symbol can be enclosed in braces, which are
+optional except for positional parameters with more than one digit or
+when parameter is followed by a character that could be interpreted as
+part of the name.
+If a parameter expansion occurs inside
+double-quotes:
+.Bl -enum
+.It
+Pathname expansion is not performed on the results of the
+expansion.
+.It
+Field splitting is not performed on the results of the
+expansion, with the exception of @.
+.El
+.Pp
+In addition, a parameter expansion can be modified by using one of the
+following formats.
+.Bl -tag -width aaparameterwordaaaaa
+.It ${parameter:-word}
+Use Default Values.  If parameter is unset or null, the expansion of word
+is substituted; otherwise, the value of parameter is substituted.
+.It ${parameter:=word}
+Assign Default Values.  If parameter is unset or null, the expansion of
+word is assigned to parameter.  In all cases, the final value of parameter
+is substituted.  Only variables, not positional parameters or special
+parameters, can be assigned in this way.
+.It ${parameter:?[word]}
+Indicate Error if Null or Unset.  If parameter is unset or null, the
+expansion of word (or a message indicating it is unset if word is omitted)
+is written to standard error and the shell exits with a nonzero exit
+status.  Otherwise, the value of parameter is substituted.  An interactive
+shell need not exit.
+.It ${parameter:+word}
+Use Alternative Value.  If parameter is unset or null, null is
+substituted; otherwise, the expansion of word is substituted.
+.El
+.Pp
+In the parameter expansions shown previously, use of the colon in the
+format results in a test for a parameter that is unset or null; omission
+of the colon results in a test for a parameter that is only unset.
+.Bl -tag -width aaparameterwordaaaaa
+.It ${#parameter}
+String Length.  The length in characters of
+the value of parameter.
+.El
+.Pp
+The following four varieties of parameter expansion provide for substring
+processing.  In each case, pattern matching notation (see Shell Patterns),
+rather than regular expression notation, is used to evaluate the patterns.
+If parameter is * or @, the result of the expansion is unspecified.
+Enclosing the full parameter expansion string in double-quotes does not
+cause the following four varieties of pattern characters to be quoted,
+whereas quoting characters within the braces has this effect.
+.Bl -tag -width aaparameterwordaaaaa
+.It ${parameter%word}
+Remove Smallest Suffix Pattern.  The word is expanded to produce a
+pattern.  The parameter expansion then results in parameter, with the
+smallest portion of the suffix matched by the pattern deleted.
+.It ${parameter%%word}
+Remove Largest Suffix Pattern.  The word is expanded to produce a pattern.
+The parameter expansion then results in parameter, with the largest
+portion of the suffix matched by the pattern deleted.
+.It ${parameter#word}
+Remove Smallest Prefix Pattern.  The word is expanded to produce a
+pattern.  The parameter expansion then results in parameter, with the
+smallest portion of the prefix matched by the pattern deleted.
+.It ${parameter##word}
+Remove Largest Prefix Pattern.  The word is expanded to produce a pattern.
+The parameter expansion then results in parameter, with the largest
+portion of the prefix matched by the pattern deleted.
+.El
+.Ss Command Substitution
+Command substitution allows the output of a command to be substituted in
+place of the command name itself.  Command substitution occurs when
+the command is enclosed as follows:
+.Pp
+.Dl $(command)
+.Pp
+or
+.Po
+.Dq backquoted
+version
+.Pc :
+.Pp
+.Dl `command`
+.Pp
+The shell expands the command substitution by executing command in a
+subshell environment and replacing the command substitution with the
+standard output of the command, removing sequences of one or more
+<newline>s at the end of the substitution.  (Embedded <newline>s before
+the end of the output are not removed; however, during field splitting,
+they may be translated into <space>s, depending on the value of
+.Ev IFS
+and quoting that is in effect.)
+.Ss Arithmetic Expansion
+.Pp
+Arithmetic expansion provides a mechanism for evaluating an arithmetic
+expression and substituting its value. The format for arithmetic
+expansion is as follows:
+.Pp
+.Dl $((expression))
+.Pp
+The expression is treated as if it were in double-quotes, except
+that a double-quote inside the expression is not treated specially.  The
+shell expands all tokens in the expression for parameter expansion,
+command substitution, and quote removal.
+.Pp
+Next, the shell treats this as an arithmetic expression and
+substitutes the value of the expression.
+.Ss White Space Splitting (Field Splitting)
+After parameter expansion, command substitution, and
+arithmetic expansion the shell scans the results of
+expansions and substitutions that did not occur in double-quotes for
+field splitting and multiple fields can result.
+.Pp
+The shell treats each character of the
+.Ev IFS
+as a delimiter and use the delimiters to split the results of parameter
+expansion and command substitution into fields.
+.Ss Pathname Expansion (File Name Generation)
+Unless the
+.Fl f
+flag is set, file name generation is performed after word splitting is
+complete.  Each word is viewed as a series of patterns, separated by
+slashes.  The process of expansion replaces the word with the names of all
+existing files whose names can be formed by replacing each pattern with a
+string that matches the specified pattern. There are two restrictions on
+this: first, a pattern cannot match a string containing a slash, and
+second, a pattern cannot match a string starting with a period unless the
+first character of the pattern is a period. The next section describes the
+patterns used for both Pathname Expansion and the
+.Xr case 1
+command.
+.Ss Shell Patterns
+A pattern consists of normal characters, which match themselves,
+and meta-characters.   The meta-characters are
+.Dq ! ,
+.Dq * ,
+.Dq ? ,
+and
+.Dq [ .
+These characters lose their special meanings if they are quoted.  When
+command or variable substitution is performed and the dollar sign or back
+quotes are not double quoted, the value of the variable or the output of
+the command is scanned for these characters and they are turned into
+meta-characters.
+.Pp
+An asterisk
+.Pq Dq *
+matches any string of characters.  A question mark matches any single
+character. A left bracket
+.Pq Dq \&[
+introduces a character class.  The end of
+the character class is indicated by a
+.Pq Dq \&] ;
+if the
+.Dq \&]
+is missing then the
+.Dq \&[
+matches a
+.Dq \&[
+rather than introducing a character class.  A character class matches any
+of the characters between the square brackets.  A range of characters may
+be specified using a minus sign. The character class may be complemented
+by making an exclamation point the first character of the character class.
+.Pp
+To include a
+.Dq \&]
+in a character class, make it the first character listed (after the
+.Dq \&! ,
+if any).  To include a minus sign, make it the first or last character listed
+.Ss Builtins
+.Pp
+This section lists the builtin commands which are builtin because they
+need to perform some operation that can't be performed by a separate
+process. In addition to these, there are several other commands that may
+be builtin for efficiency (e.g.
+.Xr printf 1 ,
+.Xr echo 1 ,
+.Xr test 1 ,
+etc).
+.Bl -tag -width 5n
+.It :
+A null command that returns a 0 (true) exit value.
+.It \&. file
+The commands in the specified file are read and executed by the shell.
+.It alias Op Ar name Ns Op Ar "=string ..."
+If
+.Ar name=string
+is specified, the shell defines the alias
+.Ar name
+with value
+.Ar string .
+If just
+.Ar name
+is specified, the value of the alias
+.Ar name
+is printed. With no arguments, the
+.Ic alias
+builtin prints the
+names and values of all defined aliases (see
+.Ic unalias ) .
+.It bg [ Ar job ] ...
+Continue the specified jobs (or the current job if no
+jobs are given) in the background.
+.It command Ar command Ar arg...
+Execute the specified builtin command.  (This is useful when you
+have a shell function with the same name as a builtin command.)
+.It cd Op Ar directory
+Switch to the specified directory (default
+.Ev $HOME ) .
+If an entry for
+.Ev CDPATH
+appears in the environment of the
+.Ic cd
+command or the shell variable
+.Ev CDPATH
+is set and the directory name does not begin with a slash, then the
+directories listed in
+.Ev CDPATH
+will be searched for the specified directory.  The format of
+.Ev CDPATH
+is the same as that of
+.Ev PATH .
+In an interactive shell, the
+.Ic cd
+command will print out the name of the
+directory that it actually switched to if this is different from the name
+that the user gave.  These may be different either because the
+.Ev CDPATH
+mechanism was used or because a symbolic link was crossed.
+.It eval Ar string...
+Concatenate all the arguments with spaces.  Then re-parse and execute
+the command.
+.It exec Op Ar command arg...
+Unless command is omitted, the shell process is replaced with the
+specified program (which must be a real program, not a shell builtin or
+function).  Any redirections on the
+.Ic exec
+command are marked as permanent, so that they are not undone when the
+.Ic exec
+command finishes.
+.It exit Op Ar exitstatus
+Terminate the shell process.  If
+.Ar exitstatus
+is given it is used as the exit status of the shell; otherwise the
+exit status of the preceding command is used.
+.It export Ar name...
+.It export Fl p
+The specified names are exported so that they will appear in the
+environment of subsequent commands. The only way to un-export a variable
+is to unset it. The shell allows the value of a variable to be set at the
+same time it is exported by writing
+.Pp
+.Dl export name=value
+.Pp
+With no arguments the export command lists the names of all exported variables.
+With the
+.Fl p
+option specified the output will be formatted suitably for non-interactive use.
+.It Xo fc Op Fl e Ar editor
+.Op Ar first Op Ar last
+.Xc
+.It Xo fc Fl l
+.Op Fl nr
+.Op Ar first Op Ar last
+.Xc
+.It Xo fc Fl s Op Ar old=new
+.Op Ar first
+.Xc
+The
+.Ic fc
+builtin lists, or edits and re-executes, commands previously entered
+to an interactive shell.
+.Bl -tag -width 5n
+.It Fl e No editor
+Use the editor named by editor to edit the commands.  The
+editor string is a command name, subject to search via the
+.Ev PATH
+variable.  The value in the
+.Ev FCEDIT
+variable is used as a default when
+.Fl e
+is not specified.  If
+.Ev FCEDIT
+is null or unset, the value of the
+.Ev EDITOR
+variable is used.  If
+.Ev EDITOR
+is null or unset,
+.Xr ed 1
+is used as the editor.
+.It Fl l No (ell)
+List the commands rather than invoking an editor on them.  The commands
+are written in the sequence indicated by the first and last operands, as
+affected by
+.Fl r ,
+with each command preceded by the command number.
+.It Fl n
+Suppress command numbers when listing with -l.
+.It Fl r
+Reverse the order of the commands listed (with
+.Fl l )
+or edited (with neither
+.Fl l
+nor
+.Fl s ) .
+.It Fl s
+Re-execute the command without invoking an editor.
+.It first
+.It last
+Select the commands to list or edit.  The number of previous commands that
+can be accessed are determined by the value of the
+.Ev HISTSIZE
+variable.  The value of first or last or both are one of the following:
+.Bl -tag -width 5n
+.It [+]number
+A positive number representing a command number; command numbers can be
+displayed with the
+.Fl l
+option.
+.It Fl number
+A negative decimal number representing the command that was executed
+number of commands previously.  For example, -1 is the immediately
+previous command.
+.El
+.It string
+A string indicating the most recently entered command that begins with
+that string.  If the old=new operand is not also specified with
+.Fl s ,
+the string form of the first operand cannot contain an embedded equal sign.
+.El
+.Pp
+The following environment variables affect the execution of fc:
+.Bl -tag -width HISTSIZE
+.It Ev FCEDIT
+Name of the editor to use.
+.It Ev HISTSIZE
+The number of previous commands that are accessible.
+.El
+.It fg Op Ar job
+Move the specified job or the current job to the foreground.
+.It getopts Ar optstring var
+The
+.Tn POSIX
+.Ic getopts
+command, not to be confused with the
+.Em Bell Labs
+-derived
+.Xr getopt 1 .
+.Pp
+The first argument should be a series of letters, each of which may be
+optionally followed by a colon to indicate that the option requires an
+argument.  The variable specified is set to the parsed option.
+.Pp
+The
+.Ic getopts
+command deprecates the older
+.Xr getopt 1
+utility due to its handling of arguments containing whitespace.
+.Pp
+The
+.Ic getopts
+builtin may be used to obtain options and their arguments
+from a list of parameters.  When invoked,
+.Ic getopts
+places the value of the next option from the option string in the list in
+the shell variable specified by
+.Va var
+and it's index in the shell variable
+.Ev OPTIND .
+When the shell is invoked,
+.Ev OPTIND
+is initialized to 1.  For each option that requires an argument, the
+.Ic getopts
+builtin will place it in the shell variable
+.Ev OPTARG .
+If an option is not allowed for in the
+.Va optstring ,
+then
+.Ev OPTARG
+will be unset.
+.Pp
+.Va optstring
+is a string of recognized option letters (see
+.Xr getopt 3 ) .
+If a letter is followed by a colon, the option is expected to have an
+argument which may or may not be separated from it by white space.  If an
+option character is not found where expected,
+.Ic getopts
+will set the variable
+.Va var
+to a
+.Dq ? ;
+.Ic getopts
+will then unset
+.Ev OPTARG
+and write output to standard error.  By specifying a colon as the
+first character of
+.Va optstring
+all errors will be ignored.
+.Pp
+A nonzero value is returned when the last option is reached.
+If there are no remaining arguments,
+.Ic getopts
+will set
+.Va var
+to the special option,
+.Dq -- ,
+otherwise, it will set
+.Va var
+to
+.Dq ? .
+.Pp
+The following code fragment shows how one might process the arguments
+for a command that can take the options
+.Op a
+and
+.Op b ,
+and the option
+.Op c ,
+which requires an argument.
+.Pp
+.Bd -literal -offset indent
+while getopts abc: f
+do
+    case $f in
+    a | b)  flag=$f;;
+    c)  carg=$OPTARG;;
+    \\?)    echo $USAGE; exit 1;;
+    esac
+done
+shift `expr $OPTIND - 1`
+.Ed
+.Pp
+This code will accept any of the following as equivalent:
+.Pp
+.Bd -literal -offset indent
+cmd \-acarg file file
+cmd \-a \-c arg file file
+cmd \-carg -a file file
+cmd \-a \-carg \-\- file file
+.Ed
+.It hash Fl rv Ar command...
+The shell maintains a hash table which remembers the
+locations of commands.  With no arguments whatsoever,
+the
+.Ic hash
+command prints out the contents of this table.  Entries which have not
+been looked at since the last
+.Ic cd
+command are marked with an asterisk; it is possible for these entries
+to be invalid.
+.Pp
+With arguments, the
+.Ic hash
+command removes the specified commands from the hash table (unless
+they are functions) and then locates them.  With the
+.Fl v
+option, hash prints the locations of the commands as it finds them.  The
+.Fl r
+option causes the hash command to delete all the entries in the hash table
+except for functions.
+.It jobid Op Ar job
+Print the process id's of the processes in the job.
+If the
+.Ar job
+argument is omitted, the current job is used.
+.It jobs
+This command lists out all the background processes
+which are children of the current shell process.
+.It pwd
+Print the current directory.  The builtin command may
+differ from the program of the same name because the
+builtin command remembers what the current directory
+is rather than recomputing it each time.  This makes
+it faster.  However, if the current directory is
+renamed, the builtin version of
+.Ic pwd
+will continue to print the old name for the directory.
+.It Xo read Op Fl p Ar prompt
+.Op Fl r
+.Ar variable...
+.Xc
+The prompt is printed if the
+.Fl p
+option is specified and the standard input is a terminal.  Then a line is
+read from the standard input.  The trailing newline is deleted from the
+line and the line is split as described in the section on word splitting
+above, and the pieces are assigned to the variables in order.
+At least one variable must be specified.
+If there are
+more pieces than variables, the remaining pieces (along with the
+characters in
+.Ev IFS
+that separated them) are assigned to the last variable. If there are more
+variables than pieces, the remaining variables are assigned the null
+string. The
+.Ic read
+builtin will indicate success unless EOF is encountered on input, in
+which case failure is returned.
+.Pp
+By default, unless the
+.Fl r
+option is specified, the backslash
+.Dq \e
+acts as an escape character, causing the following character to be treated
+literally.  If a backslash is followed by a newline, the backslash and the
+newline will be deleted.
+.It readonly Ar name...
+.It readonly Fl p
+The specified names are marked as read only, so that they cannot be
+subsequently modified or unset.  The shell allows the value of a variable
+to be set at the same time it is marked read only by writing
+.Pp
+.Dl readonly name=value
+.Pp
+With no arguments the readonly command lists the names of all read only
+variables.
+With the
+.Fl p
+option specified the output will be formatted suitably for non-interactive use.
+.Pp
+.It Xo set
+.Oo {
+.Fl options | Cm +options | Cm -- }
+.Oc Ar arg...
+.Xc
+The
+.Ic set
+command performs three different functions.
+.Pp
+With no arguments, it lists the values of all shell
+variables.
+.Pp
+If options are given, it sets the specified option
+flags, or clears them as described in the section
+called
+.Sx Argument List Processing .
+.Pp
+The third use of the set command is to set the values of the shell's
+positional parameters to the specified args.  To change the positional
+parameters without changing any options, use
+.Dq --
+as the first argument to set.  If no args are present, the set command
+will clear all the positional parameters (equivalent to executing
+.Dq shift $# . )
+.It setvar Ar variable Ar value
+Assigns value to variable. (In general it is better to write
+variable=value rather than using
+.Ic setvar .
+.Ic setvar
+is intended to be used in
+functions that assign values to variables whose names are passed as
+parameters.)
+.It shift Op Ar n
+Shift the positional parameters n times.  A
+.Ic shift
+sets the value of
+.Va $1
+to the value of
+.Va $2 ,
+the value of
+.Va $2
+to the value of
+.Va $3 ,
+and so on, decreasing
+the value of
+.Va $#
+by one. If there are zero positional parameters,
+.Ic shift
+does nothing.
+.It times
+Print the accumulated user and system times for the shell and for processes
+run from the shell.  The return status is 0.
+.It Xo trap
+.Op Ar action
+.Ar signal...
+.Xc
+Cause the shell to parse and execute action when any of the specified
+signals are received. The signals are specified by signal number. If
+.Ar signal
+is
+.Li 0 ,
+the action is executed when the shell exits.
+.Ar action
+may be null or omitted; the former causes the specified signal to be
+ignored and the latter causes the default action to be taken. When the
+shell forks off a subshell, it resets trapped (but not ignored) signals to
+the default action. The
+.Ic trap
+command has no effect on signals that were
+ignored on entry to the shell.
+.It type Op Ar name ...
+Interpret each name as a command and print the resolution of the command
+search. Possible resolutions are:
+shell keyword, alias, shell builtin,
+command, tracked alias and not found.  For aliases the alias expansion is
+printed; for commands and tracked aliases the complete pathname of the
+command is printed.
+.It ulimit Xo
+.Op Fl H \*(Ba Fl S
+.Op Fl a \*(Ba Fl tfdscmlpn Op Ar value
+.Xc
+Inquire about or set the hard or soft limits on processes or set new
+limits. The choice between hard limit (which no process is allowed to
+violate, and which may not be raised once it has been lowered) and soft
+limit (which causes processes to be signaled but not necessarily killed,
+and which may be raised) is made with these flags:
+.Bl -tag -width Fl
+.It Fl H
+set or inquire about hard limits
+.It Fl S
+set or inquire about soft limits. If neither
+.Fl H
+nor
+.Fl S
+is specified, the soft limit is displayed or both limits are set. If both
+are specified, the last one wins.
+.El
+.Pp
+.Bl -tag -width Fl
+The limit to be interrogated or set, then, is chosen by specifying
+any one of these flags:
+.It Fl a
+show all the current limits
+.It Fl t
+show or set the limit on CPU time (in seconds)
+.It Fl f
+show or set the limit on the largest file that can be created
+(in 512-byte blocks)
+.It Fl d
+show or set the limit on the data segment size of a process (in kilobytes)
+.It Fl s
+show or set the limit on the stack size of a process (in kilobytes)
+.It Fl c
+show or set the limit on the largest core dump size that can be produced
+(in 512-byte blocks)
+.It Fl m
+show or set the limit on the total physical memory that can be
+in use by a process (in kilobytes)
+.It Fl l
+show or set the limit on how much memory a process can lock with
+.Xr mlock 2
+(in kilobytes)
+.It Fl p
+show or set the limit on the number of processes this user can
+have at one time
+.It Fl n
+show or set the limit on the number files a process can have open at once
+.El
+.Pp
+If none of these is specified, it is the limit on file size that is shown
+or set. If value is specified, the limit is set to that number; otherwise
+the current limit is displayed.
+.Pp
+Limits of an arbitrary process can be displayed or set using the
+.Xr sysctl 8
+utility.
+.Pp
+.It umask Op Ar mask
+Set the value of umask (see
+.Xr umask 2 )
+to the specified octal value. If the argument is omitted, the umask value
+is printed.
+.It unalias Xo
+.Op Fl a
+.Op Ar name
+.Xc
+If
+.Ar name
+is specified, the shell removes that alias. If
+.Fl a
+is specified, all aliases are removed.
+.It unset Ar name...
+The specified variables and functions are unset and unexported. If a given
+name corresponds to both a variable and a function, both the variable and
+the function are unset.
+.It wait Op Ar job
+Wait for the specified job to complete and return the exit status of the
+last process in the job. If the argument is omitted, wait for all jobs to
+complete and the return an exit status of zero.
+.El
+.Ss Command Line Editing
+When
+.Nm
+is being used interactively from a terminal, the current command
+and the command history (see
+.Ic fc
+in
+.Sx Builtins )
+can be edited using vi-mode command-line editing. This mode uses commands,
+described below, similar to a subset of those described in the vi man
+page. The command
+.Ql set -o vi
+enables vi-mode editing and place sh into vi insert mode. With vi-mode
+enabled, sh can be switched between insert mode and command mode. The
+editor is not described in full here, but will be in a later document.
+It's similar to vi: typing
+.Aq ESC
+will throw you into command VI command mode. Hitting
+.Aq return
+while in command mode will pass the line to the shell.
+.Sh ENVIRONMENT
+.Bl -tag -width MAILCHECK
+.It Ev HOME
+Set automaticly by
+.Xr login 1
+from the user's login directory in the password file
+.Pq Xr passwd 4 .
+This environment variable also functions as the default argument for the
+cd builtin.
+.It Ev PATH
+The default search path for executables.  See the above section
+.Sx Path Search .
+.It Ev CDPATH
+The search path used with the cd builtin.
+.It Ev MAIL
+The name of a mail file, that will be checked for the arrival of new mail.
+Overridden by
+.Ev MAILPATH .
+.It Ev MAILCHECK
+The frequency in seconds that the shell checks for the arrival of mail
+in the files specified by the
+.Ev MAILPATH
+or the
+.Ev MAIL
+file.  If set to 0, the check will occur at each prompt.
+.It Ev MAILPATH
+A colon
+.Dq \&:
+separated list of file names, for the shell to check for incoming mail.
+This environment setting overrides the
+.Ev MAIL
+setting.  There is a maximum of 10 mailboxes that can be monitored at once.
+.It Ev PS1
+The primary prompt string, which defaults to
+.Dq $ \  ,
+unless you are the superuser, in which case it defaults to
+.Dq # \  .
+.It Ev PS2
+The secondary prompt string, which defaults to
+.Dq > \  .
+.It Ev IFS
+Input Field Separators.  This is normally set to <space> <tab> and
+<newline>.  See the
+.Sx White Space Splitting
+section for more details.
+.It Ev TERM
+The default terminal setting for the shell.  This is inherited by
+children of the shell, and is used in the history editing modes.
+.It Ev HISTSIZE
+The number of lines in the history buffer for the shell.
+.El
+.Sh FILES
+.Bl -item -width HOMEprofilexxxx
+.It
+.Pa $HOME/.profile
+.It
+.Pa /etc/profile
+.El
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr getopt 1 ,
+.Xr ksh 1 ,
+.Xr login 1 ,
+.Xr test 1 ,
+.Xr getopt 3 ,
+.Xr passwd 4 ,
+.Xr profile 4 ,
+.Xr environ 5
+.Xr sysctl 8
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v1 .
+It was, however, unmaintainable so we wrote this one.
+.Sh EXIT STATUS
+Errors that are detected by the shell, such as a syntax error, will cause the
+shell to exit with a non-zero exit status.  If the shell is not an
+interactive shell, the execution of the shell file will be aborted.  Otherwise
+the shell will return the exit status of the last command executed, or
+if the exit builtin is used with a numeric argument, it will return the
+argument.
+.Sh BUGS
+Setuid shell scripts should be avoided at all costs, as they are a
+significant security risk.

 /trunk/uspace/app/ash/lex.yy.c
 ,0 → 1,1904
+#line 3 "lex.yy.c"
+#define  YY_INT_ALIGNED short int
+/* A lexical scanner generated by flex */
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+/* First, we deal with  platform-specific or compiler-specific issues. */
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+/* end standard C headers. */
+/* flex integer type definitions */
+#ifndef FLEXINT_H
+#define FLEXINT_H
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+#if __STDC_VERSION__ >= 199901L
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types.
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t;
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+#endif /* ! FLEXINT_H */
+#ifdef __cplusplus
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+#else   /* ! __cplusplus */
+#if __STDC__
+#define YY_USE_CONST
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_END_OF_BUFFER_CHAR 0
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+extern int yyleng;
+extern FILE *yyin, *yyout;
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+    #define YY_LESS_LINENO(n)
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+    do \
+        { \
+        /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+        *yy_cp = (yy_hold_char); \
+        YY_RESTORE_YY_MORE_OFFSET \
+        (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+        YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+        } \
+    while ( 0 )
+#define unput(c) yyunput( c, (yytext_ptr)  )
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+    {
+    FILE *yy_input_file;
+    char *yy_ch_buf;        /* input buffer */
+    char *yy_buf_pos;       /* current position in input buffer */
+    /* Size of input buffer in bytes, not including room for EOB
+     * characters.
+     */
+    yy_size_t yy_buf_size;
+    /* Number of characters read into yy_ch_buf, not including EOB
+     * characters.
+     */
+    int yy_n_chars;
+    /* Whether we "own" the buffer - i.e., we know we created it,
+     * and can realloc() it to grow it, and should free() it to
+     * delete it.
+     */
+    int yy_is_our_buffer;
+    /* Whether this is an "interactive" input source; if so, and
+     * if we're using stdio for input, then we want to use getc()
+     * instead of fread(), to make sure we stop fetching input after
+     * each newline.
+     */
+    int yy_is_interactive;
+    /* Whether we're considered to be at the beginning of a line.
+     * If so, '^' rules will be active on the next match, otherwise
+     * not.
+     */
+    int yy_at_bol;
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    /* Whether to try to fill the input buffer when we reach the
+     * end of it.
+     */
+    int yy_fill_buffer;
+    int yy_buffer_status;
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+    /* When an EOF's been seen but there's still some text to process
+     * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+     * shouldn't try reading from the input source any more.  We might
+     * still have a bunch of tokens to match, though, because of
+     * possible backing-up.
+     *
+     * When we actually see the EOF, we change the status to "new"
+     * (via yyrestart()), so that the user can continue scanning by
+     * just pointing yyin at a new input file.
+     */
+#define YY_BUFFER_EOF_PENDING 2
+    };
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;      /* number of characters read into yy_ch_buf */
+int yyleng;
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;     /* whether we need to initialize */
+static int yy_start = 0;    /* start state number */
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+#define yy_new_buffer yy_create_buffer
+#define yy_set_interactive(is_interactive) \
+    { \
+    if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+        YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+    } \
+    YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+    }
+#define yy_set_bol(at_bol) \
+    { \
+    if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+        YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+    } \
+    YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+    }
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+/* Begin user sect3 */
+typedef unsigned char YY_CHAR;
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+typedef int yy_state_type;
+extern int yylineno;
+int yylineno = 1;
+extern char *yytext;
+#define yytext_ptr yytext
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+    (yytext_ptr) = yy_bp; \
+    yyleng = (size_t) (yy_cp - yy_bp); \
+    (yy_hold_char) = *yy_cp; \
+    *yy_cp = '\0'; \
+    (yy_c_buf_p) = yy_cp;
+#define YY_NUM_RULES 26
+#define YY_END_OF_BUFFER 27
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+    {
+    flex_int32_t yy_verify;
+    flex_int32_t yy_nxt;
+    };
+static yyconst flex_int16_t yy_accept[33] =
+    {   0,
+,    0,   27,   25,    1,    1,   24,   20,    9,    3,
+,   18,   21,   22,   19,    2,   14,   25,   12,    8,
+,   23,   11,    6,    2,   16,   15,   10,   13,   17,
+,    0
+    } ;
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    2,    4,    1,    1,    1,    5,    6,    1,    7,
+,    9,   10,    1,   11,    1,   12,   13,   13,   13,
+,   13,   13,   13,   13,   13,   13,    1,    1,   14,
+,   16,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,   17,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,   18,    1,   19,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1
+    } ;
+static yyconst flex_int32_t yy_meta[20] =
+    {   0,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1
+    } ;
+static yyconst flex_int16_t yy_base[33] =
+    {   0,
+,    0,   30,   31,   31,   31,   14,   31,   22,   31,
+,   31,   31,   31,   31,   14,    6,   11,    7,   31,
+,   31,   31,   31,   11,   31,   31,   31,   31,   31,
+,   31
+    } ;
+static yyconst flex_int16_t yy_def[33] =
+    {   0,
+,    1,   32,   32,   32,   32,   32,   32,   32,   32,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+,    0
+    } ;
+static yyconst flex_int16_t yy_nxt[51] =
+    {   0,
+,    5,    6,    7,    8,    9,   10,   11,   12,   13,
+,   15,   16,   17,   18,   19,   20,   21,   22,   26,
+,   29,   30,   25,   31,   28,   25,   24,   23,   32,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32
+    } ;
+static yyconst flex_int16_t yy_chk[51] =
+    {   0,
+,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+,    1,    1,    1,    1,    1,    1,    1,    1,   17,
+,   19,   19,   25,   21,   18,   16,    9,    7,    3,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+,   32,   32,   32,   32,   32,   32,   32,   32,   32
+    } ;
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "arith_lex.l"
+#line 2 "arith_lex.l"
+/*  $NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $");
+#endif
+#endif /* not lint */
+#include <unistd.h>
+#include "arith.h"
+#include "error.h"
+#include "expand.h"
+extern int yylval;
+extern char *arith_buf, *arith_startbuf;
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max) \
+    result = (*buf = *arith_buf++) ? 1 : YY_NULL;
+#define YY_NO_UNPUT
+#line 530 "lex.yy.c"
+#define INITIAL 0
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+static int yy_init_globals (void );
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+    static void yyunput (int c,char *buf_ptr  );
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+#endif
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#endif
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+    if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+        { \
+        int c = '*'; \
+        size_t n; \
+        for ( n = 0; n < max_size && \
+                 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+            buf[n] = (char) c; \
+        if ( c == '\n' ) \
+            buf[n++] = (char) c; \
+        if ( c == EOF && ferror( yyin ) ) \
+            YY_FATAL_ERROR( "input in flex scanner failed" ); \
+        result = n; \
+        } \
+    else \
+        { \
+        errno=0; \
+        while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+            { \
+            if( errno != EINTR) \
+                { \
+                YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                break; \
+                } \
+            errno=0; \
+            clearerr(yyin); \
+            } \
+        }\
+\
+#endif
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+/* end tables serialization structures and prototypes */
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+extern int yylex (void);
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+#define YY_RULE_SETUP \
+    YY_USER_ACTION
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+    register yy_state_type yy_current_state;
+    register char *yy_cp, *yy_bp;
+    register int yy_act;
+#line 62 "arith_lex.l"
+#line 685 "lex.yy.c"
+    if ( !(yy_init) )
+        {
+        (yy_init) = 1;
+#ifdef YY_USER_INIT
+        YY_USER_INIT;
+#endif
+        if ( ! (yy_start) )
+            (yy_start) = 1; /* first start state */
+        if ( ! yyin )
+            yyin = stdin;
+        if ( ! yyout )
+            yyout = stdout;
+        if ( ! YY_CURRENT_BUFFER ) {
+            yyensure_buffer_stack ();
+            YY_CURRENT_BUFFER_LVALUE =
+                yy_create_buffer(yyin,YY_BUF_SIZE );
+        }
+        yy_load_buffer_state( );
+        }
+    while ( 1 )     /* loops until end-of-file is reached */
+        {
+        yy_cp = (yy_c_buf_p);
+        /* Support of yytext. */
+        *yy_cp = (yy_hold_char);
+        /* yy_bp points to the position in yy_ch_buf of the start of
+         * the current run.
+         */
+        yy_bp = yy_cp;
+        yy_current_state = (yy_start);
+yy_match:
+        do
+            {
+            register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+            if ( yy_accept[yy_current_state] )
+                {
+                (yy_last_accepting_state) = yy_current_state;
+                (yy_last_accepting_cpos) = yy_cp;
+                }
+            while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                {
+                yy_current_state = (int) yy_def[yy_current_state];
+                if ( yy_current_state >= 33 )
+                    yy_c = yy_meta[(unsigned int) yy_c];
+                }
+            yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+            ++yy_cp;
+            }
+        while ( yy_base[yy_current_state] != 31 );
+yy_find_action:
+        yy_act = yy_accept[yy_current_state];
+        if ( yy_act == 0 )
+            { /* have to back up */
+            yy_cp = (yy_last_accepting_cpos);
+            yy_current_state = (yy_last_accepting_state);
+            yy_act = yy_accept[yy_current_state];
+            }
+        YY_DO_BEFORE_ACTION;
+do_action:  /* This label is used only to access EOF actions. */
+        switch ( yy_act )
+    { /* beginning of action switch */
+            case 0: /* must back up */
+            /* undo the effects of YY_DO_BEFORE_ACTION */
+            *yy_cp = (yy_hold_char);
+            yy_cp = (yy_last_accepting_cpos);
+            yy_current_state = (yy_last_accepting_state);
+            goto yy_find_action;
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 63 "arith_lex.l"
+{ ; }
+    YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 64 "arith_lex.l"
+{ yylval = atol(yytext); return(ARITH_NUM); }
+    YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 65 "arith_lex.l"
+{ return(ARITH_LPAREN); }
+    YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 66 "arith_lex.l"
+{ return(ARITH_RPAREN); }
+    YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 67 "arith_lex.l"
+{ return(ARITH_OR); }
+    YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 68 "arith_lex.l"
+{ return(ARITH_AND); }
+    YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 69 "arith_lex.l"
+{ return(ARITH_BOR); }
+    YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 70 "arith_lex.l"
+{ return(ARITH_BXOR); }
+    YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 71 "arith_lex.l"
+{ return(ARITH_BAND); }
+    YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 72 "arith_lex.l"
+{ return(ARITH_EQ); }
+    YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 73 "arith_lex.l"
+{ return(ARITH_NE); }
+    YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 74 "arith_lex.l"
+{ return(ARITH_GT); }
+    YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 75 "arith_lex.l"
+{ return(ARITH_GE); }
+    YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 76 "arith_lex.l"
+{ return(ARITH_LT); }
+    YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 77 "arith_lex.l"
+{ return(ARITH_LE); }
+    YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 78 "arith_lex.l"
+{ return(ARITH_LSHIFT); }
+    YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 79 "arith_lex.l"
+{ return(ARITH_RSHIFT); }
+    YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 80 "arith_lex.l"
+{ return(ARITH_MUL); }
+    YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 81 "arith_lex.l"
+{ return(ARITH_DIV); }
+    YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 82 "arith_lex.l"
+{ return(ARITH_REM); }
+    YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 83 "arith_lex.l"
+{ return(ARITH_ADD); }
+    YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 84 "arith_lex.l"
+{ return(ARITH_SUB); }
+    YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 85 "arith_lex.l"
+{ return(ARITH_BNOT); }
+    YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 86 "arith_lex.l"
+{ return(ARITH_NOT); }
+    YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 87 "arith_lex.l"
+{ error("arith: syntax error: \"%s\"\n", arith_startbuf); }
+    YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 88 "arith_lex.l"
+ECHO;
+    YY_BREAK
+#line 899 "lex.yy.c"
+case YY_STATE_EOF(INITIAL):
+    yyterminate();
+    case YY_END_OF_BUFFER:
+        {
+        /* Amount of text matched not including the EOB char. */
+        int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+        /* Undo the effects of YY_DO_BEFORE_ACTION. */
+        *yy_cp = (yy_hold_char);
+        YY_RESTORE_YY_MORE_OFFSET
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+            {
+            /* We're scanning a new file or input source.  It's
+             * possible that this happened because the user
+             * just pointed yyin at a new source and called
+             * yylex().  If so, then we have to assure
+             * consistency between YY_CURRENT_BUFFER and our
+             * globals.  Here is the right place to do so, because
+             * this is the first action (other than possibly a
+             * back-up) that will match for the new input source.
+             */
+            (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+            YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+            YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+            }
+        /* Note that here we test for yy_c_buf_p "<=" to the position
+         * of the first EOB in the buffer, since yy_c_buf_p will
+         * already have been incremented past the NUL character
+         * (since all states make transitions on EOB to the
+         * end-of-buffer state).  Contrast this with the test
+         * in input().
+         */
+        if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+            { /* This was really a NUL. */
+            yy_state_type yy_next_state;
+            (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+            yy_current_state = yy_get_previous_state(  );
+            /* Okay, we're now positioned to make the NUL
+             * transition.  We couldn't have
+             * yy_get_previous_state() go ahead and do it
+             * for us because it doesn't know how to deal
+             * with the possibility of jamming (and we don't
+             * want to build jamming into it because then it
+             * will run more slowly).
+             */
+            yy_next_state = yy_try_NUL_trans( yy_current_state );
+            yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+            if ( yy_next_state )
+                {
+                /* Consume the NUL. */
+                yy_cp = ++(yy_c_buf_p);
+                yy_current_state = yy_next_state;
+                goto yy_match;
+                }
+            else
+                {
+                yy_cp = (yy_c_buf_p);
+                goto yy_find_action;
+                }
+            }
+        else switch ( yy_get_next_buffer(  ) )
+            {
+            case EOB_ACT_END_OF_FILE:
+                {
+                (yy_did_buffer_switch_on_eof) = 0;
+                if ( yywrap( ) )
+                    {
+                    /* Note: because we've taken care in
+                     * yy_get_next_buffer() to have set up
+                     * yytext, we can now set up
+                     * yy_c_buf_p so that if some total
+                     * hoser (like flex itself) wants to
+                     * call the scanner after we return the
+                     * YY_NULL, it'll still work - another
+                     * YY_NULL will get returned.
+                     */
+                    (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+                    yy_act = YY_STATE_EOF(YY_START);
+                    goto do_action;
+                    }
+                else
+                    {
+                    if ( ! (yy_did_buffer_switch_on_eof) )
+                        YY_NEW_FILE;
+                    }
+                break;
+                }
+            case EOB_ACT_CONTINUE_SCAN:
+                (yy_c_buf_p) =
+                    (yytext_ptr) + yy_amount_of_matched_text;
+                yy_current_state = yy_get_previous_state(  );
+                yy_cp = (yy_c_buf_p);
+                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                goto yy_match;
+            case EOB_ACT_LAST_MATCH:
+                (yy_c_buf_p) =
+                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+                yy_current_state = yy_get_previous_state(  );
+                yy_cp = (yy_c_buf_p);
+                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                goto yy_find_action;
+            }
+        break;
+        }
+    default:
+        YY_FATAL_ERROR(
+            "fatal flex scanner internal error--no action found" );
+    } /* end of action switch */
+        } /* end of scanning one token */
+} /* end of yylex */
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *  EOB_ACT_LAST_MATCH -
+ *  EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *  EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+    register char *source = (yytext_ptr);
+    register int number_to_move, i;
+    int ret_val;
+    if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+        YY_FATAL_ERROR(
+        "fatal flex scanner internal error--end of buffer missed" );
+    if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+        { /* Don't try to fill the buffer, so this is an EOF. */
+        if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+            {
+            /* We matched a single character, the EOB, so
+             * treat this as a final EOF.
+             */
+            return EOB_ACT_END_OF_FILE;
+            }
+        else
+            {
+            /* We matched some text prior to the EOB, first
+             * process it.
+             */
+            return EOB_ACT_LAST_MATCH;
+            }
+        }
+    /* Try to read more data. */
+    /* First move last chars to start of buffer. */
+    number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+    for ( i = 0; i < number_to_move; ++i )
+        *(dest++) = *(source++);
+    if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+        /* don't do the read, it's not guaranteed to return an EOF,
+         * just force an EOF
+         */
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+    else
+        {
+            int num_to_read =
+            YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+        while ( num_to_read <= 0 )
+            { /* Not enough room in the buffer - grow it. */
+            /* just a shorter name for the current buffer */
+            YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+            int yy_c_buf_p_offset =
+                (int) ((yy_c_buf_p) - b->yy_ch_buf);
+            if ( b->yy_is_our_buffer )
+                {
+                int new_size = b->yy_buf_size * 2;
+                if ( new_size <= 0 )
+                    b->yy_buf_size += b->yy_buf_size / 8;
+                else
+                    b->yy_buf_size *= 2;
+                b->yy_ch_buf = (char *)
+                    /* Include room in for 2 EOB chars. */
+                    yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+                }
+            else
+                /* Can't grow it, we don't own it. */
+                b->yy_ch_buf = 0;
+            if ( ! b->yy_ch_buf )
+                YY_FATAL_ERROR(
+                "fatal error - scanner input buffer overflow" );
+            (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+            num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+                        number_to_move - 1;
+            }
+        if ( num_to_read > YY_READ_BUF_SIZE )
+            num_to_read = YY_READ_BUF_SIZE;
+        /* Read in more data. */
+        YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+            (yy_n_chars), num_to_read );
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+        }
+    if ( (yy_n_chars) == 0 )
+        {
+        if ( number_to_move == YY_MORE_ADJ )
+            {
+            ret_val = EOB_ACT_END_OF_FILE;
+            yyrestart(yyin  );
+            }
+        else
+            {
+            ret_val = EOB_ACT_LAST_MATCH;
+            YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                YY_BUFFER_EOF_PENDING;
+            }
+        }
+    else
+        ret_val = EOB_ACT_CONTINUE_SCAN;
+    (yy_n_chars) += number_to_move;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+    (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+    return ret_val;
+}
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+    static yy_state_type yy_get_previous_state (void)
+{
+    register yy_state_type yy_current_state;
+    register char *yy_cp;
+    yy_current_state = (yy_start);
+    for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+        {
+        register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+        if ( yy_accept[yy_current_state] )
+            {
+            (yy_last_accepting_state) = yy_current_state;
+            (yy_last_accepting_cpos) = yy_cp;
+            }
+        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+            {
+            yy_current_state = (int) yy_def[yy_current_state];
+            if ( yy_current_state >= 33 )
+                yy_c = yy_meta[(unsigned int) yy_c];
+            }
+        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+        }
+    return yy_current_state;
+}
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *  next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+    register int yy_is_jam;
+        register char *yy_cp = (yy_c_buf_p);
+    register YY_CHAR yy_c = 1;
+    if ( yy_accept[yy_current_state] )
+        {
+        (yy_last_accepting_state) = yy_current_state;
+        (yy_last_accepting_cpos) = yy_cp;
+        }
+    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+        {
+        yy_current_state = (int) yy_def[yy_current_state];
+        if ( yy_current_state >= 33 )
+            yy_c = yy_meta[(unsigned int) yy_c];
+        }
+    yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+    yy_is_jam = (yy_current_state == 32);
+    return yy_is_jam ? 0 : yy_current_state;
+}
+    static void yyunput (int c, register char * yy_bp )
+{
+    register char *yy_cp;
+    yy_cp = (yy_c_buf_p);
+    /* undo effects of setting up yytext */
+    *yy_cp = (yy_hold_char);
+    if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+        { /* need to shift things up to make room */
+        /* +2 for EOB chars. */
+        register int number_to_move = (yy_n_chars) + 2;
+        register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+                    YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+        register char *source =
+                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+        while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+            *--dest = *--source;
+        yy_cp += (int) (dest - source);
+        yy_bp += (int) (dest - source);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+            (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+        if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+            YY_FATAL_ERROR( "flex scanner push-back overflow" );
+        }
+    *--yy_cp = (char) c;
+    (yytext_ptr) = yy_bp;
+    (yy_hold_char) = *yy_cp;
+    (yy_c_buf_p) = yy_cp;
+}
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+{
+    int c;
+    *(yy_c_buf_p) = (yy_hold_char);
+    if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+        {
+        /* yy_c_buf_p now points to the character we want to return.
+         * If this occurs *before* the EOB characters, then it's a
+         * valid NUL; if not, then we've hit the end of the buffer.
+         */
+        if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+            /* This was really a NUL. */
+            *(yy_c_buf_p) = '\0';
+        else
+            { /* need more input */
+            int offset = (yy_c_buf_p) - (yytext_ptr);
+            ++(yy_c_buf_p);
+            switch ( yy_get_next_buffer(  ) )
+                {
+                case EOB_ACT_LAST_MATCH:
+                    /* This happens because yy_g_n_b()
+                     * sees that we've accumulated a
+                     * token and flags that we need to
+                     * try matching the token before
+                     * proceeding.  But for input(),
+                     * there's no matching to consider.
+                     * So convert the EOB_ACT_LAST_MATCH
+                     * to EOB_ACT_END_OF_FILE.
+                     */
+                    /* Reset buffer status. */
+                    yyrestart(yyin );
+                    /*FALLTHROUGH*/
+                case EOB_ACT_END_OF_FILE:
+                    {
+                    if ( yywrap( ) )
+                        return EOF;
+                    if ( ! (yy_did_buffer_switch_on_eof) )
+                        YY_NEW_FILE;
+#ifdef __cplusplus
+                    return yyinput();
+#else
+                    return input();
+#endif
+                    }
+                case EOB_ACT_CONTINUE_SCAN:
+                    (yy_c_buf_p) = (yytext_ptr) + offset;
+                    break;
+                }
+            }
+        }
+    c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+    *(yy_c_buf_p) = '\0';   /* preserve yytext */
+    (yy_hold_char) = *++(yy_c_buf_p);
+    return c;
+}
+#endif  /* ifndef YY_NO_INPUT */
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ *
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+        YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+    }
+    yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+    yy_load_buffer_state( );
+}
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ *
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    /* TODO. We should be able to replace this entire function body
+     * with
+     *      yypop_buffer_state();
+     *      yypush_buffer_state(new_buffer);
+     */
+    yyensure_buffer_stack ();
+    if ( YY_CURRENT_BUFFER == new_buffer )
+        return;
+    if ( YY_CURRENT_BUFFER )
+        {
+        /* Flush out information for old buffer. */
+        *(yy_c_buf_p) = (yy_hold_char);
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+        }
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+    yy_load_buffer_state( );
+    /* We don't actually know whether we did this switch during
+     * EOF (yywrap()) processing, but the only time this flag
+     * is looked at is after yywrap() is called, so it's safe
+     * to go ahead and always set it.
+     */
+    (yy_did_buffer_switch_on_eof) = 1;
+}
+static void yy_load_buffer_state  (void)
+{
+        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+    (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+    yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+    (yy_hold_char) = *(yy_c_buf_p);
+}
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ *
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+    YY_BUFFER_STATE b;
+    b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+    if ( ! b )
+        YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+    b->yy_buf_size = size;
+    /* yy_ch_buf has to be 2 characters longer than the size given because
+     * we need to put in 2 end-of-buffer characters.
+     */
+    b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+    if ( ! b->yy_ch_buf )
+        YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+    b->yy_is_our_buffer = 1;
+    yy_init_buffer(b,file );
+    return b;
+}
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ *
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    if ( ! b )
+        return;
+    if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+        YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+    if ( b->yy_is_our_buffer )
+        yyfree((void *) b->yy_ch_buf  );
+    yyfree((void *) b  );
+}
+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __THROW /* this is a gnuism */
+extern int isatty (int ) __THROW;
+#else
+extern int isatty (int );
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+{
+    int oerrno = errno;
+    yy_flush_buffer(b );
+    b->yy_input_file = file;
+    b->yy_fill_buffer = 1;
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    errno = oerrno;
+}
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ *
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+        if ( ! b )
+        return;
+    b->yy_n_chars = 0;
+    /* We always need two end-of-buffer characters.  The first causes
+     * a transition to the end-of-buffer state.  The second causes
+     * a jam in that state.
+     */
+    b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+    b->yy_buf_pos = &b->yy_ch_buf[0];
+    b->yy_at_bol = 1;
+    b->yy_buffer_status = YY_BUFFER_NEW;
+    if ( b == YY_CURRENT_BUFFER )
+        yy_load_buffer_state( );
+}
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+        if (new_buffer == NULL)
+        return;
+    yyensure_buffer_stack();
+    /* This block is copied from yy_switch_to_buffer. */
+    if ( YY_CURRENT_BUFFER )
+        {
+        /* Flush out information for old buffer. */
+        *(yy_c_buf_p) = (yy_hold_char);
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+        }
+    /* Only push if top exists. Otherwise, replace top. */
+    if (YY_CURRENT_BUFFER)
+        (yy_buffer_stack_top)++;
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+    /* copied from yy_switch_to_buffer. */
+    yy_load_buffer_state( );
+    (yy_did_buffer_switch_on_eof) = 1;
+}
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *
+ */
+void yypop_buffer_state (void)
+{
+        if (!YY_CURRENT_BUFFER)
+        return;
+    yy_delete_buffer(YY_CURRENT_BUFFER );
+    YY_CURRENT_BUFFER_LVALUE = NULL;
+    if ((yy_buffer_stack_top) > 0)
+        --(yy_buffer_stack_top);
+    if (YY_CURRENT_BUFFER) {
+        yy_load_buffer_state( );
+        (yy_did_buffer_switch_on_eof) = 1;
+    }
+}
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+    int num_to_alloc;
+    if (!(yy_buffer_stack)) {
+        /* First allocation is just for 2 elements, since we don't know if this
+         * scanner will even need a stack. We use 2 instead of 1 to avoid an
+         * immediate realloc on the next call.
+         */
+        num_to_alloc = 1;
+        (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                );
+        memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+        (yy_buffer_stack_max) = num_to_alloc;
+        (yy_buffer_stack_top) = 0;
+        return;
+    }
+    if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+        /* Increase the buffer to prepare for a possible push. */
+        int grow_size = 8 /* arbitrary grow size */;
+        num_to_alloc = (yy_buffer_stack_max) + grow_size;
+        (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+                                ((yy_buffer_stack),
+                                num_to_alloc * sizeof(struct yy_buffer_state*)
+                                );
+        /* zero only the new slots.*/
+        memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+        (yy_buffer_stack_max) = num_to_alloc;
+    }
+}
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ *
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+    YY_BUFFER_STATE b;
+    if ( size < 2 ||
+         base[size-2] != YY_END_OF_BUFFER_CHAR ||
+         base[size-1] != YY_END_OF_BUFFER_CHAR )
+        /* They forgot to leave room for the EOB's. */
+        return 0;
+    b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+    if ( ! b )
+        YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+    b->yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
+    b->yy_buf_pos = b->yy_ch_buf = base;
+    b->yy_is_our_buffer = 0;
+    b->yy_input_file = 0;
+    b->yy_n_chars = b->yy_buf_size;
+    b->yy_is_interactive = 0;
+    b->yy_at_bol = 1;
+    b->yy_fill_buffer = 0;
+    b->yy_buffer_status = YY_BUFFER_NEW;
+    yy_switch_to_buffer(b  );
+    return b;
+}
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ *
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    return yy_scan_bytes(yystr,strlen(yystr) );
+}
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ *
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+    YY_BUFFER_STATE b;
+    char *buf;
+    yy_size_t n;
+    int i;
+    /* Get memory for full buffer, including space for trailing EOB's. */
+    n = _yybytes_len + 2;
+    buf = (char *) yyalloc(n  );
+    if ( ! buf )
+        YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+    for ( i = 0; i < _yybytes_len; ++i )
+        buf[i] = yybytes[i];
+    buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+    b = yy_scan_buffer(buf,n );
+    if ( ! b )
+        YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+    /* It's okay to grow etc. this buffer, and we should throw it
+     * away when we're done.
+     */
+    b->yy_is_our_buffer = 1;
+    return b;
+}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+static void yy_fatal_error (yyconst char* msg )
+{
+        (void) fprintf( stderr, "%s\n", msg );
+    exit( YY_EXIT_FAILURE );
+}
+/* Redefine yyless() so it works in section 3 code. */
+#undef yyless
+#define yyless(n) \
+    do \
+        { \
+        /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+        yytext[yyleng] = (yy_hold_char); \
+        (yy_c_buf_p) = yytext + yyless_macro_arg; \
+        (yy_hold_char) = *(yy_c_buf_p); \
+        *(yy_c_buf_p) = '\0'; \
+        yyleng = yyless_macro_arg; \
+        } \
+    while ( 0 )
+/* Accessor  methods (get/set functions) to struct members. */
+/** Get the current line number.
+ *
+ */
+int yyget_lineno  (void)
+{
+    return yylineno;
+}
+/** Get the input stream.
+ *
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+/** Get the output stream.
+ *
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+/** Get the length of the current token.
+ *
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
+/** Get the current token.
+ *
+ */
+char *yyget_text  (void)
+{
+        return yytext;
+}
+/** Set the current line number.
+ * @param line_number
+ *
+ */
+void yyset_lineno (int  line_number )
+{
+    yylineno = line_number;
+}
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ *
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    /* Pop the buffer stack, destroying each element. */
+    while(YY_CURRENT_BUFFER){
+        yy_delete_buffer(YY_CURRENT_BUFFER  );
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        yypop_buffer_state();
+    }
+    /* Destroy the stack itself. */
+    yyfree((yy_buffer_stack) );
+    (yy_buffer_stack) = NULL;
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+    return 0;
+}
+/*
+ * Internal utility routines.
+ */
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+    register int i;
+    for ( i = 0; i < n; ++i )
+        s1[i] = s2[i];
+}
+#endif
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+    register int n;
+    for ( n = 0; s[n]; ++n )
+        ;
+    return n;
+}
+#endif
+void *yyalloc (yy_size_t  size )
+{
+    return (void *) malloc( size );
+}
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+    /* The cast to (char *) in the following accommodates both
+     * implementations that use char* generic pointers, and those
+     * that use void* generic pointers.  It works with the latter
+     * because both ANSI C and C++ allow castless assignment from
+     * any pointer type to void*, and deal with argument conversions
+     * as though doing an assignment.
+     */
+    return (void *) realloc( (char *) ptr, size );
+}
+void yyfree (void * ptr )
+{
+    free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
+}
+#define YYTABLES_NAME "yytables"
+#line 88 "arith_lex.l"
+void
+arith_lex_reset() {
+#ifdef YY_NEW_FILE
+    YY_NEW_FILE;
+#endif
+}

 /trunk/uspace/app/ash/nodetypes
 ,0 → 1,147
+#   $NetBSD: nodetypes,v 1.9 1999/02/04 16:17:39 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)nodetypes   8.2 (Berkeley) 5/4/95
+# This file describes the nodes used in parse trees.  Unindented lines
+# contain a node type followed by a structure tag.  Subsequent indented
+# lines specify the fields of the structure.  Several node types can share
+# the same structure, in which case the fields of the structure should be
+# specified only once.
+#
+# A field of a structure is described by the name of the field followed
+# by a type.  The currently implemented types are:
+#   nodeptr - a pointer to a node
+#   nodelist - a pointer to a list of nodes
+#   string - a pointer to a nul terminated string
+#   int - an integer
+#   other - any type that can be copied by assignment
+#   temp - a field that doesn't have to be copied when the node is copied
+# The last two types should be followed by the text of a C declaration for
+# the field.
+NSEMI nbinary           # two commands separated by a semicolon
+    type      int
+    ch1   nodeptr       # the first child
+    ch2   nodeptr       # the second child
+NCMD ncmd           # a simple command
+    type      int
+    backgnd   int           # set to run command in background
+    args      nodeptr       # the arguments
+    redirect  nodeptr       # list of file redirections
+NPIPE npipe         # a pipeline
+    type      int
+    backgnd   int           # set to run pipeline in background
+    cmdlist   nodelist      # the commands in the pipeline
+NREDIR nredir           # redirection (of a compex command)
+    type      int
+    n     nodeptr       # the command
+    redirect  nodeptr       # list of file redirections
+NBACKGND nredir         # run command in background
+NSUBSHELL nredir        # run command in a subshell
+NAND nbinary            # the && operator
+NOR nbinary         # the || operator
+NIF nif             # the if statement.  Elif clauses are handled
+    type      int           # using multiple if nodes.
+    test      nodeptr       # if test
+    ifpart    nodeptr       # then ifpart
+    elsepart  nodeptr       # else elsepart
+NWHILE nbinary          # the while statement.  First child is the test
+NUNTIL nbinary          # the until statement
+NFOR nfor           # the for statement
+    type      int
+    args      nodeptr       # for var in args
+    body      nodeptr       # do body; done
+    var   string        # the for variable
+NCASE ncase         # a case statement
+    type      int
+    expr      nodeptr       # the word to switch on
+    cases     nodeptr       # the list of cases (NCLIST nodes)
+NCLIST nclist           # a case
+    type      int
+    next      nodeptr       # the next case in list
+    pattern   nodeptr       # list of patterns for this case
+    body      nodeptr       # code to execute for this case
+NDEFUN narg         # define a function.  The "next" field contains
+                # the body of the function.
+NARG narg           # represents a word
+    type      int
+    next      nodeptr       # next word in list
+    text      string        # the text of the word
+    backquote nodelist      # list of commands in back quotes
+NTO nfile           # fd> fname
+NFROM nfile         # fd< fname
+NFROMTO nfile           # fd<> fname
+NAPPEND nfile           # fd>> fname
+NTOOV nfile         # fd>| fname
+    type      int
+    next      nodeptr       # next redirection in list
+    fd    int           # file descriptor being redirected
+    fname     nodeptr       # file name, in a NARG node
+    expfname  temp  char *expfname  # actual file name
+NTOFD ndup          # fd<&dupfd
+NFROMFD ndup            # fd>&dupfd
+    type      int
+    next      nodeptr       # next redirection in list
+    fd    int           # file descriptor being redirected
+    dupfd     int           # file descriptor to duplicate
+    vname     nodeptr       # file name if fd>&$var
+NHERE nhere         # fd<<\!
+NXHERE nhere            # fd<<!
+    type      int
+    next      nodeptr       # next redirection in list
+    fd    int           # file descriptor being redirected
+    doc   nodeptr       # input to command (NARG node)
+NNOT nnot           # ! command  (actually pipeline)
+    type    int
+    com nodeptr

 /trunk/uspace/app/ash/error.c
 ,0 → 1,301
+/*  $NetBSD: error.c,v 1.23 2000/07/03 03:26:19 matt Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: error.c,v 1.23 2000/07/03 03:26:19 matt Exp $");
+#endif
+#endif /* not lint */
+/*
+ * Errors and exceptions.
+ */
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include "shell.h"
+#include "main.h"
+#include "options.h"
+#include "output.h"
+#include "error.h"
+#include "show.h"
+/*
+ * Code to handle exceptions in C.
+ */
+struct jmploc *handler;
+int exception;
+volatile int suppressint;
+volatile int intpending;
+char *commandname;
+static void exverror (int, const char *, va_list)
+    __attribute__((__noreturn__));
+/*
+ * Called to raise an exception.  Since C doesn't include exceptions, we
+ * just do a longjmp to the exception handler.  The type of exception is
+ * stored in the global variable "exception".
+ */
+void
+exraise(e)
+    int e;
+{
+    if (handler == NULL)
+        abort();
+    exception = e;
+    longjmp(handler->loc, 1);
+}
+/*
+ * Called from trap.c when a SIGINT is received.  (If the user specifies
+ * that SIGINT is to be trapped or ignored using the trap builtin, then
+ * this routine is not called.)  Suppressint is nonzero when interrupts
+ * are held using the INTOFF macro.  The call to _exit is necessary because
+ * there is a short period after a fork before the signal handlers are
+ * set to the appropriate value for the child.  (The test for iflag is
+ * just defensive programming.)
+ */
+void
+onint() {
+    sigset_t sigset;
+    if (suppressint) {
+        intpending++;
+        return;
+    }
+    intpending = 0;
+    sigemptyset(&sigset);
+    sigprocmask(SIG_SETMASK, &sigset, NULL);
+    if (rootshell && iflag)
+        exraise(EXINT);
+    else {
+        signal(SIGINT, SIG_DFL);
+        raise(SIGINT);
+    }
+    /* NOTREACHED */
+}
+/*
+ * Exverror is called to raise the error exception.  If the first argument
+ * is not NULL then error prints an error message using printf style
+ * formatting.  It then raises the error exception.
+ */
+static void
+exverror(cond, msg, ap)
+    int cond;
+    const char *msg;
+    va_list ap;
+{
+    CLEAR_PENDING_INT;
+    INTOFF;
+#ifdef DEBUG
+    if (msg)
+        TRACE(("exverror(%d, \"%s\") pid=%d\n", cond, msg, getpid()));
+    else
+        TRACE(("exverror(%d, NULL) pid=%d\n", cond, getpid()));
+#endif
+    if (msg) {
+        if (commandname)
+            outfmt(&errout, "%s: ", commandname);
+        doformat(&errout, msg, ap);
+        out2c('\n');
+    }
+    flushall();
+    exraise(cond);
+    /* NOTREACHED */
+}
+#ifdef __STDC__
+void
+error(const char *msg, ...)
+#else
+void
+error(va_alist)
+    va_dcl
+#endif
+{
+#ifndef __STDC__
+    const char *msg;
+#endif
+    va_list ap;
+#ifdef __STDC__
+    va_start(ap, msg);
+#else
+    va_start(ap);
+    msg = va_arg(ap, const char *);
+#endif
+    exverror(EXERROR, msg, ap);
+    /* NOTREACHED */
+    va_end(ap);
+}
+#ifdef __STDC__
+void
+exerror(int cond, const char *msg, ...)
+#else
+void
+exerror(va_alist)
+    va_dcl
+#endif
+{
+#ifndef __STDC__
+    int cond;
+    const char *msg;
+#endif
+    va_list ap;
+#ifdef __STDC__
+    va_start(ap, msg);
+#else
+    va_start(ap);
+    cond = va_arg(ap, int);
+    msg = va_arg(ap, const char *);
+#endif
+    exverror(cond, msg, ap);
+    /* NOTREACHED */
+    va_end(ap);
+}
+/*
+ * Table of error messages.
+ */
+struct errname {
+    short errcode;      /* error number */
+    short action;       /* operation which encountered the error */
+    const char *msg;    /* text describing the error */
+};
+#define ALL (E_OPEN|E_CREAT|E_EXEC)
+STATIC const struct errname errormsg[] = {
+    { EINTR,    ALL,    "interrupted" },
+    { EACCES,   ALL,    "permission denied" },
+    { EIO,      ALL,    "I/O error" },
+    { ENOENT,   E_OPEN, "no such file" },
+    { ENOENT,   E_CREAT,"directory nonexistent" },
+    { ENOENT,   E_EXEC, "not found" },
+    { ENOTDIR,  E_OPEN, "no such file" },
+    { ENOTDIR,  E_CREAT,"directory nonexistent" },
+    { ENOTDIR,  E_EXEC, "not found" },
+    { EISDIR,   ALL,    "is a directory" },
+    { EEXIST,   E_CREAT,"file exists" },
+#ifdef notdef
+    { EMFILE,   ALL,    "too many open files" },
+#endif
+    { ENFILE,   ALL,    "file table overflow" },
+    { ENOSPC,   ALL,    "file system full" },
+#ifdef EDQUOT
+    { EDQUOT,   ALL,    "disk quota exceeded" },
+#endif
+#ifdef ENOSR
+    { ENOSR,    ALL,    "no streams resources" },
+#endif
+    { ENXIO,    ALL,    "no such device or address" },
+    { EROFS,    ALL,    "read-only file system" },
+    { ETXTBSY,  ALL,    "text busy" },
+#ifdef SYSV
+    { EAGAIN,   E_EXEC, "not enough memory" },
+#endif
+    { ENOMEM,   ALL,    "not enough memory" },
+#ifdef ENOLINK
+    { ENOLINK,  ALL,    "remote access failed" },
+#endif
+#ifdef EMULTIHOP
+    { EMULTIHOP,    ALL,    "remote access failed" },
+#endif
+#ifdef ECOMM
+    { ECOMM,    ALL,    "remote access failed" },
+#endif
+#ifdef ESTALE
+    { ESTALE,   ALL,    "remote access failed" },
+#endif
+#ifdef ETIMEDOUT
+    { ETIMEDOUT,    ALL,    "remote access failed" },
+#endif
+#ifdef ELOOP
+    { ELOOP,    ALL,    "symbolic link loop" },
+#endif
+    { E2BIG,    E_EXEC, "argument list too long" },
+#ifdef ELIBACC
+    { ELIBACC,  E_EXEC, "shared library missing" },
+#endif
+    { 0,        0,  NULL },
+};
+/*
+ * Return a string describing an error.  The returned string may be a
+ * pointer to a static buffer that will be overwritten on the next call.
+ * Action describes the operation that got the error.
+ */
+const char *
+errmsg(e, action)
+    int e;
+    int action;
+{
+    struct errname const *ep;
+    static char buf[12];
+    for (ep = errormsg ; ep->errcode ; ep++) {
+        if (ep->errcode == e && (ep->action & action) != 0)
+            return ep->msg;
+    }
+    fmtstr(buf, sizeof buf, "error %d", e);
+    return buf;
+}

 /trunk/uspace/app/ash/error.h
 ,0 → 1,109
+/*  $NetBSD: error.h,v 1.13 1999/07/09 03:05:49 christos Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)error.h 8.2 (Berkeley) 5/4/95
+ */
+/*
+ * Types of operations (passed to the errmsg routine).
+ */
+#define E_OPEN 01   /* opening a file */
+#define E_CREAT 02  /* creating a file */
+#define E_EXEC 04   /* executing a program */
+/*
+ * We enclose jmp_buf in a structure so that we can declare pointers to
+ * jump locations.  The global variable handler contains the location to
+ * jump to when an exception occurs, and the global variable exception
+ * contains a code identifying the exeception.  To implement nested
+ * exception handlers, the user should save the value of handler on entry
+ * to an inner scope, set handler to point to a jmploc structure for the
+ * inner scope, and restore handler on exit from the scope.
+ */
+#include <setjmp.h>
+#include "fake.h"
+struct jmploc {
+    jmp_buf loc;
+};
+extern struct jmploc *handler;
+extern int exception;
+/* exceptions */
+#define EXINT 0     /* SIGINT received */
+#define EXERROR 1   /* a generic error */
+#define EXSHELLPROC 2   /* execute a shell procedure */
+#define EXEXEC 3    /* command execution failed */
+/*
+ * These macros allow the user to suspend the handling of interrupt signals
+ * over a period of time.  This is similar to SIGHOLD to or sigblock, but
+ * much more efficient and portable.  (But hacking the kernel is so much
+ * more fun than worrying about efficiency and portability. :-))
+ */
+extern volatile int suppressint;
+extern volatile int intpending;
+extern char *commandname;   /* name of command--printed on error */
+#define INTOFF suppressint++
+#define INTON { if (--suppressint == 0 && intpending) onint(); }
+#define FORCEINTON {suppressint = 0; if (intpending) onint();}
+#define CLEAR_PENDING_INT intpending = 0
+#define int_pending() intpending
+void exraise (int) __attribute__((__noreturn__));
+void onint (void);
+void error (const char *, ...) __attribute__((__noreturn__));
+void exerror (int, const char *, ...) __attribute__((__noreturn__));
+const char *errmsg (int, int);
+/*
+ * BSD setjmp saves the signal mask, which violates ANSI C and takes time,
+ * so we use _setjmp instead.
+ */
+#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__)
+#define setjmp(jmploc)  _setjmp(jmploc)
+#define longjmp(jmploc, val)    _longjmp(jmploc, val)
+#endif

 /trunk/uspace/app/ash/machdep.h
 ,0 → 1,53
+/*  $NetBSD: machdep.h,v 1.8 1995/05/11 21:29:21 christos Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)machdep.h   8.2 (Berkeley) 5/4/95
+ */
+/*
+ * Most machines require the value returned from malloc to be aligned
+ * in some way.  The following macro will get this right on many machines.
+ */
+#ifndef ALIGN
+union align {
+    int i;
+    char *cp;
+};
+#define ALIGN(nbytes)   (((nbytes) + sizeof(union align) - 1) & ~(sizeof(union align) - 1))
+#endif

 /trunk/uspace/app/ash/TOUR
 ,0 → 1,357
+#   $NetBSD: TOUR,v 1.8 1996/10/16 14:24:56 christos Exp $
+#   @(#)TOUR    8.1 (Berkeley) 5/31/93
+NOTE -- This is the original TOUR paper distributed with ash and
+does not represent the current state of the shell.  It is provided anyway
+since it provides helpful information for how the shell is structured,
+but be warned that things have changed -- the current shell is
+still under development.
+================================================================
+                       A Tour through Ash
+               Copyright 1989 by Kenneth Almquist.
+DIRECTORIES:  The subdirectory bltin contains commands which can
+be compiled stand-alone.  The rest of the source is in the main
+ash directory.
+SOURCE CODE GENERATORS:  Files whose names begin with "mk" are
+programs that generate source code.  A complete list of these
+programs is:
+        program         intput files        generates
+        -------         ------------        ---------
+        mkbuiltins      builtins            builtins.h builtins.c
+        mkinit          *.c                 init.c
+        mknodes         nodetypes           nodes.h nodes.c
+        mksignames          -               signames.h signames.c
+        mksyntax            -               syntax.h syntax.c
+        mktokens            -               token.h
+        bltin/mkexpr    unary_op binary_op  operators.h operators.c
+There are undoubtedly too many of these.  Mkinit searches all the
+C source files for entries looking like:
+        INIT {
+              x = 1;    /* executed during initialization */
+        }
+        RESET {
+              x = 2;    /* executed when the shell does a longjmp
+                           back to the main command loop */
+        }
+        SHELLPROC {
+              x = 3;    /* executed when the shell runs a shell procedure */
+        }
+It pulls this code out into routines which are when particular
+events occur.  The intent is to improve modularity by isolating
+the information about which modules need to be explicitly
+initialized/reset within the modules themselves.
+Mkinit recognizes several constructs for placing declarations in
+the init.c file.
+        INCLUDE "file.h"
+includes a file.  The storage class MKINIT makes a declaration
+available in the init.c file, for example:
+        MKINIT int funcnest;    /* depth of function calls */
+MKINIT alone on a line introduces a structure or union declara-
+tion:
+        MKINIT
+        struct redirtab {
+              short renamed[10];
+        };
+Preprocessor #define statements are copied to init.c without any
+special action to request this.
+INDENTATION:  The ash source is indented in multiples of six
+spaces.  The only study that I have heard of on the subject con-
+cluded that the optimal amount to indent is in the range of four
+to six spaces.  I use six spaces since it is not too big a jump
+from the widely used eight spaces.  If you really hate six space
+indentation, use the adjind (source included) program to change
+it to something else.
+EXCEPTIONS:  Code for dealing with exceptions appears in
+exceptions.c.  The C language doesn't include exception handling,
+so I implement it using setjmp and longjmp.  The global variable
+exception contains the type of exception.  EXERROR is raised by
+calling error.  EXINT is an interrupt.  EXSHELLPROC is an excep-
+tion which is raised when a shell procedure is invoked.  The pur-
+pose of EXSHELLPROC is to perform the cleanup actions associated
+with other exceptions.  After these cleanup actions, the shell
+can interpret a shell procedure itself without exec'ing a new
+copy of the shell.
+INTERRUPTS:  In an interactive shell, an interrupt will cause an
+EXINT exception to return to the main command loop.  (Exception:
+EXINT is not raised if the user traps interrupts using the trap
+command.)  The INTOFF and INTON macros (defined in exception.h)
+provide uninterruptable critical sections.  Between the execution
+of INTOFF and the execution of INTON, interrupt signals will be
+held for later delivery.  INTOFF and INTON can be nested.
+MEMALLOC.C:  Memalloc.c defines versions of malloc and realloc
+which call error when there is no memory left.  It also defines a
+stack oriented memory allocation scheme.  Allocating off a stack
+is probably more efficient than allocation using malloc, but the
+big advantage is that when an exception occurs all we have to do
+to free up the memory in use at the time of the exception is to
+restore the stack pointer.  The stack is implemented using a
+linked list of blocks.
+STPUTC:  If the stack were contiguous, it would be easy to store
+strings on the stack without knowing in advance how long the
+string was going to be:
+        p = stackptr;
+        *p++ = c;       /* repeated as many times as needed */
+        stackptr = p;
+The folloing three macros (defined in memalloc.h) perform these
+operations, but grow the stack if you run off the end:
+        STARTSTACKSTR(p);
+        STPUTC(c, p);   /* repeated as many times as needed */
+        grabstackstr(p);
+We now start a top-down look at the code:
+MAIN.C:  The main routine performs some initialization, executes
+the user's profile if necessary, and calls cmdloop.  Cmdloop is
+repeatedly parses and executes commands.
+OPTIONS.C:  This file contains the option processing code.  It is
+called from main to parse the shell arguments when the shell is
+invoked, and it also contains the set builtin.  The -i and -j op-
+tions (the latter turns on job control) require changes in signal
+handling.  The routines setjobctl (in jobs.c) and setinteractive
+(in trap.c) are called to handle changes to these options.
+PARSING:  The parser code is all in parser.c.  A recursive des-
+cent parser is used.  Syntax tables (generated by mksyntax) are
+used to classify characters during lexical analysis.  There are
+three tables:  one for normal use, one for use when inside single
+quotes, and one for use when inside double quotes.  The tables
+are machine dependent because they are indexed by character vari-
+ables and the range of a char varies from machine to machine.
+PARSE OUTPUT:  The output of the parser consists of a tree of
+nodes.  The various types of nodes are defined in the file node-
+types.
+Nodes of type NARG are used to represent both words and the con-
+tents of here documents.  An early version of ash kept the con-
+tents of here documents in temporary files, but keeping here do-
+cuments in memory typically results in significantly better per-
+formance.  It would have been nice to make it an option to use
+temporary files for here documents, for the benefit of small
+machines, but the code to keep track of when to delete the tem-
+porary files was complex and I never fixed all the bugs in it.
+(AT&T has been maintaining the Bourne shell for more than ten
+years, and to the best of my knowledge they still haven't gotten
+it to handle temporary files correctly in obscure cases.)
+The text field of a NARG structure points to the text of the
+word.  The text consists of ordinary characters and a number of
+special codes defined in parser.h.  The special codes are:
+        CTLVAR              Variable substitution
+        CTLENDVAR           End of variable substitution
+        CTLBACKQ            Command substitution
+        CTLBACKQ|CTLQUOTE   Command substitution inside double quotes
+        CTLESC              Escape next character
+A variable substitution contains the following elements:
+        CTLVAR type name '=' [ alternative-text CTLENDVAR ]
+The type field is a single character specifying the type of sub-
+stitution.  The possible types are:
+        VSNORMAL            $var
+        VSMINUS             ${var-text}
+        VSMINUS|VSNUL       ${var:-text}
+        VSPLUS              ${var+text}
+        VSPLUS|VSNUL        ${var:+text}
+        VSQUESTION          ${var?text}
+        VSQUESTION|VSNUL    ${var:?text}
+        VSASSIGN            ${var=text}
+        VSASSIGN|VSNUL      ${var=text}
+In addition, the type field will have the VSQUOTE flag set if the
+variable is enclosed in double quotes.  The name of the variable
+comes next, terminated by an equals sign.  If the type is not
+VSNORMAL, then the text field in the substitution follows, ter-
+minated by a CTLENDVAR byte.
+Commands in back quotes are parsed and stored in a linked list.
+The locations of these commands in the string are indicated by
+CTLBACKQ and CTLBACKQ+CTLQUOTE characters, depending upon whether
+the back quotes were enclosed in double quotes.
+The character CTLESC escapes the next character, so that in case
+any of the CTL characters mentioned above appear in the input,
+they can be passed through transparently.  CTLESC is also used to
+escape '*', '?', '[', and '!' characters which were quoted by the
+user and thus should not be used for file name generation.
+CTLESC characters have proved to be particularly tricky to get
+right.  In the case of here documents which are not subject to
+variable and command substitution, the parser doesn't insert any
+CTLESC characters to begin with (so the contents of the text
+field can be written without any processing).  Other here docu-
+ments, and words which are not subject to splitting and file name
+generation, have the CTLESC characters removed during the vari-
+able and command substitution phase.  Words which are subject
+splitting and file name generation have the CTLESC characters re-
+moved as part of the file name phase.
+EXECUTION:  Command execution is handled by the following files:
+        eval.c     The top level routines.
+        redir.c    Code to handle redirection of input and output.
+        jobs.c     Code to handle forking, waiting, and job control.
+        exec.c     Code to to path searches and the actual exec sys call.
+        expand.c   Code to evaluate arguments.
+        var.c      Maintains the variable symbol table.  Called from expand.c.
+EVAL.C:  Evaltree recursively executes a parse tree.  The exit
+status is returned in the global variable exitstatus.  The alter-
+native entry evalbackcmd is called to evaluate commands in back
+quotes.  It saves the result in memory if the command is a buil-
+tin; otherwise it forks off a child to execute the command and
+connects the standard output of the child to a pipe.
+JOBS.C:  To create a process, you call makejob to return a job
+structure, and then call forkshell (passing the job structure as
+an argument) to create the process.  Waitforjob waits for a job
+to complete.  These routines take care of process groups if job
+control is defined.
+REDIR.C:  Ash allows file descriptors to be redirected and then
+restored without forking off a child process.  This is accom-
+plished by duplicating the original file descriptors.  The redir-
+tab structure records where the file descriptors have be dupli-
+cated to.
+EXEC.C:  The routine find_command locates a command, and enters
+the command in the hash table if it is not already there.  The
+third argument specifies whether it is to print an error message
+if the command is not found.  (When a pipeline is set up,
+find_command is called for all the commands in the pipeline be-
+fore any forking is done, so to get the commands into the hash
+table of the parent process.  But to make command hashing as
+transparent as possible, we silently ignore errors at that point
+and only print error messages if the command cannot be found
+later.)
+The routine shellexec is the interface to the exec system call.
+EXPAND.C:  Arguments are processed in three passes.  The first
+(performed by the routine argstr) performs variable and command
+substitution.  The second (ifsbreakup) performs word splitting
+and the third (expandmeta) performs file name generation.  If the
+"/u" directory is simulated, then when "/u/username" is replaced
+by the user's home directory, the flag "didudir" is set.  This
+tells the cd command that it should print out the directory name,
+just as it would if the "/u" directory were implemented using
+symbolic links.
+VAR.C:  Variables are stored in a hash table.  Probably we should
+switch to extensible hashing.  The variable name is stored in the
+same string as the value (using the format "name=value") so that
+no string copying is needed to create the environment of a com-
+mand.  Variables which the shell references internally are preal-
+located so that the shell can reference the values of these vari-
+ables without doing a lookup.
+When a program is run, the code in eval.c sticks any environment
+variables which precede the command (as in "PATH=xxx command") in
+the variable table as the simplest way to strip duplicates, and
+then calls "environment" to get the value of the environment.
+There are two consequences of this.  First, if an assignment to
+PATH precedes the command, the value of PATH before the assign-
+ment must be remembered and passed to shellexec.  Second, if the
+program turns out to be a shell procedure, the strings from the
+environment variables which preceded the command must be pulled
+out of the table and replaced with strings obtained from malloc,
+since the former will automatically be freed when the stack (see
+the entry on memalloc.c) is emptied.
+BUILTIN COMMANDS:  The procedures for handling these are scat-
+tered throughout the code, depending on which location appears
+most appropriate.  They can be recognized because their names al-
+ways end in "cmd".  The mapping from names to procedures is
+specified in the file builtins, which is processed by the mkbuil-
+tins command.
+A builtin command is invoked with argc and argv set up like a
+normal program.  A builtin command is allowed to overwrite its
+arguments.  Builtin routines can call nextopt to do option pars-
+ing.  This is kind of like getopt, but you don't pass argc and
+argv to it.  Builtin routines can also call error.  This routine
+normally terminates the shell (or returns to the main command
+loop if the shell is interactive), but when called from a builtin
+command it causes the builtin command to terminate with an exit
+status of 2.
+The directory bltins contains commands which can be compiled in-
+dependently but can also be built into the shell for efficiency
+reasons.  The makefile in this directory compiles these programs
+in the normal fashion (so that they can be run regardless of
+whether the invoker is ash), but also creates a library named
+bltinlib.a which can be linked with ash.  The header file bltin.h
+takes care of most of the differences between the ash and the
+stand-alone environment.  The user should call the main routine
+"main", and #define main to be the name of the routine to use
+when the program is linked into ash.  This #define should appear
+before bltin.h is included; bltin.h will #undef main if the pro-
+gram is to be compiled stand-alone.
+CD.C:  This file defines the cd and pwd builtins.  The pwd com-
+mand runs /bin/pwd the first time it is invoked (unless the user
+has already done a cd to an absolute pathname), but then
+remembers the current directory and updates it when the cd com-
+mand is run, so subsequent pwd commands run very fast.  The main
+complication in the cd command is in the docd command, which
+resolves symbolic links into actual names and informs the user
+where the user ended up if he crossed a symbolic link.
+SIGNALS:  Trap.c implements the trap command.  The routine set-
+signal figures out what action should be taken when a signal is
+received and invokes the signal system call to set the signal ac-
+tion appropriately.  When a signal that a user has set a trap for
+is caught, the routine "onsig" sets a flag.  The routine dotrap
+is called at appropriate points to actually handle the signal.
+When an interrupt is caught and no trap has been set for that
+signal, the routine "onint" in error.c is called.
+OUTPUT:  Ash uses it's own output routines.  There are three out-
+put structures allocated.  "Output" represents the standard out-
+put, "errout" the standard error, and "memout" contains output
+which is to be stored in memory.  This last is used when a buil-
+tin command appears in backquotes, to allow its output to be col-
+lected without doing any I/O through the UNIX operating system.
+The variables out1 and out2 normally point to output and errout,
+respectively, but they are set to point to memout when appropri-
+ate inside backquotes.
+INPUT:  The basic input routine is pgetc, which reads from the
+current input file.  There is a stack of input files; the current
+input file is the top file on this stack.  The code allows the
+input to come from a string rather than a file.  (This is for the
+-c option and the "." and eval builtin commands.)  The global
+variable plinno is saved and restored when files are pushed and
+popped from the stack.  The parser routines store the number of
+the current line in this variable.
+DEBUGGING:  If DEBUG is defined in shell.h, then the shell will
+write debugging information to the file $HOME/trace.  Most of
+this is done using the TRACE macro, which takes a set of printf
+arguments inside two sets of parenthesis.  Example:
+"TRACE(("n=%d0, n))".  The double parenthesis are necessary be-
+cause the preprocessor can't handle functions with a variable
+number of arguments.  Defining DEBUG also causes the shell to
+generate a core dump if it is sent a quit signal.  The tracing
+code is in show.c.

 /trunk/uspace/app/ash/hetio.c
 ,0 → 1,378
+/*
+ * Termios command line History and Editting for NetBSD sh (ash)
+ * Copyright (c) 1999
+ *  Main code:  Adam Rogoyski <rogoyski@cs.utexas.edu>
+ *  Etc:        Dave Cinege <dcinege@psychosis.com>
+ *
+ * You may use this code as you wish, so long as the original author(s)
+ * are attributed in any redistributions of the source code.
+ * This code is 'as is' with no warranty.
+ * This code may safely be consumed by a BSD or GPL license.
+ *
+ * v 0.5  19990328  Initial release
+ *
+ * Future plans: Simple file and path name completion. (like BASH)
+ *
+ */
+/*
+Usage and Known bugs:
+    Terminal key codes are not extensive, and more will probably
+    need to be added. This version was created on Debian GNU/Linux 2.x.
+    Delete, Backspace, Home, End, and the arrow keys were tested
+    to work in an Xterm and console. Ctrl-A also works as Home.
+    Ctrl-E also works as End. The binary size increase is <3K.
+    Editting will not display correctly for lines greater then the
+    terminal width. (more then one line.) However, history will.
+*/
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <ctype.h>
+#include <sys/ioctl.h>
+#include "input.h"
+#include "output.h"
+#ifdef HETIO
+#include "hetio.h"
+#define  MAX_HISTORY   15           /* Maximum length of the linked list for the command line history */
+#define ESC 27
+#define DEL 127
+static struct history *his_front = NULL;    /* First element in command line list */
+static struct history *his_end = NULL;      /* Last element in command line list */
+static struct termios old_term, new_term;   /* Current termio and the previous termio before starting ash */
+static int history_counter = 0;         /* Number of commands in history list */
+static int reset_term = 0;          /* Set to true if the terminal needs to be reset upon exit */
+//static int hetio_inter = 0;
+int hetio_inter = 0;
+struct history
+{
+   char *s;
+   struct history *p;
+   struct history *n;
+};
+void input_delete    (int);
+void input_home      (int *);
+void input_end       (int *, int);
+void input_backspace (int *, int *);
+void hetio_init(void)
+{
+    hetio_inter = 1;
+}
+void hetio_reset_term(void)
+{
+    if (reset_term)
+        tcsetattr(1, TCSANOW, &old_term);
+}
+void setIO(struct termios *new, struct termios *old)    /* Set terminal IO to canonical mode, and save old term settings. */
+{
+    tcgetattr(0, old);
+    memcpy(new, old, sizeof(*new));
+    new->c_cc[VMIN] = 1;
+    new->c_cc[VTIME] = 0;
+    new->c_lflag &= ~ICANON; /* unbuffered input */
+    new->c_lflag &= ~ECHO;
+    tcsetattr(0, TCSANOW, new);
+}
+void input_home(int *cursor)                /* Command line input routines */
+{
+    while (*cursor > 0) {
+        out1c('\b');
+        --*cursor;
+    }
+    flushout(&output);
+}
+void input_delete(int cursor)
+{
+    int j = 0;
+    memmove(parsenextc + cursor, parsenextc + cursor + 1,
+        BUFSIZ - cursor - 1);
+    for (j = cursor; j < (BUFSIZ - 1); j++) {
+        if (!*(parsenextc + j))
+            break;
+        else
+            out1c(*(parsenextc + j));
+    }
+    out1str(" \b");
+    while (j-- > cursor)
+        out1c('\b');
+    flushout(&output);
+}
+void input_end(int *cursor, int len)
+{
+    while (*cursor < len) {
+        out1str("\033[C");
+        ++*cursor;
+    }
+    flushout(&output);
+}
+void
+input_backspace(int *cursor, int *len)
+{
+    int j = 0;
+    if (*cursor > 0) {
+        out1str("\b \b");
+        --*cursor;
+        memmove(parsenextc + *cursor, parsenextc + *cursor + 1,
+            BUFSIZ - *cursor + 1);
+        for (j = *cursor; j < (BUFSIZ - 1); j++) {
+            if (!*(parsenextc + j))
+                break;
+            else
+                out1c(*(parsenextc + j));
+        }
+        out1str(" \b");
+        while (j-- > *cursor)
+            out1c('\b');
+        --*len;
+        flushout(&output);
+    }
+}
+int hetio_read_input(int fd)
+{
+    int nr = 0;
+    if (!hetio_inter) {     /* Are we an interactive shell? */
+        return -255;
+    } else {
+        int len = 0;
+        int j = 0;
+        int cursor = 0;
+        int break_out = 0;
+        int ret = 0;
+        char c = 0;
+        struct history *hp = his_end;
+        if (!reset_term) {
+            setIO(&new_term, &old_term);
+            reset_term = 1;
+        } else {
+            tcsetattr(0, TCSANOW, &new_term);
+        }
+        memset(parsenextc, 0, BUFSIZ);
+        while (1) {
+            if ((ret = read(fd, &c, 1)) < 1)
+                return ret;
+            switch (c) {
+                case 1:     /* Control-A Beginning of line */
+                    input_home(&cursor);
+                    break;
+                case 5:     /* Control-E EOL */
+                    input_end(&cursor, len);
+                    break;
+                case 4:     /* Control-D */
+#ifndef CTRL_D_DELETE
+                    return 0;
+#else
+                    if (cursor != len) {
+                        input_delete(cursor);
+                        len--;
+                    }
+                    break;
+#endif
+                case '\b':  /* Backspace */
+                case DEL:
+                    input_backspace(&cursor, &len);
+                    break;
+                case '\n':  /* Enter */
+                    *(parsenextc + len++ + 1) = c;
+                    out1c(c);
+                    flushout(&output);
+                    break_out = 1;
+                    break;
+                case ESC:   /* escape sequence follows */
+                    if ((ret = read(fd, &c, 1)) < 1)
+                        return ret;
+                    if (c == '[' || c == 'O' ) {    /* 91 */
+                        if ((ret = read(fd, &c, 1)) < 1)
+                            return ret;
+                        switch (c) {
+                            case 'A':
+                                if (hp && hp->p) {      /* Up */
+                                    hp = hp->p;
+                                    goto hop;
+                                }
+                                break;
+                            case 'B':
+                                if (hp && hp->n && hp->n->s) {  /* Down */
+                                    hp = hp->n;
+                                    goto hop;
+                                }
+                                break;
+hop:                        /* hop */
+                                len = strlen(parsenextc);
+                                for (; cursor > 0; cursor--)        /* return to begining of line */
+                                    out1c('\b');
+                                for (j = 0; j < len; j++)       /* erase old command */
+                                    out1c(' ');
+                                for (j = len; j > 0; j--)       /* return to begining of line */
+                                    out1c('\b');
+                                strcpy (parsenextc, hp->s);     /* write new command */
+                                len = strlen (hp->s);
+                                out1str(parsenextc);
+                                flushout(&output);
+                                cursor = len;
+                                break;
+                            case 'C':       /* Right */
+                                    if (cursor < len) {
+                                    out1str("\033[C");
+                                    cursor++;
+                                    flushout(&output);
+                                }
+                                break;
+                            case 'D':       /* Left */
+                                if (cursor > 0) {
+                                    out1str("\033[D");
+                                    cursor--;
+                                    flushout(&output);
+                                }
+                                break;
+                            case '3':       /* Delete */
+                                if (cursor != len) {
+                                    input_delete(cursor);
+                                    len--;
+                                }
+                                break;
+                            case 'H':       /* Home (xterm) */
+                            case '1':       /* Home (Ctrl-A) */
+                                    input_home(&cursor);
+                                break;
+                            case 'F':       /* End (xterm_ */
+                            case '4':       /* End (Ctrl-E) */
+                                input_end(&cursor, len);
+                                break;
+                        }
+                        if (c == '1' || c == '3' || c == '4')
+                            if ((ret = read(fd, &c, 1)) < 1)
+                                return ret;  /* read 126 (~) */
+                    }
+                    c = 0;
+                    break;
+                default:                /* If it's regular input, do the normal thing */
+                    if (!isprint(c))        /* Skip non-printable characters */
+                        break;
+                        if (len >= (BUFSIZ - 2))    /* Need to leave space for enter */
+                        break;
+                    len++;
+                    if (cursor == (len - 1)) {  /* Append if at the end of the line */
+                        *(parsenextc + cursor) = c;
+                    } else {            /* Insert otherwise */
+                        memmove(parsenextc + cursor + 1, parsenextc + cursor,
+                            len - cursor - 1);
+                        *(parsenextc + cursor) = c;
+                        for (j = cursor; j < len; j++)
+                            out1c(*(parsenextc + j));
+                        for (; j > cursor; j--)
+                            out1str("\033[D");
+                    }
+                    cursor++;
+                    out1c(c);
+                    flushout(&output);
+                    break;
+            }
+            if (break_out)      /* Enter is the command terminator, no more input. */
+                break;
+        }
+        nr = len + 1;
+        tcsetattr(0, TCSANOW, &old_term);
+        if (*(parsenextc)) {        /* Handle command history log */
+            struct history *h = his_end;
+            if (!h) {       /* No previous history */
+                h = his_front = malloc(sizeof (struct history));
+                h->n = malloc(sizeof (struct history));
+                h->p = NULL;
+                h->s = strdup(parsenextc);
+                h->n->p = h;
+                h->n->n = NULL;
+                h->n->s = NULL;
+                his_end = h->n;
+                history_counter++;
+            } else {    /* Add a new history command */
+                h->n = malloc(sizeof (struct history));
+                h->n->p = h;
+                h->n->n = NULL;
+                h->n->s = NULL;
+                h->s = strdup(parsenextc);
+                his_end = h->n;
+                if (history_counter >= MAX_HISTORY) {   /* After max history, remove the last known command */
+                    struct history *p = his_front->n;
+                    p->p = NULL;
+                    free(his_front->s);
+                    free(his_front);
+                    his_front = p;
+                } else {
+                    history_counter++;
+                }
+            }
+        }
+    }
+    return nr;
+}
+#endif

 /trunk/uspace/app/ash/mktokens
 ,0 → 1,96
+#!/bin/sh -
+#   $NetBSD: mktokens,v 1.9 1999/07/09 03:05:50 christos Exp $
+#
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)mktokens    8.1 (Berkeley) 5/31/93
+# The following is a list of tokens.  The second column is nonzero if the
+# token marks the end of a list.  The third column is the name to print in
+# error messages.
+cat > /tmp/ka$$ <<\!
+TEOF    1   end of file
+TNL 0    newline
+TSEMI   0    ";"
+TBACKGND 0  "&"
+TAND    0    "&&"
+TOR 0    "||"
+TPIPE   0    "|"
+TLP 0    "("
+TRP 1   ")"
+TENDCASE 1  ";;"
+TENDBQUOTE 1    "`"
+TREDIR  0    redirection
+TWORD   0    word
+TIF 0    "if"
+TTHEN   1   "then"
+TELSE   1   "else"
+TELIF   1   "elif"
+TFI 1   "fi"
+TWHILE  0    "while"
+TUNTIL  0    "until"
+TFOR    0    "for"
+TDO 1   "do"
+TDONE   1   "done"
+TBEGIN  0    "{"
+TEND    1   "}"
+TCASE   0    "case"
+TESAC   1   "esac"
+TNOT    0    "!"
+!
+nl=`wc -l /tmp/ka$$`
+exec > token.h
+awk '{print "#define " $1 " " NR-1}' /tmp/ka$$
+echo '
+/* Array indicating which tokens mark the end of a list */
+const char tokendlist[] = {'
+awk '{print "\t" $2 ","}' /tmp/ka$$
+echo '};
+const char *const tokname[] = {'
+sed -e 's/"/\\"/g' \
+    -e 's/[^     ]*[     ][  ]*[^    ]*[     ][  ]*\(.*\)/  "\1",/' \
+    /tmp/ka$$
+echo '};
+'
+sed 's/"//g' /tmp/ka$$ | awk '
+/TIF/{print "#define KWDOFFSET " NR-1; print "";
+      print "const char *const parsekwd[] = {"}
+/TIF/,/neverfound/{print "  \"" $3 "\","}'
+echo '  0
+};'
+rm /tmp/ka$$

 /trunk/uspace/app/ash/shell.h
 ,0 → 1,86
+/*  $NetBSD: shell.h,v 1.13 2000/05/22 10:18:47 elric Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)shell.h 8.2 (Berkeley) 5/4/95
+ */
+/*
+ * The follow should be set to reflect the type of system you have:
+ *  JOBS -> 1 if you have Berkeley job control, 0 otherwise.
+ *  SHORTNAMES -> 1 if your linker cannot handle long names.
+ *  define BSD if you are running 4.2 BSD or later.
+ *  define SYSV if you are running under System V.
+ *  define DEBUG=1 to compile in debugging (set global "debug" to turn on)
+ *  define DEBUG=2 to compile in and turn on debugging.
+ *
+ * When debugging is on, debugging info will be written to $HOME/trace and
+ * a quit signal will generate a core dump.
+ */
+#define JOBS 0
+#ifndef BSD
+#define BSD 1
+#endif
+//#include "fake.h"
+#ifdef __STDC__
+typedef void *pointer;
+#ifndef NULL
+#define NULL (void *)0
+#endif
+#else /* not __STDC__ */
+typedef char *pointer;
+#ifndef NULL
+#define NULL 0
+#endif
+#endif /*  not __STDC__ */
+#define STATIC  /* empty */
+#define MKINIT  /* empty */
+#include <sys/cdefs.h>
+extern char nullstr[1];     /* null string */
+#ifdef DEBUG
+#define TRACE(param)    trace param
+#else
+#define TRACE(param)
+#endif

 /trunk/uspace/app/ash/hetio.h
 ,0 → 1,22
+/*
+ * Termios command line History and Editting for NetBSD sh (ash)
+ * Copyright (c) 1999
+ *  Main code:  Adam Rogoyski <rogoyski@cs.utexas.edu>
+ *  Etc:        Dave Cinege <dcinege@psychosis.com>
+ *
+ * You may use this code as you wish, so long as the original author(s)
+ * are attributed in any redistributions of the source code.
+ * This code is 'as is' with no warranty.
+ * This code may safely be consumed by a BSD or GPL license.
+ *
+ * v 0.5  19990328  Initial release
+ *
+ * Future plans: Simple file and path name completion. (like BASH)
+ *
+ */
+void hetio_init(void);
+int hetio_read_input(int fd);
+void hetio_reset_term(void);
+extern int hetio_inter;

 /trunk/uspace/app/ash/exec.c
 ,0 → 1,1181
+/*  $NetBSD: exec.c,v 1.31 2000/11/01 19:21:41 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)exec.c  8.4 (Berkeley) 6/8/95";
+#else
+__RCSID("$NetBSD: exec.c,v 1.31 2000/11/01 19:21:41 christos Exp $");
+#endif
+#endif /* not lint */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sysexits.h>
+/*
+ * When commands are first encountered, they are entered in a hash table.
+ * This ensures that a full path search will not have to be done for them
+ * on each invocation.
+ *
+ * We should investigate converting to a linear search, even though that
+ * would make the command name "hash" a misnomer.
+ */
+#include "shell.h"
+#include "main.h"
+#include "nodes.h"
+#include "parser.h"
+#include "redir.h"
+#include "eval.h"
+#include "exec.h"
+#include "builtins.h"
+#include "var.h"
+#include "options.h"
+#include "input.h"
+#include "output.h"
+#include "syntax.h"
+#include "memalloc.h"
+#include "error.h"
+#include "init.h"
+#include "mystring.h"
+#include "show.h"
+#include "jobs.h"
+#include "alias.h"
+#define CMDTABLESIZE 31     /* should be prime */
+#define ARB 1           /* actual size determined at run time */
+struct tblentry {
+    struct tblentry *next;  /* next entry in hash chain */
+    union param param;  /* definition of builtin function */
+    short cmdtype;      /* index identifying command */
+    char rehash;        /* if set, cd done since entry created */
+    char cmdname[ARB];  /* name of command */
+};
+STATIC struct tblentry *cmdtable[CMDTABLESIZE];
+STATIC int builtinloc = -1;     /* index in path of %builtin, or -1 */
+int exerrno = 0;            /* Last exec error */
+STATIC void tryexec (char *, char **, char **);
+STATIC void execinterp (char **, char **);
+STATIC void printentry (struct tblentry *, int);
+STATIC void clearcmdentry (int);
+STATIC struct tblentry *cmdlookup (char *, int);
+STATIC void delete_cmd_entry (void);
+STATIC int describe_command (char *, int);
+STATIC int path_change (const char *, int *);
+STATIC int is_regular_builtin (const char *);
+/*
+ * Exec a program.  Never returns.  If you change this routine, you may
+ * have to change the find_command routine as well.
+ */
+void
+shellexec(argv, envp, path, idx)
+    char **argv, **envp;
+    const char *path;
+    int idx;
+{
+    char *cmdname;
+    int e;
+    if (fd2 >= 0 && fd2 != 2) {
+        close(fd2);
+    }
+    if (strchr(argv[0], '/') != NULL) {
+        tryexec(argv[0], argv, envp);
+        e = errno;
+    } else {
+        e = ENOENT;
+        while ((cmdname = padvance(&path, argv[0])) != NULL) {
+            if (--idx < 0 && pathopt == NULL) {
+                tryexec(cmdname, argv, envp);
+                if (errno != ENOENT && errno != ENOTDIR)
+                    e = errno;
+            }
+            stunalloc(cmdname);
+        }
+    }
+    /* Map to POSIX errors */
+    switch (e) {
+    case EACCES:
+        exerrno = 126;
+        break;
+    case ENOENT:
+        exerrno = 127;
+        break;
+    default:
+        exerrno = 2;
+        break;
+    }
+    exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC));
+    /* NOTREACHED */
+}
+STATIC void
+tryexec(cmd, argv, envp)
+    char *cmd;
+    char **argv;
+    char **envp;
+    {
+    int e;
+#if !defined(BSD) && !defined(linux)
+    char *p;
+#endif
+#ifdef SYSV
+    do {
+        execve(cmd, argv, envp);
+    } while (errno == EINTR);
+#else
+    execve(cmd, argv, envp);
+#endif
+    e = errno;
+    if (e == ENOEXEC) {
+        initshellproc();
+        setinputfile(cmd, 0);
+        commandname = arg0 = savestr(argv[0]);
+#if !defined(BSD) && !defined(linux)
+        pgetc(); pungetc();     /* fill up input buffer */
+        p = parsenextc;
+        if (parsenleft > 2 && p[0] == '#' && p[1] == '!') {
+            argv[0] = cmd;
+            execinterp(argv, envp);
+        }
+#endif
+        setparam(argv + 1);
+        exraise(EXSHELLPROC);
+    }
+    errno = e;
+}
+#if !defined(BSD) && !defined(linux)
+/*
+ * Execute an interpreter introduced by "#!", for systems where this
+ * feature has not been built into the kernel.  If the interpreter is
+ * the shell, return (effectively ignoring the "#!").  If the execution
+ * of the interpreter fails, exit.
+ *
+ * This code peeks inside the input buffer in order to avoid actually
+ * reading any input.  It would benefit from a rewrite.
+ */
+#define NEWARGS 5
+STATIC void
+execinterp(argv, envp)
+    char **argv, **envp;
+    {
+    int n;
+    char *inp;
+    char *outp;
+    char c;
+    char *p;
+    char **ap;
+    char *newargs[NEWARGS];
+    int i;
+    char **ap2;
+    char **new;
+    n = parsenleft - 2;
+    inp = parsenextc + 2;
+    ap = newargs;
+    for (;;) {
+        while (--n >= 0 && (*inp == ' ' || *inp == '\t'))
+            inp++;
+        if (n < 0)
+            goto bad;
+        if ((c = *inp++) == '\n')
+            break;
+        if (ap == &newargs[NEWARGS])
+bad:          error("Bad #! line");
+        STARTSTACKSTR(outp);
+        do {
+            STPUTC(c, outp);
+        } while (--n >= 0 && (c = *inp++) != ' ' && c != '\t' && c != '\n');
+        STPUTC('\0', outp);
+        n++, inp--;
+        *ap++ = grabstackstr(outp);
+    }
+    if (ap == newargs + 1) {    /* if no args, maybe no exec is needed */
+        p = newargs[0];
+        for (;;) {
+            if (equal(p, "sh") || equal(p, "ash")) {
+                return;
+            }
+            while (*p != '/') {
+                if (*p == '\0')
+                    goto break2;
+                p++;
+            }
+            p++;
+        }
+break2:;
+    }
+    i = (char *)ap - (char *)newargs;       /* size in bytes */
+    if (i == 0)
+        error("Bad #! line");
+    for (ap2 = argv ; *ap2++ != NULL ; );
+    new = ckmalloc(i + ((char *)ap2 - (char *)argv));
+    ap = newargs, ap2 = new;
+    while ((i -= sizeof (char **)) >= 0)
+        *ap2++ = *ap++;
+    ap = argv;
+    while (*ap2++ = *ap++);
+    shellexec(new, envp, pathval(), 0);
+    /* NOTREACHED */
+}
+#endif
+/*
+ * Do a path search.  The variable path (passed by reference) should be
+ * set to the start of the path before the first call; padvance will update
+ * this value as it proceeds.  Successive calls to padvance will return
+ * the possible path expansions in sequence.  If an option (indicated by
+ * a percent sign) appears in the path entry then the global variable
+ * pathopt will be set to point to it; otherwise pathopt will be set to
+ * NULL.
+ */
+const char *pathopt;
+char *
+padvance(path, name)
+    const char **path;
+    const char *name;
+    {
+    const char *p;
+    char *q;
+    const char *start;
+    int len;
+    if (*path == NULL)
+        return NULL;
+    start = *path;
+    for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+    len = p - start + strlen(name) + 2; /* "2" is for '/' and '\0' */
+    while (stackblocksize() < len)
+        growstackblock();
+    q = stackblock();
+    if (p != start) {
+        memcpy(q, start, p - start);
+        q += p - start;
+        *q++ = '/';
+    }
+    strcpy(q, name);
+    pathopt = NULL;
+    if (*p == '%') {
+        pathopt = ++p;
+        while (*p && *p != ':')  p++;
+    }
+    if (*p == ':')
+        *path = p + 1;
+    else
+        *path = NULL;
+    return stalloc(len);
+}
+/*** Command hashing code ***/
+int
+hashcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct tblentry **pp;
+    struct tblentry *cmdp;
+    int c;
+    int verbose;
+    struct cmdentry entry;
+    char *name;
+    verbose = 0;
+    while ((c = nextopt("rv")) != '\0') {
+        if (c == 'r') {
+            clearcmdentry(0);
+        } else if (c == 'v') {
+            verbose++;
+        }
+    }
+    if (*argptr == NULL) {
+        for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+            for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
+                if (cmdp->cmdtype != CMDBUILTIN) {
+                    printentry(cmdp, verbose);
+                }
+            }
+        }
+        return 0;
+    }
+    c = 0;
+    while ((name = *argptr) != NULL) {
+        if ((cmdp = cmdlookup(name, 0)) != NULL
+         && (cmdp->cmdtype == CMDNORMAL
+             || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
+            delete_cmd_entry();
+        find_command(name, &entry, DO_ERR, pathval());
+        if (entry.cmdtype == CMDUNKNOWN) c = 1;
+        else if (verbose) {
+            cmdp = cmdlookup(name, 0);
+            if (cmdp) printentry(cmdp, verbose);
+            flushall();
+        }
+        argptr++;
+    }
+    return c;
+}
+STATIC void
+printentry(cmdp, verbose)
+    struct tblentry *cmdp;
+    int verbose;
+    {
+    int idx;
+    const char *path;
+    char *name;
+    if (cmdp->cmdtype == CMDNORMAL) {
+        idx = cmdp->param.index;
+        path = pathval();
+        do {
+            name = padvance(&path, cmdp->cmdname);
+            stunalloc(name);
+        } while (--idx >= 0);
+        out1str(name);
+    } else if (cmdp->cmdtype == CMDBUILTIN) {
+        out1fmt("builtin %s", cmdp->cmdname);
+    } else if (cmdp->cmdtype == CMDFUNCTION) {
+        out1fmt("function %s", cmdp->cmdname);
+        if (verbose) {
+            INTOFF;
+            name = commandtext(cmdp->param.func);
+            out1c(' ');
+            out1str(name);
+            ckfree(name);
+            INTON;
+        }
+#ifdef DEBUG
+    } else {
+        error("internal error: cmdtype %d", cmdp->cmdtype);
+#endif
+    }
+    if (cmdp->rehash)
+        out1c('*');
+    out1c('\n');
+}
+/*
+ * Resolve a command name.  If you change this routine, you may have to
+ * change the shellexec routine as well.
+ */
+void
+find_command(name, entry, act, path)
+    char *name;
+    struct cmdentry *entry;
+    int act;
+    const char *path;
+{
+    struct tblentry *cmdp;
+    int idx;
+    int prev;
+    char *fullname;
+    struct stat statb;
+    int e;
+    int i;
+    int bltin;
+    int firstchange;
+    int updatetbl;
+    int regular;
+    /* If name contains a slash, don't use the hash table */
+    if (strchr(name, '/') != NULL) {
+        if (act & DO_ABS) {
+            while (stat(name, &statb) < 0) {
+    #ifdef SYSV
+                if (errno == EINTR)
+                    continue;
+    #endif
+                if (errno != ENOENT && errno != ENOTDIR)
+                    e = errno;
+                entry->cmdtype = CMDUNKNOWN;
+                entry->u.index = -1;
+                return;
+            }
+            entry->cmdtype = CMDNORMAL;
+            entry->u.index = -1;
+            return;
+        }
+        entry->cmdtype = CMDNORMAL;
+        entry->u.index = 0;
+        return;
+    }
+    updatetbl = 1;
+    if (act & DO_BRUTE) {
+        firstchange = path_change(path, &bltin);
+    } else {
+        bltin = builtinloc;
+        firstchange = 9999;
+    }
+    /* If name is in the table, and not invalidated by cd, we're done */
+    if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) {
+        if (cmdp->cmdtype == CMDFUNCTION) {
+            if (act & DO_NOFUN) {
+                updatetbl = 0;
+            } else {
+                goto success;
+            }
+        } else if (act & DO_BRUTE) {
+            if ((cmdp->cmdtype == CMDNORMAL &&
+                 cmdp->param.index >= firstchange) ||
+                (cmdp->cmdtype == CMDBUILTIN &&
+                 ((builtinloc < 0 && bltin >= 0) ?
+                  bltin : builtinloc) >= firstchange)) {
+                /* need to recompute the entry */
+            } else {
+                goto success;
+            }
+        } else {
+            goto success;
+        }
+    }
+    if ((regular = is_regular_builtin(name))) {
+        if (cmdp && (cmdp->cmdtype == CMDBUILTIN)) {
+                goto success;
+        }
+    } else if (act & DO_BRUTE) {
+        if (firstchange == 0) {
+            updatetbl = 0;
+        }
+    }
+    /* If %builtin not in path, check for builtin next */
+    if ((bltin < 0 || regular) && (i = find_builtin(name)) >= 0) {
+        if (!updatetbl) {
+            entry->cmdtype = CMDBUILTIN;
+            entry->u.index = i;
+            return;
+        }
+        INTOFF;
+        cmdp = cmdlookup(name, 1);
+        cmdp->cmdtype = CMDBUILTIN;
+        cmdp->param.index = i;
+        INTON;
+        goto success;
+    }
+    /* We have to search path. */
+    prev = -1;      /* where to start */
+    if (cmdp && cmdp->rehash) { /* doing a rehash */
+        if (cmdp->cmdtype == CMDBUILTIN)
+            prev = builtinloc;
+        else
+            prev = cmdp->param.index;
+    }
+    e = ENOENT;
+    idx = -1;
+loop:
+    while ((fullname = padvance(&path, name)) != NULL) {
+        stunalloc(fullname);
+        idx++;
+        if (idx >= firstchange) {
+            updatetbl = 0;
+        }
+        if (pathopt) {
+            if (prefix("builtin", pathopt)) {
+                if ((i = find_builtin(name)) >= 0) {
+                    if (!updatetbl) {
+                        entry->cmdtype = CMDBUILTIN;
+                        entry->u.index = i;
+                        return;
+                    }
+                    INTOFF;
+                    cmdp = cmdlookup(name, 1);
+                    cmdp->cmdtype = CMDBUILTIN;
+                    cmdp->param.index = i;
+                    INTON;
+                    goto success;
+                } else {
+                    continue;
+                }
+            } else if (!(act & DO_NOFUN) &&
+                   prefix("func", pathopt)) {
+                /* handled below */
+            } else {
+                continue;   /* ignore unimplemented options */
+            }
+        }
+        /* if rehash, don't redo absolute path names */
+        if (fullname[0] == '/' && idx <= prev &&
+            idx < firstchange) {
+            if (idx < prev)
+                continue;
+            TRACE(("searchexec \"%s\": no change\n", name));
+            goto success;
+        }
+        while (stat(fullname, &statb) < 0) {
+#ifdef SYSV
+            if (errno == EINTR)
+                continue;
+#endif
+            if (errno != ENOENT && errno != ENOTDIR)
+                e = errno;
+            goto loop;
+        }
+        e = EACCES; /* if we fail, this will be the error */
+        if (!S_ISREG(statb.st_mode))
+            continue;
+        if (pathopt) {      /* this is a %func directory */
+            stalloc(strlen(fullname) + 1);
+            readcmdfile(fullname);
+            if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION)
+                error("%s not defined in %s", name, fullname);
+            stunalloc(fullname);
+            goto success;
+        }
+#ifdef notdef
+        if (statb.st_uid == geteuid()) {
+            if ((statb.st_mode & 0100) == 0)
+                goto loop;
+        } else if (statb.st_gid == getegid()) {
+            if ((statb.st_mode & 010) == 0)
+                goto loop;
+        } else {
+            if ((statb.st_mode & 01) == 0)
+                goto loop;
+        }
+#endif
+        TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
+        /* If we aren't called with DO_BRUTE and cmdp is set, it must
+           be a function and we're being called with DO_NOFUN */
+        if (!updatetbl) {
+            entry->cmdtype = CMDNORMAL;
+            entry->u.index = idx;
+            return;
+        }
+        INTOFF;
+        cmdp = cmdlookup(name, 1);
+        cmdp->cmdtype = CMDNORMAL;
+        cmdp->param.index = idx;
+        INTON;
+        goto success;
+    }
+    /* We failed.  If there was an entry for this command, delete it */
+    if (cmdp && updatetbl)
+        delete_cmd_entry();
+    if (act & DO_ERR)
+        outfmt(out2, "%s: %s\n", name, errmsg(e, E_EXEC));
+    entry->cmdtype = CMDUNKNOWN;
+    return;
+success:
+    cmdp->rehash = 0;
+    entry->cmdtype = cmdp->cmdtype;
+    entry->u = cmdp->param;
+}
+/*
+ * Search the table of builtin commands.
+ */
+int
+find_builtin(name)
+    char *name;
+{
+    const struct builtincmd *bp;
+    for (bp = builtincmd ; bp->name ; bp++) {
+        if (*bp->name == *name && equal(bp->name, name))
+            return bp->code;
+    }
+    return -1;
+}
+/*
+ * Called when a cd is done.  Marks all commands so the next time they
+ * are executed they will be rehashed.
+ */
+void
+hashcd() {
+    struct tblentry **pp;
+    struct tblentry *cmdp;
+    for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+        for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
+            if (cmdp->cmdtype == CMDNORMAL
+             || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))
+                cmdp->rehash = 1;
+        }
+    }
+}
+/*
+ * Called before PATH is changed.  The argument is the new value of PATH;
+ * pathval() still returns the old value at this point.  Called with
+ * interrupts off.
+ */
+void
+changepath(newval)
+    const char *newval;
+{
+    int firstchange;
+    int bltin;
+    firstchange = path_change(newval, &bltin);
+    if (builtinloc < 0 && bltin >= 0)
+        builtinloc = bltin;     /* zap builtins */
+    clearcmdentry(firstchange);
+    builtinloc = bltin;
+}
+/*
+ * Clear out command entries.  The argument specifies the first entry in
+ * PATH which has changed.
+ */
+STATIC void
+clearcmdentry(firstchange)
+    int firstchange;
+{
+    struct tblentry **tblp;
+    struct tblentry **pp;
+    struct tblentry *cmdp;
+    INTOFF;
+    for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        pp = tblp;
+        while ((cmdp = *pp) != NULL) {
+            if ((cmdp->cmdtype == CMDNORMAL &&
+                 cmdp->param.index >= firstchange)
+             || (cmdp->cmdtype == CMDBUILTIN &&
+                 builtinloc >= firstchange)) {
+                *pp = cmdp->next;
+                ckfree(cmdp);
+            } else {
+                pp = &cmdp->next;
+            }
+        }
+    }
+    INTON;
+}
+/*
+ * Delete all functions.
+ */
+#ifdef mkinit
+MKINIT void deletefuncs (void);
+SHELLPROC {
+    deletefuncs();
+}
+#endif
+void
+deletefuncs() {
+    struct tblentry **tblp;
+    struct tblentry **pp;
+    struct tblentry *cmdp;
+    INTOFF;
+    for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        pp = tblp;
+        while ((cmdp = *pp) != NULL) {
+            if (cmdp->cmdtype == CMDFUNCTION) {
+                *pp = cmdp->next;
+                freefunc(cmdp->param.func);
+                ckfree(cmdp);
+            } else {
+                pp = &cmdp->next;
+            }
+        }
+    }
+    INTON;
+}
+/*
+ * Locate a command in the command hash table.  If "add" is nonzero,
+ * add the command to the table if it is not already present.  The
+ * variable "lastcmdentry" is set to point to the address of the link
+ * pointing to the entry, so that delete_cmd_entry can delete the
+ * entry.
+ */
+struct tblentry **lastcmdentry;
+STATIC struct tblentry *
+cmdlookup(name, add)
+    char *name;
+    int add;
+{
+    int hashval;
+    char *p;
+    struct tblentry *cmdp;
+    struct tblentry **pp;
+    p = name;
+    hashval = *p << 4;
+    while (*p)
+        hashval += *p++;
+    hashval &= 0x7FFF;
+    pp = &cmdtable[hashval % CMDTABLESIZE];
+    for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
+        if (equal(cmdp->cmdname, name))
+            break;
+        pp = &cmdp->next;
+    }
+    if (add && cmdp == NULL) {
+        INTOFF;
+        cmdp = *pp = ckmalloc(sizeof (struct tblentry) - ARB
+                    + strlen(name) + 1);
+        cmdp->next = NULL;
+        cmdp->cmdtype = CMDUNKNOWN;
+        cmdp->rehash = 0;
+        strcpy(cmdp->cmdname, name);
+        INTON;
+    }
+    lastcmdentry = pp;
+    return cmdp;
+}
+/*
+ * Delete the command entry returned on the last lookup.
+ */
+STATIC void
+delete_cmd_entry() {
+    struct tblentry *cmdp;
+    INTOFF;
+    cmdp = *lastcmdentry;
+    *lastcmdentry = cmdp->next;
+    ckfree(cmdp);
+    INTON;
+}
+#ifdef notdef
+void
+getcmdentry(name, entry)
+    char *name;
+    struct cmdentry *entry;
+    {
+    struct tblentry *cmdp = cmdlookup(name, 0);
+    if (cmdp) {
+        entry->u = cmdp->param;
+        entry->cmdtype = cmdp->cmdtype;
+    } else {
+        entry->cmdtype = CMDUNKNOWN;
+        entry->u.index = 0;
+    }
+}
+#endif
+/*
+ * Add a new command entry, replacing any existing command entry for
+ * the same name.
+ */
+void
+addcmdentry(name, entry)
+    char *name;
+    struct cmdentry *entry;
+    {
+    struct tblentry *cmdp;
+    INTOFF;
+    cmdp = cmdlookup(name, 1);
+    if (cmdp->cmdtype == CMDFUNCTION) {
+        freefunc(cmdp->param.func);
+    }
+    cmdp->cmdtype = entry->cmdtype;
+    cmdp->param = entry->u;
+    INTON;
+}
+/*
+ * Define a shell function.
+ */
+void
+defun(name, func)
+    char *name;
+    union node *func;
+    {
+    struct cmdentry entry;
+    entry.cmdtype = CMDFUNCTION;
+    entry.u.func = copyfunc(func);
+    addcmdentry(name, &entry);
+}
+/*
+ * Delete a function if it exists.
+ */
+int
+unsetfunc(name)
+    char *name;
+    {
+    struct tblentry *cmdp;
+    if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->cmdtype == CMDFUNCTION) {
+        freefunc(cmdp->param.func);
+        delete_cmd_entry();
+        return (0);
+    }
+    return (1);
+}
+/*
+ * Locate and print what a word is...
+ */
+int
+typecmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct cmdentry entry;
+    struct tblentry *cmdp;
+    char * const *pp;
+    struct alias *ap;
+    int i;
+    int err = 0;
+    extern char *const parsekwd[];
+    for (i = 1; i < argc; i++) {
+        out1str(argv[i]);
+        /* First look at the keywords */
+        for (pp = parsekwd; *pp; pp++)
+            if (**pp == *argv[i] && equal(*pp, argv[i]))
+                break;
+        if (*pp) {
+            out1str(" is a shell keyword\n");
+            continue;
+        }
+        /* Then look at the aliases */
+        if ((ap = lookupalias(argv[i], 1)) != NULL) {
+            out1fmt(" is an alias for %s\n", ap->val);
+            continue;
+        }
+        /* Then check if it is a tracked alias */
+        if ((cmdp = cmdlookup(argv[i], 0)) != NULL) {
+            entry.cmdtype = cmdp->cmdtype;
+            entry.u = cmdp->param;
+        }
+        else {
+            /* Finally use brute force */
+            find_command(argv[i], &entry, DO_ABS, pathval());
+        }
+        switch (entry.cmdtype) {
+        case CMDNORMAL: {
+            if (strchr(argv[i], '/') == NULL) {
+                const char *path = pathval();
+                char *name;
+                int j = entry.u.index;
+                do {
+                    name = padvance(&path, argv[i]);
+                    stunalloc(name);
+                } while (--j >= 0);
+                out1fmt(" is%s %s\n",
+                    cmdp ? " a tracked alias for" : "", name);
+            } else {
+                if (access(argv[i], X_OK) == 0)
+                    out1fmt(" is %s\n", argv[i]);
+                else
+                    out1fmt(": %s\n", strerror(errno));
+            }
+            break;
+        }
+        case CMDFUNCTION:
+            out1str(" is a shell function\n");
+            break;
+        case CMDBUILTIN:
+            out1str(" is a shell builtin\n");
+            break;
+        default:
+            out1str(": not found\n");
+            err |= 127;
+            break;
+        }
+    }
+    return err;
+}
+STATIC int
+describe_command(command, verbose)
+    char *command;
+    int verbose;
+{
+    struct cmdentry entry;
+    struct tblentry *cmdp;
+    char **pp;
+    struct alias *ap;
+    extern char *const parsekwd[];
+    for (pp = (char **)parsekwd; *pp; pp++)
+        if (**pp == *command && equal(*pp, command))
+            break;
+    if (*pp) {
+        if (verbose) {
+            out1fmt("%s is a reserved word\n", command);
+        } else {
+            out1fmt("%s\n", command);
+        }
+        return 0;
+    }
+    /* Then look at the aliases */
+    if ((ap = lookupalias(command, 1)) != NULL) {
+        if (verbose) {
+            out1fmt("%s is aliased to `%s'\n", command, ap->val);
+        } else {
+            out1fmt("alias %s='%s'\n", command, ap->val);
+        }
+        return 0;
+    }
+    /* Then check if it is a tracked alias */
+    if ((cmdp = cmdlookup(command, 0)) != NULL) {
+        entry.cmdtype = cmdp->cmdtype;
+        entry.u = cmdp->param;
+    }
+    else {
+        /* Finally use brute force */
+        find_command(command, &entry, DO_ABS, pathval());
+    }
+    switch (entry.cmdtype) {
+    case CMDNORMAL: {
+        int j = entry.u.index;
+        const char *path = pathval();
+        char *name;
+        if (j == -1)
+            name = command;
+        else {
+            do {
+                name = padvance(&path, command);
+                stunalloc(name);
+            } while (--j >= 0);
+        }
+        if (verbose) {
+            out1fmt("%s is %s\n", command, name);
+        } else {
+            out1fmt("%s\n", name);
+        }
+        break;
+    }
+    case CMDFUNCTION:
+        if (verbose) {
+            out1fmt("%s is a function\n", command);
+        } else {
+            out1fmt("%s\n", command);
+        }
+        break;
+    case CMDBUILTIN:
+        if (verbose) {
+            if (is_special_builtin(command)) {
+                out1fmt("%s is a special built-in utility\n", command);
+            } else {
+                out1fmt("%s is a built-in utility\n", command);
+            }
+        } else {
+            out1fmt("%s\n", command);
+        }
+        break;
+    default:
+        outfmt(out2, "%s not found\n", command);
+        return 127;
+    }
+    return 0;
+}
+int
+commandcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int c;
+    int default_path = 0;
+    int verify_only = 0;
+    int verbose_verify_only = 0;
+    while ((c = nextopt("pvV")) != '\0')
+        switch (c) {
+        case 'p':
+            default_path = 1;
+            break;
+        case 'v':
+            verify_only = 1;
+            break;
+        case 'V':
+            verbose_verify_only = 1;
+            break;
+        default:
+            outfmt(out2,
+"command: nextopt returned character code 0%o\n", c);
+            return EX_SOFTWARE;
+        }
+    if (default_path + verify_only + verbose_verify_only > 1 ||
+        !*argptr) {
+            outfmt(out2,
+"command [-p] command [arg ...]\n");
+            outfmt(out2,
+"command {-v|-V} command\n");
+            return EX_USAGE;
+    }
+    if (verify_only || verbose_verify_only) {
+        return describe_command(*argptr, verbose_verify_only);
+    }
+    return 0;
+}
+STATIC int
+path_change(newval, bltin)
+    const char *newval;
+    int *bltin;
+{
+    const char *old, *new;
+    int idx;
+    int firstchange;
+    old = pathval();
+    new = newval;
+    firstchange = 9999; /* assume no change */
+    idx = 0;
+    *bltin = -1;
+    for (;;) {
+        if (*old != *new) {
+            firstchange = idx;
+            if ((*old == '\0' && *new == ':')
+             || (*old == ':' && *new == '\0'))
+                firstchange++;
+            old = new;  /* ignore subsequent differences */
+        }
+        if (*new == '\0')
+            break;
+        if (*new == '%' && *bltin < 0 && prefix("builtin", new + 1))
+            *bltin = idx;
+        if (*new == ':') {
+            idx++;
+        }
+        new++, old++;
+    }
+    if (builtinloc >= 0 && *bltin < 0)
+        firstchange = 0;
+    return firstchange;
+}
+STATIC int
+is_regular_builtin(name)
+        const char *name;
+{
+        static const char *regular_builtins[] = {
+            "alias", "bg", "cd", "command", "false", "fc", "fg",
+            "getopts", "jobs", "kill", "newgrp", "read", "true",
+            "umask", "unalias", "wait", (char *)NULL
+        };
+        int i;
+        if (!name) return 0;
+        for (i = 0; regular_builtins[i]; i++)
+                if (equal(name, regular_builtins[i])) return 1;
+        return 0;
+}

 /trunk/uspace/app/ash/cd.c
 ,0 → 1,382
+/*  $NetBSD: cd.c,v 1.27 1999/07/09 03:05:49 christos Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)cd.c    8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: cd.c,v 1.27 1999/07/09 03:05:49 christos Exp $");
+#endif
+#endif /* not lint */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+/*
+ * The cd and pwd commands.
+ */
+#include "shell.h"
+#include "var.h"
+#include "nodes.h"  /* for jobs.h */
+#include "jobs.h"
+#include "options.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "exec.h"
+#include "redir.h"
+#include "mystring.h"
+#include "show.h"
+#include "cd.h"
+STATIC int docd (char *, int);
+STATIC char *getcomponent (void);
+STATIC void updatepwd (char *);
+char *curdir = NULL;        /* current working directory */
+char *prevdir;          /* previous working directory */
+STATIC char *cdcomppath;
+int
+cdcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    const char *dest;
+    const char *path;
+    char *p;
+    struct stat statb;
+    int print = 0;
+    nextopt(nullstr);
+    if ((dest = *argptr) == NULL && (dest = bltinlookup("HOME", 1)) == NULL)
+        error("HOME not set");
+    if (*dest == '\0')
+            dest = ".";
+    if (dest[0] == '-' && dest[1] == '\0') {
+        dest = prevdir ? prevdir : curdir;
+        print = 1;
+        if (dest)
+                print = 1;
+        else
+                dest = ".";
+    }
+    if (*dest == '/' || (path = bltinlookup("CDPATH", 1)) == NULL)
+        path = nullstr;
+    while ((p = padvance(&path, dest)) != NULL) {
+        if (stat(p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {
+            if (!print) {
+                /*
+                 * XXX - rethink
+                 */
+                if (p[0] == '.' && p[1] == '/' && p[2] != '\0')
+                    p += 2;
+                print = strcmp(p, dest);
+            }
+            if (docd(p, print) >= 0)
+                return 0;
+        }
+    }
+    error("can't cd to %s", dest);
+    /* NOTREACHED */
+}
+/*
+ * Actually do the chdir.  In an interactive shell, print the
+ * directory name if "print" is nonzero.
+ */
+STATIC int
+docd(dest, print)
+    char *dest;
+    int print;
+{
+    char *p;
+    char *q;
+    char *component;
+    struct stat statb;
+    int first;
+    int badstat;
+    TRACE(("docd(\"%s\", %d) called\n", dest, print));
+    /*
+     *  Check each component of the path. If we find a symlink or
+     *  something we can't stat, clear curdir to force a getcwd()
+     *  next time we get the value of the current directory.
+     */
+    badstat = 0;
+    cdcomppath = stalloc(strlen(dest) + 1);
+    scopy(dest, cdcomppath);
+    STARTSTACKSTR(p);
+    if (*dest == '/') {
+        STPUTC('/', p);
+        cdcomppath++;
+    }
+    first = 1;
+    while ((q = getcomponent()) != NULL) {
+        if (q[0] == '\0' || (q[0] == '.' && q[1] == '\0'))
+            continue;
+        if (! first)
+            STPUTC('/', p);
+        first = 0;
+        component = q;
+        while (*q)
+            STPUTC(*q++, p);
+        if (equal(component, ".."))
+            continue;
+        STACKSTRNUL(p);
+        if ((lstat(stackblock(), &statb) < 0)
+            || (S_ISLNK(statb.st_mode)))  {
+            /* print = 1; */
+            badstat = 1;
+            break;
+        }
+    }
+    INTOFF;
+    if (chdir(dest) < 0) {
+        INTON;
+        return -1;
+    }
+    updatepwd(badstat ? NULL : dest);
+    INTON;
+    if (print && iflag && curdir)
+        out1fmt("%s\n", curdir);
+    return 0;
+}
+/*
+ * Get the next component of the path name pointed to by cdcomppath.
+ * This routine overwrites the string pointed to by cdcomppath.
+ */
+STATIC char *
+getcomponent() {
+    char *p;
+    char *start;
+    if ((p = cdcomppath) == NULL)
+        return NULL;
+    start = cdcomppath;
+    while (*p != '/' && *p != '\0')
+        p++;
+    if (*p == '\0') {
+        cdcomppath = NULL;
+    } else {
+        *p++ = '\0';
+        cdcomppath = p;
+    }
+    return start;
+}
+/*
+ * Update curdir (the name of the current directory) in response to a
+ * cd command.  We also call hashcd to let the routines in exec.c know
+ * that the current directory has changed.
+ */
+STATIC void
+updatepwd(dir)
+    char *dir;
+    {
+    char *new;
+    char *p;
+    hashcd();               /* update command hash table */
+    /*
+     * If our argument is NULL, we don't know the current directory
+     * any more because we traversed a symbolic link or something
+     * we couldn't stat().
+     */
+    if (dir == NULL || curdir == NULL)  {
+        if (prevdir)
+            ckfree(prevdir);
+        INTOFF;
+        prevdir = curdir;
+        curdir = NULL;
+        getpwd();
+        setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
+        setvar("OLDPWD", prevdir, VEXPORT|VTEXTFIXED);
+        INTON;
+        return;
+    }
+    cdcomppath = stalloc(strlen(dir) + 1);
+    scopy(dir, cdcomppath);
+    STARTSTACKSTR(new);
+    if (*dir != '/') {
+        p = curdir;
+        while (*p)
+            STPUTC(*p++, new);
+        if (p[-1] == '/')
+            STUNPUTC(new);
+    }
+    while ((p = getcomponent()) != NULL) {
+        if (equal(p, "..")) {
+            while (new > stackblock() && (STUNPUTC(new), *new) != '/');
+        } else if (*p != '\0' && ! equal(p, ".")) {
+            STPUTC('/', new);
+            while (*p)
+                STPUTC(*p++, new);
+        }
+    }
+    if (new == stackblock())
+        STPUTC('/', new);
+    STACKSTRNUL(new);
+    INTOFF;
+    if (prevdir)
+        ckfree(prevdir);
+    prevdir = curdir;
+    curdir = savestr(stackblock());
+    setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
+    setvar("OLDPWD", prevdir, VEXPORT|VTEXTFIXED);
+    INTON;
+}
+int
+pwdcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    getpwd();
+    out1str(curdir);
+    out1c('\n');
+    return 0;
+}
+#define MAXPWD 256
+/*
+ * Find out what the current directory is. If we already know the current
+ * directory, this routine returns immediately.
+ */
+void
+getpwd()
+{
+    char buf[MAXPWD];
+    if (curdir)
+        return;
+    /*
+     * Things are a bit complicated here; we could have just used
+     * getcwd, but traditionally getcwd is implemented using popen
+     * to /bin/pwd. This creates a problem for us, since we cannot
+     * keep track of the job if it is being ran behind our backs.
+     * So we re-implement getcwd(), and we suppress interrupts
+     * throughout the process. This is not completely safe, since
+     * the user can still break out of it by killing the pwd program.
+     * We still try to use getcwd for systems that we know have a
+     * c implementation of getcwd, that does not open a pipe to
+     * /bin/pwd.
+     */
+#if defined(__NetBSD__) || defined(__SVR4) || defined(__GLIBC__)
+    if (getcwd(buf, sizeof(buf)) == NULL) {
+        char *pwd = getenv("PWD");
+        struct stat stdot, stpwd;
+        if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
+            stat(pwd, &stpwd) != -1 &&
+            stdot.st_dev == stpwd.st_dev &&
+            stdot.st_ino == stpwd.st_ino) {
+            curdir = savestr(pwd);
+            return;
+        }
+        error("getcwd() failed: %s", strerror(errno));
+    }
+    curdir = savestr(buf);
+#else
+    {
+        char *p;
+        int i;
+        int status;
+        struct job *jp;
+        int pip[2];
+        INTOFF;
+        if (pipe(pip) < 0)
+            error("Pipe call failed");
+        jp = makejob((union node *)NULL, 1);
+        if (forkshell(jp, (union node *)NULL, FORK_NOJOB) == 0) {
+            (void) close(pip[0]);
+            if (pip[1] != 1) {
+                close(1);
+                copyfd(pip[1], 1);
+                close(pip[1]);
+            }
+            (void) execl("/bin/pwd", "pwd", (char *)0);
+            error("Cannot exec /bin/pwd");
+        }
+        (void) close(pip[1]);
+        pip[1] = -1;
+        p = buf;
+        while ((i = read(pip[0], p, buf + MAXPWD - p)) > 0
+             || (i == -1 && errno == EINTR)) {
+            if (i > 0)
+                p += i;
+        }
+        (void) close(pip[0]);
+        pip[0] = -1;
+        status = waitforjob(jp);
+        if (status != 0)
+            error((char *)0);
+        if (i < 0 || p == buf || p[-1] != '\n')
+            error("pwd command failed");
+        p[-1] = '\0';
+    }
+    curdir = savestr(buf);
+    INTON;
+#endif
+}

 /trunk/uspace/app/ash/bltin/echo.c
 ,0 → 1,127
+/*  $NetBSD: echo.c,v 1.8 1996/11/02 18:26:06 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)echo.c  8.1 (Berkeley) 5/31/93
+ */
+/*
+ * Echo command.
+ */
+#define main echocmd
+#ifdef _GNU_SOURCE
+#include <stdio.h>
+#include "../mystring.h"
+#else
+#include "bltin.h"
+#endif
+/* #define eflag 1 */
+int
+main(argc, argv)  char **argv; {
+    register char **ap;
+    register char *p;
+    register char c;
+    int nflag = 0;
+#ifndef eflag
+    int eflag = 0;
+#endif
+    ap = argv;
+    if (argc)
+        ap++;
+    while ((p = *ap) != NULL && *p == '-') {
+        if (equal(p, "-n")) {
+            nflag = 1;
+        } else if (equal(p, "-e")) {
+#ifndef eflag
+            eflag = 1;
+#endif
+        } else if (equal(p, "-E")) {
+#ifndef eflag
+            eflag = 0;
+#endif
+        }
+        else break;
+        ap++;
+    }
+    while ((p = *ap++) != NULL) {
+        while ((c = *p++) != '\0') {
+            if (c == '\\' && eflag) {
+                switch (c = *p++) {
+                case 'a':  c = '\007'; break;
+                case 'b':  c = '\b';  break;
+                case 'c':  return 0;        /* exit */
+                case 'e':  c = '\033';  break;
+                case 'f':  c = '\f';  break;
+                case 'n':  c = '\n';  break;
+                case 'r':  c = '\r';  break;
+                case 't':  c = '\t';  break;
+                case 'v':  c = '\v';  break;
+                case '\\':  break;      /* c = '\\' */
+                case '0': case '1': case '2': case '3':
+                case '4': case '5': case '6': case '7':
+                    c -= '0';
+                    if (*p >= '0' && *p <= '7')
+                        c = c * 8 + (*p++ - '0');
+                    if (*p >= '0' && *p <= '7')
+                    c = c * 8 + (*p++ - '0');
+                    break;
+                default:
+                    p--;
+                    break;
+                }
+            }
+            putchar(c);
+        }
+        if (*ap)
+            putchar(' ');
+    }
+    if (! nflag)
+        putchar('\n');
+#ifdef _GNU_SOURCE
+    fflush(stdout);
+    if (ferror(stdout)) {
+        clearerr(stdout);
+        return 1;
+    }
+#endif
+    return 0;
+}

 /trunk/uspace/app/ash/bltin/test.c
 ,0 → 1,583
+/*  $NetBSD: test.c,v 1.22 2000/04/09 23:24:59 christos Exp $   */
+/*
+ * test(1); version 7-like  --  author Erik Baalbergen
+ * modified by Eric Gisin to be used as built-in.
+ * modified by Arnold Robbins to add SVR3 compatibility
+ * (-x -c -b -p -u -g -k) plus Korn's -L -nt -ot -ef and new -S (socket).
+ * modified by J.T. Conklin for NetBSD.
+ *
+ * This program is in the Public Domain.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: test.c,v 1.22 2000/04/09 23:24:59 christos Exp $");
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <err.h>
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+/* test(1) accepts the following grammar:
+    oexpr   ::= aexpr | aexpr "-o" oexpr ;
+    aexpr   ::= nexpr | nexpr "-a" aexpr ;
+    nexpr   ::= primary | "!" primary
+    primary ::= unary-operator operand
+        | operand binary-operator operand
+        | operand
+        | "(" oexpr ")"
+        ;
+    unary-operator ::= "-r"|"-w"|"-x"|"-f"|"-d"|"-c"|"-b"|"-p"|
+        "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
+    binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
+            "-nt"|"-ot"|"-ef";
+    operand ::= <any legal UNIX file name>
+*/
+enum token {
+    EOI,
+    FILRD,
+    FILWR,
+    FILEX,
+    FILEXIST,
+    FILREG,
+    FILDIR,
+    FILCDEV,
+    FILBDEV,
+    FILFIFO,
+    FILSOCK,
+    FILSYM,
+    FILGZ,
+    FILTT,
+    FILSUID,
+    FILSGID,
+    FILSTCK,
+    FILNT,
+    FILOT,
+    FILEQ,
+    FILUID,
+    FILGID,
+    STREZ,
+    STRNZ,
+    STREQ,
+    STRNE,
+    STRLT,
+    STRGT,
+    INTEQ,
+    INTNE,
+    INTGE,
+    INTGT,
+    INTLE,
+    INTLT,
+    UNOT,
+    BAND,
+    BOR,
+    LPAREN,
+    RPAREN,
+    OPERAND
+};
+enum token_types {
+    UNOP,
+    BINOP,
+    BUNOP,
+    BBINOP,
+    PAREN
+};
+static struct t_op {
+    const char *op_text;
+    short op_num, op_type;
+} const ops [] = {
+    {"-r",  FILRD,  UNOP},
+    {"-w",  FILWR,  UNOP},
+    {"-x",  FILEX,  UNOP},
+    {"-e",  FILEXIST,UNOP},
+    {"-f",  FILREG, UNOP},
+    {"-d",  FILDIR, UNOP},
+    {"-c",  FILCDEV,UNOP},
+    {"-b",  FILBDEV,UNOP},
+    {"-p",  FILFIFO,UNOP},
+    {"-u",  FILSUID,UNOP},
+    {"-g",  FILSGID,UNOP},
+    {"-k",  FILSTCK,UNOP},
+    {"-s",  FILGZ,  UNOP},
+    {"-t",  FILTT,  UNOP},
+    {"-z",  STREZ,  UNOP},
+    {"-n",  STRNZ,  UNOP},
+    {"-h",  FILSYM, UNOP},      /* for backwards compat */
+    {"-O",  FILUID, UNOP},
+    {"-G",  FILGID, UNOP},
+    {"-L",  FILSYM, UNOP},
+    {"-S",  FILSOCK,UNOP},
+    {"=",   STREQ,  BINOP},
+    {"!=",  STRNE,  BINOP},
+    {"<",   STRLT,  BINOP},
+    {">",   STRGT,  BINOP},
+    {"-eq", INTEQ,  BINOP},
+    {"-ne", INTNE,  BINOP},
+    {"-ge", INTGE,  BINOP},
+    {"-gt", INTGT,  BINOP},
+    {"-le", INTLE,  BINOP},
+    {"-lt", INTLT,  BINOP},
+    {"-nt", FILNT,  BINOP},
+    {"-ot", FILOT,  BINOP},
+    {"-ef", FILEQ,  BINOP},
+    {"!",   UNOT,   BUNOP},
+    {"-a",  BAND,   BBINOP},
+    {"-o",  BOR,    BBINOP},
+    {"(",   LPAREN, PAREN},
+    {")",   RPAREN, PAREN},
+    {0, 0,  0}
+};
+static char **t_wp;
+static struct t_op const *t_wp_op;
+static gid_t *group_array = NULL;
+static int ngroups;
+static void syntax __P((const char *, const char *));
+static int oexpr __P((enum token));
+static int aexpr __P((enum token));
+static int nexpr __P((enum token));
+static int primary __P((enum token));
+static int binop __P((void));
+static int filstat __P((char *, enum token));
+static enum token t_lex __P((char *));
+static int isoperand __P((void));
+static int getn __P((const char *));
+static int newerf __P((const char *, const char *));
+static int olderf __P((const char *, const char *));
+static int equalf __P((const char *, const char *));
+static int test_eaccess();
+static int bash_group_member();
+static void initialize_group_array();
+#if defined(SHELL)
+extern void error __P((const char *, ...)) __attribute__((__noreturn__));
+#else
+static void error __P((const char *, ...)) __attribute__((__noreturn__));
+static void
+#ifdef __STDC__
+error(const char *msg, ...)
+#else
+error(va_alist)
+    va_dcl
+#endif
+{
+    va_list ap;
+#ifndef __STDC__
+    const char *msg;
+    va_start(ap);
+    msg = va_arg(ap, const char *);
+#else
+    va_start(ap, msg);
+#endif
+    verrx(2, msg, ap);
+    /*NOTREACHED*/
+    va_end(ap);
+}
+#endif
+#ifdef SHELL
+int testcmd __P((int, char **));
+int
+testcmd(argc, argv)
+    int argc;
+    char **argv;
+#else
+int main __P((int, char **));
+int
+main(argc, argv)
+    int argc;
+    char **argv;
+#endif
+{
+    int res;
+    if (strcmp(argv[0], "[") == 0) {
+        if (strcmp(argv[--argc], "]"))
+            error("missing ]");
+        argv[argc] = NULL;
+    }
+    if (argc < 2)
+        return 1;
+    t_wp = &argv[1];
+    res = !oexpr(t_lex(*t_wp));
+    if (*t_wp != NULL && *++t_wp != NULL)
+        syntax(*t_wp, "unexpected operator");
+    return res;
+}
+static void
+syntax(op, msg)
+    const char  *op;
+    const char  *msg;
+{
+    if (op && *op)
+        error("%s: %s", op, msg);
+    else
+        error("%s", msg);
+}
+static int
+oexpr(n)
+    enum token n;
+{
+    int res;
+    res = aexpr(n);
+    if (t_lex(*++t_wp) == BOR)
+        return oexpr(t_lex(*++t_wp)) || res;
+    t_wp--;
+    return res;
+}
+static int
+aexpr(n)
+    enum token n;
+{
+    int res;
+    res = nexpr(n);
+    if (t_lex(*++t_wp) == BAND)
+        return aexpr(t_lex(*++t_wp)) && res;
+    t_wp--;
+    return res;
+}
+static int
+nexpr(n)
+    enum token n;           /* token */
+{
+    if (n == UNOT)
+        return !nexpr(t_lex(*++t_wp));
+    return primary(n);
+}
+static int
+primary(n)
+    enum token n;
+{
+    enum token nn;
+    int res;
+    if (n == EOI)
+        return 0;       /* missing expression */
+    if (n == LPAREN) {
+        if ((nn = t_lex(*++t_wp)) == RPAREN)
+            return 0;   /* missing expression */
+        res = oexpr(nn);
+        if (t_lex(*++t_wp) != RPAREN)
+            syntax(NULL, "closing paren expected");
+        return res;
+    }
+    if (t_wp_op && t_wp_op->op_type == UNOP) {
+        /* unary expression */
+        if (*++t_wp == NULL)
+            syntax(t_wp_op->op_text, "argument expected");
+        switch (n) {
+        case STREZ:
+            return strlen(*t_wp) == 0;
+        case STRNZ:
+            return strlen(*t_wp) != 0;
+        case FILTT:
+            return isatty(getn(*t_wp));
+        default:
+            return filstat(*t_wp, n);
+        }
+    }
+    if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) {
+        return binop();
+    }
+    return strlen(*t_wp) > 0;
+}
+static int
+binop()
+{
+    const char *opnd1, *opnd2;
+    struct t_op const *op;
+    opnd1 = *t_wp;
+    (void) t_lex(*++t_wp);
+    op = t_wp_op;
+    if ((opnd2 = *++t_wp) == (char *)0)
+        syntax(op->op_text, "argument expected");
+    switch (op->op_num) {
+    case STREQ:
+        return strcmp(opnd1, opnd2) == 0;
+    case STRNE:
+        return strcmp(opnd1, opnd2) != 0;
+    case STRLT:
+        return strcmp(opnd1, opnd2) < 0;
+    case STRGT:
+        return strcmp(opnd1, opnd2) > 0;
+    case INTEQ:
+        return getn(opnd1) == getn(opnd2);
+    case INTNE:
+        return getn(opnd1) != getn(opnd2);
+    case INTGE:
+        return getn(opnd1) >= getn(opnd2);
+    case INTGT:
+        return getn(opnd1) > getn(opnd2);
+    case INTLE:
+        return getn(opnd1) <= getn(opnd2);
+    case INTLT:
+        return getn(opnd1) < getn(opnd2);
+    case FILNT:
+        return newerf (opnd1, opnd2);
+    case FILOT:
+        return olderf (opnd1, opnd2);
+    case FILEQ:
+        return equalf (opnd1, opnd2);
+    default:
+        abort();
+        /* NOTREACHED */
+    }
+}
+static int
+filstat(nm, mode)
+    char *nm;
+    enum token mode;
+{
+    struct stat s;
+    if (mode == FILSYM ? lstat(nm, &s) : stat(nm, &s))
+        return 0;
+    switch (mode) {
+    case FILRD:
+        return test_eaccess(nm, R_OK) == 0;
+    case FILWR:
+        return test_eaccess(nm, W_OK) == 0;
+    case FILEX:
+        return test_eaccess(nm, X_OK) == 0;
+    case FILEXIST:
+        return 1;
+    case FILREG:
+        return S_ISREG(s.st_mode);
+    case FILDIR:
+        return S_ISDIR(s.st_mode);
+    case FILCDEV:
+        return S_ISCHR(s.st_mode);
+    case FILBDEV:
+        return S_ISBLK(s.st_mode);
+    case FILFIFO:
+        return S_ISFIFO(s.st_mode);
+    case FILSOCK:
+        return S_ISSOCK(s.st_mode);
+    case FILSYM:
+        return S_ISLNK(s.st_mode);
+    case FILSUID:
+        return (s.st_mode & S_ISUID) != 0;
+    case FILSGID:
+        return (s.st_mode & S_ISGID) != 0;
+    case FILSTCK:
+        return (s.st_mode & S_ISVTX) != 0;
+    case FILGZ:
+        return s.st_size > (off_t)0;
+    case FILUID:
+        return s.st_uid == geteuid();
+    case FILGID:
+        return s.st_gid == getegid();
+    default:
+        return 1;
+    }
+}
+static enum token
+t_lex(s)
+    char *s;
+{
+    struct t_op const *op = ops;
+    if (s == 0) {
+        t_wp_op = (struct t_op *)0;
+        return EOI;
+    }
+    while (op->op_text) {
+        if (strcmp(s, op->op_text) == 0) {
+            if ((op->op_type == UNOP && isoperand()) ||
+                (op->op_num == LPAREN && *(t_wp+1) == 0))
+                break;
+            t_wp_op = op;
+            return op->op_num;
+        }
+        op++;
+    }
+    t_wp_op = (struct t_op *)0;
+    return OPERAND;
+}
+static int
+isoperand()
+{
+    struct t_op const *op = ops;
+    char *s;
+    char *t;
+    if ((s  = *(t_wp+1)) == 0)
+        return 1;
+    if ((t = *(t_wp+2)) == 0)
+        return 0;
+    while (op->op_text) {
+        if (strcmp(s, op->op_text) == 0)
+                return op->op_type == BINOP &&
+                    (t[0] != ')' || t[1] != '\0');
+        op++;
+    }
+    return 0;
+}
+/* atoi with error detection */
+static int
+getn(s)
+    const char *s;
+{
+    char *p;
+    long r;
+    errno = 0;
+    r = strtol(s, &p, 10);
+    if (errno != 0)
+          error("%s: out of range", s);
+    while (isspace((unsigned char)*p))
+          p++;
+    if (*p)
+          error("%s: bad number", s);
+    return (int) r;
+}
+static int
+newerf (f1, f2)
+const char *f1, *f2;
+{
+    struct stat b1, b2;
+    return (stat (f1, &b1) == 0 &&
+        stat (f2, &b2) == 0 &&
+        b1.st_mtime > b2.st_mtime);
+}
+static int
+olderf (f1, f2)
+const char *f1, *f2;
+{
+    struct stat b1, b2;
+    return (stat (f1, &b1) == 0 &&
+        stat (f2, &b2) == 0 &&
+        b1.st_mtime < b2.st_mtime);
+}
+static int
+equalf (f1, f2)
+const char *f1, *f2;
+{
+    struct stat b1, b2;
+    return (stat (f1, &b1) == 0 &&
+        stat (f2, &b2) == 0 &&
+        b1.st_dev == b2.st_dev &&
+        b1.st_ino == b2.st_ino);
+}
+/* Do the same thing access(2) does, but use the effective uid and gid,
+   and don't make the mistake of telling root that any file is
+   executable. */
+static int
+test_eaccess (path, mode)
+char *path;
+int mode;
+{
+    struct stat st;
+    int euid = geteuid();
+    if (stat (path, &st) < 0)
+        return (-1);
+    if (euid == 0) {
+        /* Root can read or write any file. */
+        if (mode != X_OK)
+        return (0);
+        /* Root can execute any file that has any one of the execute
+           bits set. */
+        if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
+            return (0);
+    }
+    if (st.st_uid == euid)      /* owner */
+        mode <<= 6;
+    else if (bash_group_member (st.st_gid))
+        mode <<= 3;
+    if (st.st_mode & mode)
+        return (0);
+    return (-1);
+}
+static void
+initialize_group_array ()
+{
+    ngroups = getgroups(0, NULL);
+    group_array = malloc(ngroups * sizeof(gid_t));
+    if (!group_array)
+        error(strerror(ENOMEM));
+    getgroups(ngroups, group_array);
+}
+/* Return non-zero if GID is one that we have in our groups list. */
+static int
+bash_group_member (gid)
+gid_t gid;
+{
+    register int i;
+    /* Short-circuit if possible, maybe saving a call to getgroups(). */
+    if (gid == getgid() || gid == getegid())
+        return (1);
+    if (ngroups == 0)
+        initialize_group_array ();
+    /* Search through the list looking for GID. */
+    for (i = 0; i < ngroups; i++)
+        if (gid == group_array[i])
+            return (1);
+    return (0);
+}

 /trunk/uspace/app/ash/bltin/times.c
 ,0 → 1,30
+#ifdef _GNU_SOURCE
+/*
+ * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
+ * This file contains code for the times builtin.
+ * $Id: ash-0.4.0-cumulative_fixes-1.patch,v 1.1 2004/06/04 10:32:01 jim Exp $
+ */
+#include <stdio.h>
+#include <sys/times.h>
+#include <unistd.h>
+#define main timescmd
+int main() {
+    struct tms buf;
+    long int clk_tck = sysconf(_SC_CLK_TCK);
+    times(&buf);
+    printf("%dm%fs %dm%fs\n%dm%fs %dm%fs\n",
+           (int) (buf.tms_utime / clk_tck / 60),
+           ((double) buf.tms_utime) / clk_tck,
+           (int) (buf.tms_stime / clk_tck / 60),
+           ((double) buf.tms_stime) / clk_tck,
+           (int) (buf.tms_cutime / clk_tck / 60),
+           ((double) buf.tms_cutime) / clk_tck,
+           (int) (buf.tms_cstime / clk_tck / 60),
+           ((double) buf.tms_cstime) / clk_tck);
+    return 0;
+}
+#endif  /* _GNU_SOURCE */

 /trunk/uspace/app/ash/bltin/echo.1
 ,0 → 1,113
+.\" $NetBSD: echo.1,v 1.9 1999/03/22 18:30:47 garbled Exp $
+.\"
+.\" Copyright (c) 1991, 1993
+.\" The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Kenneth Almquist.
+.\" Copyright 1989 by Kenneth Almquist
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\" This product includes software developed by the University of
+.\" California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" @(#)echo.1  8.1 (Berkeley) 5/31/93
+.\"
+.Dd May 31, 1993
+.Dt ECHO 1
+.Os
+.Sh NAME
+.Nm echo
+.Nd produce message in a shell script
+.Sh SYNOPSIS
+.Nm
+.Op Fl n | Fl e
+.Ar args...
+.Sh DESCRIPTION
+.Nm
+prints its arguments on the standard output, separated by spaces.
+Unless the
+.Fl n
+option is present, a newline is output following the arguments.
+The
+.Fl e
+option causes
+.Nm
+to treat the escape sequences specially, as described in the following
+paragraph.
+The
+.Fl e
+option is the default, and is provided solely for compatibility with
+other systems.
+Only one of the options
+.Fl n
+and
+.Fl e
+may be given.
+.Pp
+If any of the following sequences of characters is encountered during
+output, the sequence is not output.  Instead, the specified action is
+performed:
+.Bl -tag -width indent
+.It Li \eb
+A backspace character is output.
+.It Li \ec
+Subsequent output is suppressed.  This is normally used at the end of the
+last argument to suppress the trailing newline that
+.Nm
+would otherwise output.
+.It Li \ef
+Output a form feed.
+.It Li \en
+Output a newline character.
+.It Li \er
+Output a carriage return.
+.It Li \et
+Output a (horizontal) tab character.
+.It Li \ev
+Output a vertical tab.
+.It Li \e0 Ns Ar digits
+Output the character whose value is given by zero to three digits.
+If there are zero digits, a nul character is output.
+.It Li \e\e
+Output a backslash.
+.El
+.Sh HINTS
+Remember that backslash is special to the shell and needs to be escaped.
+To output a message to standard error, say
+.Pp
+.D1  echo message >&2
+.Sh BUGS
+The octal character escape mechanism
+.Pq Li \e0 Ns Ar digits
+differs from the
+C language mechanism.
+.Pp
+There is no way to force
+.Nm
+to treat its arguments literally, rather than interpreting them as
+options and escape sequences.

 /trunk/uspace/app/ash/bltin/bltin.h
 ,0 → 1,81
+/*  $NetBSD: bltin.h,v 1.9 1997/07/04 21:02:29 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)bltin.h 8.1 (Berkeley) 5/31/93
+ */
+/*
+ * This file is included by programs which are optionally built into the
+ * shell.  If SHELL is defined, we try to map the standard UNIX library
+ * routines to ash routines using defines.
+ */
+#include "../shell.h"
+#include "../mystring.h"
+#include "../memalloc.h"
+#ifdef SHELL
+#include "../output.h"
+#ifndef _GNU_SOURCE
+#define stdout out1
+#define stderr out2
+#define printf out1fmt
+#define putc(c, file)   outc(c, file)
+#define putchar(c)  out1c(c)
+#define fprintf outfmt
+#define fputs outstr
+#define fflush flushout
+#define warnx(a, b, c) {                \
+    char buf[64];                   \
+    (void)snprintf(buf, sizeof(buf), a, b, c);  \
+    error("%s", buf);               \
+}
+#endif
+#define INITARGS(argv)
+#else
+#undef NULL
+#include <stdio.h>
+#undef main
+#define INITARGS(argv)  if ((commandname = argv[0]) == NULL) {fputs("Argc is zero\n", stderr); exit(2);} else
+#endif
+pointer stalloc __P((int));
+void error __P((char *, ...));
+int echocmd __P((int, char **));
+extern char *commandname;

 /trunk/uspace/app/ash/memalloc.c
 ,0 → 1,329
+/*  $NetBSD: memalloc.c,v 1.23 2000/11/01 19:56:01 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)memalloc.c  8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: memalloc.c,v 1.23 2000/11/01 19:56:01 christos Exp $");
+#endif
+#endif /* not lint */
+#include <stdlib.h>
+#include <unistd.h>
+#include "shell.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "machdep.h"
+#include "mystring.h"
+/*
+ * Like malloc, but returns an error when out of space.
+ */
+pointer
+ckmalloc(nbytes)
+    int nbytes;
+{
+    pointer p;
+    INTOFF;
+    p = malloc(nbytes);
+    INTON;
+    if (p == NULL)
+        error("Out of space");
+    return p;
+}
+/*
+ * Same for realloc.
+ */
+pointer
+ckrealloc(p, nbytes)
+    pointer p;
+    int nbytes;
+{
+    if ((p = realloc(p, nbytes)) == NULL)
+        error("Out of space");
+    return p;
+}
+/*
+ * Make a copy of a string in safe storage.
+ */
+char *
+savestr(s)
+    char *s;
+    {
+    char *p;
+    p = ckmalloc(strlen(s) + 1);
+    scopy(s, p);
+    return p;
+}
+/*
+ * Parse trees for commands are allocated in lifo order, so we use a stack
+ * to make this more efficient, and also to avoid all sorts of exception
+ * handling code to handle interrupts in the middle of a parse.
+ *
+ * The size 504 was chosen because the Ultrix malloc handles that size
+ * well.
+ */
+#define MINSIZE 504     /* minimum size of a block */
+struct stack_block {
+    struct stack_block *prev;
+    char space[MINSIZE];
+};
+struct stack_block stackbase;
+struct stack_block *stackp = &stackbase;
+struct stackmark *markp;
+char *stacknxt = stackbase.space;
+int stacknleft = MINSIZE;
+int sstrnleft;
+int herefd = -1;
+pointer
+stalloc(nbytes)
+    int nbytes;
+{
+    char *p;
+    nbytes = ALIGN(nbytes);
+    if (nbytes > stacknleft) {
+        int blocksize;
+        struct stack_block *sp;
+        blocksize = nbytes;
+        if (blocksize < MINSIZE)
+            blocksize = MINSIZE;
+        INTOFF;
+        sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize);
+        sp->prev = stackp;
+        stacknxt = sp->space;
+        stacknleft = blocksize;
+        stackp = sp;
+        INTON;
+    }
+    p = stacknxt;
+    stacknxt += nbytes;
+    stacknleft -= nbytes;
+    return p;
+}
+void
+stunalloc(p)
+    pointer p;
+    {
+    if (p == NULL) {        /*DEBUG */
+        write(2, "stunalloc\n", 10);
+        abort();
+    }
+    stacknleft += stacknxt - (char *)p;
+    stacknxt = p;
+}
+void
+setstackmark(mark)
+    struct stackmark *mark;
+    {
+    mark->stackp = stackp;
+    mark->stacknxt = stacknxt;
+    mark->stacknleft = stacknleft;
+    mark->marknext = markp;
+    markp = mark;
+}
+void
+popstackmark(mark)
+    struct stackmark *mark;
+    {
+    struct stack_block *sp;
+    INTOFF;
+    markp = mark->marknext;
+    while (stackp != mark->stackp) {
+        sp = stackp;
+        stackp = sp->prev;
+        ckfree(sp);
+    }
+    stacknxt = mark->stacknxt;
+    stacknleft = mark->stacknleft;
+    INTON;
+}
+/*
+ * When the parser reads in a string, it wants to stick the string on the
+ * stack and only adjust the stack pointer when it knows how big the
+ * string is.  Stackblock (defined in stack.h) returns a pointer to a block
+ * of space on top of the stack and stackblocklen returns the length of
+ * this block.  Growstackblock will grow this space by at least one byte,
+ * possibly moving it (like realloc).  Grabstackblock actually allocates the
+ * part of the block that has been used.
+ */
+void
+growstackblock() {
+    char *p;
+    int newlen = ALIGN(stacknleft * 2 + 100);
+    char *oldspace = stacknxt;
+    int oldlen = stacknleft;
+    struct stack_block *sp;
+    struct stack_block *oldstackp;
+    if (stacknxt == stackp->space && stackp != &stackbase) {
+        INTOFF;
+        oldstackp = stackp;
+        sp = stackp;
+        stackp = sp->prev;
+        sp = ckrealloc((pointer)sp, sizeof(struct stack_block) - MINSIZE + newlen);
+        sp->prev = stackp;
+        stackp = sp;
+        stacknxt = sp->space;
+        stacknleft = newlen;
+        {
+          /* Stack marks pointing to the start of the old block
+           * must be relocated to point to the new block
+           */
+          struct stackmark *xmark;
+          xmark = markp;
+          while (xmark != NULL && xmark->stackp == oldstackp) {
+            xmark->stackp = stackp;
+            xmark->stacknxt = stacknxt;
+            xmark->stacknleft = stacknleft;
+            xmark = xmark->marknext;
+          }
+        }
+        INTON;
+    } else {
+        p = stalloc(newlen);
+        memcpy(p, oldspace, oldlen);
+        stacknxt = p;           /* free the space */
+        stacknleft += newlen;       /* we just allocated */
+    }
+}
+void
+grabstackblock(len)
+    int len;
+{
+    len = ALIGN(len);
+    stacknxt += len;
+    stacknleft -= len;
+}
+/*
+ * The following routines are somewhat easier to use that the above.
+ * The user declares a variable of type STACKSTR, which may be declared
+ * to be a register.  The macro STARTSTACKSTR initializes things.  Then
+ * the user uses the macro STPUTC to add characters to the string.  In
+ * effect, STPUTC(c, p) is the same as *p++ = c except that the stack is
+ * grown as necessary.  When the user is done, she can just leave the
+ * string there and refer to it using stackblock().  Or she can allocate
+ * the space for it using grabstackstr().  If it is necessary to allow
+ * someone else to use the stack temporarily and then continue to grow
+ * the string, the user should use grabstack to allocate the space, and
+ * then call ungrabstr(p) to return to the previous mode of operation.
+ *
+ * USTPUTC is like STPUTC except that it doesn't check for overflow.
+ * CHECKSTACKSPACE can be called before USTPUTC to ensure that there
+ * is space for at least one character.
+ */
+char *
+growstackstr() {
+    int len = stackblocksize();
+    if (herefd >= 0 && len >= 1024) {
+        xwrite(herefd, stackblock(), len);
+        sstrnleft = len - 1;
+        return stackblock();
+    }
+    growstackblock();
+    sstrnleft = stackblocksize() - len - 1;
+    return stackblock() + len;
+}
+/*
+ * Called from CHECKSTRSPACE.
+ */
+char *
+makestrspace() {
+    int len = stackblocksize() - sstrnleft;
+    growstackblock();
+    sstrnleft = stackblocksize() - len;
+    return stackblock() + len;
+}
+void
+ungrabstackstr(s, p)
+    char *s;
+    char *p;
+    {
+    stacknleft += stacknxt - s;
+    stacknxt = s;
+    sstrnleft = stacknleft - (p - s);
+}

 /trunk/uspace/app/ash/alias.c
 ,0 → 1,267
+/*  $NetBSD: alias.c,v 1.10 1998/05/20 00:27:56 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+//#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: alias.c,v 1.10 1998/05/20 00:27:56 christos Exp $");
+#endif
+#endif /* not lint */
+#include <stdlib.h>
+#include "shell.h"
+#include "input.h"
+#include "output.h"
+#include "error.h"
+#include "memalloc.h"
+#include "mystring.h"
+#include "alias.h"
+#include "options.h"    /* XXX for argptr (should remove?) */
+#define ATABSIZE 39
+struct alias *atab[ATABSIZE];
+STATIC void setalias (char *, char *);
+STATIC int unalias (char *);
+STATIC struct alias **hashalias (char *);
+STATIC
+void
+setalias(char *name, char *val)
+{
+    struct alias *ap, **app;
+    app = hashalias(name);
+    for (ap = *app; ap; ap = ap->next) {
+        if (equal(name, ap->name)) {
+            INTOFF;
+            ckfree(ap->val);
+            ap->val = savestr(val);
+            INTON;
+            return;
+        }
+    }
+    /* not found */
+    INTOFF;
+    ap = ckmalloc(sizeof (struct alias));
+    ap->name = savestr(name);
+    /*
+     * XXX - HACK: in order that the parser will not finish reading the
+     * alias value off the input before processing the next alias, we
+     * dummy up an extra space at the end of the alias.  This is a crock
+     * and should be re-thought.  The idea (if you feel inclined to help)
+     * is to avoid alias recursions.  The mechanism used is: when
+     * expanding an alias, the value of the alias is pushed back on the
+     * input as a string and a pointer to the alias is stored with the
+     * string.  The alias is marked as being in use.  When the input
+     * routine finishes reading the string, it markes the alias not
+     * in use.  The problem is synchronization with the parser.  Since
+     * it reads ahead, the alias is marked not in use before the
+     * resulting token(s) is next checked for further alias sub.  The
+     * H A C K is that we add a little fluff after the alias value
+     * so that the string will not be exhausted.  This is a good
+     * idea ------- ***NOT***
+     */
+#ifdef notyet
+    ap->val = savestr(val);
+#else /* hack */
+    {
+    int len = strlen(val);
+    ap->val = ckmalloc(len + 2);
+    memcpy(ap->val, val, len);
+    ap->val[len] = ' '; /* fluff */
+    ap->val[len+1] = '\0';
+    }
+#endif
+    ap->next = *app;
+    *app = ap;
+    INTON;
+}
+STATIC int
+unalias(name)
+    char *name;
+    {
+    struct alias *ap, **app;
+    app = hashalias(name);
+    for (ap = *app; ap; app = &(ap->next), ap = ap->next) {
+        if (equal(name, ap->name)) {
+            /*
+             * if the alias is currently in use (i.e. its
+             * buffer is being used by the input routine) we
+             * just null out the name instead of freeing it.
+             * We could clear it out later, but this situation
+             * is so rare that it hardly seems worth it.
+             */
+            if (ap->flag & ALIASINUSE)
+                *ap->name = '\0';
+            else {
+                INTOFF;
+                *app = ap->next;
+                ckfree(ap->name);
+                ckfree(ap->val);
+                ckfree(ap);
+                INTON;
+            }
+            return (0);
+        }
+    }
+    return (1);
+}
+#ifdef mkinit
+MKINIT void rmaliases (void);
+SHELLPROC {
+    rmaliases();
+}
+#endif
+void
+rmaliases() {
+    struct alias *ap, *tmp;
+    int i;
+    INTOFF;
+    for (i = 0; i < ATABSIZE; i++) {
+        ap = atab[i];
+        atab[i] = NULL;
+        while (ap) {
+            ckfree(ap->name);
+            ckfree(ap->val);
+            tmp = ap;
+            ap = ap->next;
+            ckfree(tmp);
+        }
+    }
+    INTON;
+}
+struct alias *
+lookupalias(name, check)
+    char *name;
+    int check;
+{
+    struct alias *ap = *hashalias(name);
+    for (; ap; ap = ap->next) {
+        if (equal(name, ap->name)) {
+            if (check && (ap->flag & ALIASINUSE))
+                return (NULL);
+            return (ap);
+        }
+    }
+    return (NULL);
+}
+/*
+ * TODO - sort output
+ */
+int
+aliascmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char *n, *v;
+    int ret = 0;
+    struct alias *ap;
+    if (argc == 1) {
+        int i;
+        for (i = 0; i < ATABSIZE; i++)
+            for (ap = atab[i]; ap; ap = ap->next) {
+                if (*ap->name != '\0')
+                    out1fmt("alias %s=%s\n", ap->name, ap->val);
+            }
+        return (0);
+    }
+    while ((n = *++argv) != NULL) {
+        if ((v = strchr(n+1, '=')) == NULL) { /* n+1: funny ksh stuff */
+            if ((ap = lookupalias(n, 0)) == NULL) {
+                outfmt(out2, "alias: %s not found\n", n);
+                ret = 1;
+            } else
+                out1fmt("alias %s=%s\n", n, ap->val);
+        }
+        else {
+            *v++ = '\0';
+            setalias(n, v);
+        }
+    }
+    return (ret);
+}
+int
+unaliascmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int i;
+    while ((i = nextopt("a")) != '\0') {
+        if (i == 'a') {
+            rmaliases();
+            return (0);
+        }
+    }
+    for (i = 0; *argptr; argptr++)
+        i = unalias(*argptr);
+    return (i);
+}
+STATIC struct alias **
+hashalias(p)
+    char *p;
+    {
+    unsigned int hashval;
+    hashval = *p << 4;
+    while (*p)
+        hashval+= *p++;
+    return &atab[hashval % ATABSIZE];
+}

 /trunk/uspace/app/ash/exec.h
 ,0 → 1,79
+/*  $NetBSD: exec.h,v 1.17 2000/05/22 10:18:47 elric Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)exec.h  8.3 (Berkeley) 6/8/95
+ */
+/* values of cmdtype */
+#define CMDUNKNOWN -1       /* no entry in table for command */
+#define CMDNORMAL 0     /* command is an executable program */
+#define CMDBUILTIN 1        /* command is a shell builtin */
+#define CMDFUNCTION 2       /* command is a shell function */
+struct cmdentry {
+    int cmdtype;
+    union param {
+        int index;
+        union node *func;
+    } u;
+};
+#define DO_ERR  1       /* find_command prints errors */
+#define DO_ABS  2       /* find_command checks absolute paths */
+#define DO_NOFUN    4   /* find_command ignores functions */
+#define DO_BRUTE    8   /* find_command ignores hash table */
+extern const char *pathopt; /* set by padvance */
+extern int exerrno;     /* last exec error */
+void shellexec (char **, char **, const char *, int)
+    __attribute__((noreturn));
+char *padvance (const char **, const char *);
+int hashcmd (int, char **);
+void find_command (char *, struct cmdentry *, int, const char *);
+int find_builtin (char *);
+void hashcd (void);
+void changepath (const char *);
+void deletefuncs (void);
+void getcmdentry (char *, struct cmdentry *);
+void addcmdentry (char *, struct cmdentry *);
+void defun (char *, union node *);
+int unsetfunc (char *);
+int typecmd (int, char **);
+int commandcmd (int, char **);

 /trunk/uspace/app/ash/nodes.c.pat
 ,0 → 1,169
+/*  $NetBSD: nodes.c.pat,v 1.8 1997/04/11 23:03:09 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95
+ */
+#include <stdlib.h>
+/*
+ * Routine for dealing with parsed shell commands.
+ */
+#include "shell.h"
+#include "nodes.h"
+#include "memalloc.h"
+#include "machdep.h"
+#include "mystring.h"
+int     funcblocksize;      /* size of structures in function */
+int     funcstringsize;     /* size of strings in node */
+pointer funcblock;      /* block to allocate function from */
+char   *funcstring;     /* block to allocate strings from */
+%SIZES
+STATIC void calcsize (union node *);
+STATIC void sizenodelist (struct nodelist *);
+STATIC union node *copynode (union node *);
+STATIC struct nodelist *copynodelist (struct nodelist *);
+STATIC char *nodesavestr (char *);
+/*
+ * Make a copy of a parse tree.
+ */
+union node *
+copyfunc(n)
+    union node *n;
+{
+    if (n == NULL)
+        return NULL;
+    funcblocksize = 0;
+    funcstringsize = 0;
+    calcsize(n);
+    funcblock = ckmalloc(funcblocksize + funcstringsize);
+    funcstring = (char *) funcblock + funcblocksize;
+    return copynode(n);
+}
+STATIC void
+calcsize(n)
+    union node *n;
+{
+    %CALCSIZE
+}
+STATIC void
+sizenodelist(lp)
+    struct nodelist *lp;
+{
+    while (lp) {
+        funcblocksize += ALIGN(sizeof(struct nodelist));
+        calcsize(lp->n);
+        lp = lp->next;
+    }
+}
+STATIC union node *
+copynode(n)
+    union node *n;
+{
+    union node *new;
+    %COPY
+    return new;
+}
+STATIC struct nodelist *
+copynodelist(lp)
+    struct nodelist *lp;
+{
+    struct nodelist *start;
+    struct nodelist **lpp;
+    lpp = &start;
+    while (lp) {
+        *lpp = funcblock;
+        funcblock = (char *) funcblock + ALIGN(sizeof(struct nodelist));
+        (*lpp)->n = copynode(lp->n);
+        lp = lp->next;
+        lpp = &(*lpp)->next;
+    }
+    *lpp = NULL;
+    return start;
+}
+STATIC char *
+nodesavestr(s)
+    char   *s;
+{
+    register char *p = s;
+    register char *q = funcstring;
+    char   *rtn = funcstring;
+    while ((*q++ = *p++) != '\0')
+        continue;
+    funcstring = q;
+    return rtn;
+}
+/*
+ * Free a parse tree.
+ */
+void
+freefunc(n)
+    union node *n;
+{
+    if (n)
+        ckfree(n);
+}

 /trunk/uspace/app/ash/cd.h
 ,0 → 1,39
+/*  $NetBSD: cd.h,v 1.2 1997/07/04 21:01:52 christos Exp $  */
+/*-
+ * Copyright (c) 1995
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+void    getpwd (void);
+int cdcmd (int, char **);
+int pwdcmd (int, char **);

 /trunk/uspace/app/ash/parser.c
 ,0 → 1,1559
+/*  $NetBSD: parser.c,v 1.45 2000/07/27 04:09:27 cgd Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)parser.c    8.7 (Berkeley) 5/16/95";
+#else
+__RCSID("$NetBSD: parser.c,v 1.45 2000/07/27 04:09:27 cgd Exp $");
+#endif
+#endif /* not lint */
+#include <stdlib.h>
+#include "shell.h"
+#include "parser.h"
+#include "nodes.h"
+#include "expand.h" /* defines rmescapes() */
+#include "redir.h"  /* defines copyfd() */
+#include "syntax.h"
+#include "options.h"
+#include "input.h"
+#include "output.h"
+#include "var.h"
+#include "error.h"
+#include "memalloc.h"
+#include "mystring.h"
+#include "alias.h"
+#include "show.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#endif
+/*
+ * Shell command parser.
+ */
+#define EOFMARKLEN 79
+/* values returned by readtoken */
+#include "token.h"
+struct heredoc {
+    struct heredoc *next;   /* next here document in list */
+    union node *here;       /* redirection node */
+    char *eofmark;      /* string indicating end of input */
+    int striptabs;      /* if set, strip leading tabs */
+};
+struct heredoc *heredoclist;    /* list of here documents to read */
+int parsebackquote;     /* nonzero if we are inside backquotes */
+int doprompt;           /* if set, prompt the user */
+int needprompt;         /* true if interactive and at start of line */
+int lasttoken;          /* last token read */
+MKINIT int tokpushback;     /* last token pushed back */
+char *wordtext;         /* text of last word returned by readtoken */
+MKINIT int checkkwd;            /* 1 == check for kwds, 2 == also eat newlines */
+struct nodelist *backquotelist;
+union node *redirnode;
+struct heredoc *heredoc;
+int quoteflag;          /* set if (part of) last token was quoted */
+int startlinno;         /* line # where last token started */
+STATIC union node *list (int);
+STATIC union node *andor (void);
+STATIC union node *pipeline (void);
+STATIC union node *command (void);
+STATIC union node *simplecmd (union node **, union node *);
+STATIC union node *makename (void);
+STATIC void parsefname (void);
+STATIC void parseheredoc (void);
+STATIC int peektoken (void);
+STATIC int readtoken (void);
+STATIC int xxreadtoken (void);
+STATIC int readtoken1 (int, char const *, char *, int);
+STATIC int noexpand (char *);
+STATIC void synexpect (int) __attribute__((noreturn));
+STATIC void synerror (const char *) __attribute__((noreturn));
+STATIC void setprompt (int);
+/*
+ * Read and parse a command.  Returns NEOF on end of file.  (NULL is a
+ * valid parse tree indicating a blank line.)
+ */
+union node *
+parsecmd(int interact)
+{
+    int t;
+    doprompt = interact;
+    if (doprompt)
+        setprompt(1);
+    else
+        setprompt(0);
+    needprompt = 0;
+    t = readtoken();
+    if (t == TEOF)
+        return NEOF;
+    if (t == TNL)
+        return NULL;
+    tokpushback++;
+    return list(1);
+}
+STATIC union node *
+list(nlflag)
+    int nlflag;
+{
+    union node *n1, *n2, *n3;
+    int tok;
+    checkkwd = 2;
+    if (nlflag == 0 && tokendlist[peektoken()])
+        return NULL;
+    n1 = NULL;
+    for (;;) {
+        n2 = andor();
+        tok = readtoken();
+        if (tok == TBACKGND) {
+            if (n2->type == NCMD || n2->type == NPIPE) {
+                n2->ncmd.backgnd = 1;
+            } else if (n2->type == NREDIR) {
+                n2->type = NBACKGND;
+            } else {
+                n3 = (union node *)stalloc(sizeof (struct nredir));
+                n3->type = NBACKGND;
+                n3->nredir.n = n2;
+                n3->nredir.redirect = NULL;
+                n2 = n3;
+            }
+        }
+        if (n1 == NULL) {
+            n1 = n2;
+        }
+        else {
+            n3 = (union node *)stalloc(sizeof (struct nbinary));
+            n3->type = NSEMI;
+            n3->nbinary.ch1 = n1;
+            n3->nbinary.ch2 = n2;
+            n1 = n3;
+        }
+        switch (tok) {
+        case TBACKGND:
+        case TSEMI:
+            tok = readtoken();
+            /* fall through */
+        case TNL:
+            if (tok == TNL) {
+                parseheredoc();
+                if (nlflag)
+                    return n1;
+            } else {
+                tokpushback++;
+            }
+            checkkwd = 2;
+            if (tokendlist[peektoken()])
+                return n1;
+            break;
+        case TEOF:
+            if (heredoclist)
+                parseheredoc();
+            else
+                pungetc();      /* push back EOF on input */
+            return n1;
+        default:
+            if (nlflag)
+                synexpect(-1);
+            tokpushback++;
+            return n1;
+        }
+    }
+}
+STATIC union node *
+andor() {
+    union node *n1, *n2, *n3;
+    int t;
+    checkkwd = 1;
+    n1 = pipeline();
+    for (;;) {
+        if ((t = readtoken()) == TAND) {
+            t = NAND;
+        } else if (t == TOR) {
+            t = NOR;
+        } else {
+            tokpushback++;
+            return n1;
+        }
+        checkkwd = 2;
+        n2 = pipeline();
+        n3 = (union node *)stalloc(sizeof (struct nbinary));
+        n3->type = t;
+        n3->nbinary.ch1 = n1;
+        n3->nbinary.ch2 = n2;
+        n1 = n3;
+    }
+}
+STATIC union node *
+pipeline() {
+    union node *n1, *n2, *pipenode;
+    struct nodelist *lp, *prev;
+    int negate;
+    negate = 0;
+    TRACE(("pipeline: entered\n"));
+    if (readtoken() == TNOT) {
+        negate = !negate;
+        checkkwd = 1;
+    } else
+        tokpushback++;
+    n1 = command();
+    if (readtoken() == TPIPE) {
+        pipenode = (union node *)stalloc(sizeof (struct npipe));
+        pipenode->type = NPIPE;
+        pipenode->npipe.backgnd = 0;
+        lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
+        pipenode->npipe.cmdlist = lp;
+        lp->n = n1;
+        do {
+            prev = lp;
+            lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
+            checkkwd = 2;
+            lp->n = command();
+            prev->next = lp;
+        } while (readtoken() == TPIPE);
+        lp->next = NULL;
+        n1 = pipenode;
+    }
+    tokpushback++;
+    if (negate) {
+        n2 = (union node *)stalloc(sizeof (struct nnot));
+        n2->type = NNOT;
+        n2->nnot.com = n1;
+        return n2;
+    } else
+        return n1;
+}
+STATIC union node *
+command() {
+    union node *n1, *n2;
+    union node *ap, **app;
+    union node *cp, **cpp;
+    union node *redir, **rpp;
+    int t;
+    redir = NULL;
+    n1 = NULL;
+    rpp = &redir;
+    /* Check for redirection which may precede command */
+    while (readtoken() == TREDIR) {
+        *rpp = n2 = redirnode;
+        rpp = &n2->nfile.next;
+        parsefname();
+    }
+    tokpushback++;
+    switch (readtoken()) {
+    case TIF:
+        n1 = (union node *)stalloc(sizeof (struct nif));
+        n1->type = NIF;
+        n1->nif.test = list(0);
+        if (readtoken() != TTHEN)
+            synexpect(TTHEN);
+        n1->nif.ifpart = list(0);
+        n2 = n1;
+        while (readtoken() == TELIF) {
+            n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif));
+            n2 = n2->nif.elsepart;
+            n2->type = NIF;
+            n2->nif.test = list(0);
+            if (readtoken() != TTHEN)
+                synexpect(TTHEN);
+            n2->nif.ifpart = list(0);
+        }
+        if (lasttoken == TELSE)
+            n2->nif.elsepart = list(0);
+        else {
+            n2->nif.elsepart = NULL;
+            tokpushback++;
+        }
+        if (readtoken() != TFI)
+            synexpect(TFI);
+        checkkwd = 1;
+        break;
+    case TWHILE:
+    case TUNTIL: {
+        int got;
+        n1 = (union node *)stalloc(sizeof (struct nbinary));
+        n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL;
+        n1->nbinary.ch1 = list(0);
+        if ((got=readtoken()) != TDO) {
+TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
+            synexpect(TDO);
+        }
+        n1->nbinary.ch2 = list(0);
+        if (readtoken() != TDONE)
+            synexpect(TDONE);
+        checkkwd = 1;
+        break;
+    }
+    case TFOR:
+        if (readtoken() != TWORD || quoteflag || ! goodname(wordtext))
+            synerror("Bad for loop variable");
+        n1 = (union node *)stalloc(sizeof (struct nfor));
+        n1->type = NFOR;
+        n1->nfor.var = wordtext;
+        if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) {
+            app = &ap;
+            while (readtoken() == TWORD) {
+                n2 = (union node *)stalloc(sizeof (struct narg));
+                n2->type = NARG;
+                n2->narg.text = wordtext;
+                n2->narg.backquote = backquotelist;
+                *app = n2;
+                app = &n2->narg.next;
+            }
+            *app = NULL;
+            n1->nfor.args = ap;
+            if (lasttoken != TNL && lasttoken != TSEMI)
+                synexpect(-1);
+        } else {
+            static char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
+                                   '@', '=', '\0'};
+            n2 = (union node *)stalloc(sizeof (struct narg));
+            n2->type = NARG;
+            n2->narg.text = argvars;
+            n2->narg.backquote = NULL;
+            n2->narg.next = NULL;
+            n1->nfor.args = n2;
+            /*
+             * Newline or semicolon here is optional (but note
+             * that the original Bourne shell only allowed NL).
+             */
+            if (lasttoken != TNL && lasttoken != TSEMI)
+                tokpushback++;
+        }
+        checkkwd = 2;
+        if ((t = readtoken()) == TDO)
+            t = TDONE;
+        else if (t == TBEGIN)
+            t = TEND;
+        else
+            synexpect(-1);
+        n1->nfor.body = list(0);
+        if (readtoken() != t)
+            synexpect(t);
+        checkkwd = 1;
+        break;
+    case TCASE:
+        n1 = (union node *)stalloc(sizeof (struct ncase));
+        n1->type = NCASE;
+        if (readtoken() != TWORD)
+            synexpect(TWORD);
+        n1->ncase.expr = n2 = (union node *)stalloc(sizeof (struct narg));
+        n2->type = NARG;
+        n2->narg.text = wordtext;
+        n2->narg.backquote = backquotelist;
+        n2->narg.next = NULL;
+        while (readtoken() == TNL);
+        if (lasttoken != TWORD || ! equal(wordtext, "in"))
+            synerror("expecting \"in\"");
+        cpp = &n1->ncase.cases;
+        checkkwd = 2, readtoken();
+        do {
+            if (lasttoken == TLP)
+                readtoken();
+            *cpp = cp = (union node *)stalloc(sizeof (struct nclist));
+            cp->type = NCLIST;
+            app = &cp->nclist.pattern;
+            for (;;) {
+                *app = ap = (union node *)stalloc(sizeof (struct narg));
+                ap->type = NARG;
+                ap->narg.text = wordtext;
+                ap->narg.backquote = backquotelist;
+                if (checkkwd = 2, readtoken() != TPIPE)
+                    break;
+                app = &ap->narg.next;
+                readtoken();
+            }
+            ap->narg.next = NULL;
+            if (lasttoken != TRP)
+                synexpect(TRP);
+            cp->nclist.body = list(0);
+            checkkwd = 2;
+            if ((t = readtoken()) != TESAC) {
+                if (t != TENDCASE)
+                    synexpect(TENDCASE);
+                else
+                    checkkwd = 2, readtoken();
+            }
+            cpp = &cp->nclist.next;
+        } while(lasttoken != TESAC);
+        *cpp = NULL;
+        checkkwd = 1;
+        break;
+    case TLP:
+        n1 = (union node *)stalloc(sizeof (struct nredir));
+        n1->type = NSUBSHELL;
+        n1->nredir.n = list(0);
+        n1->nredir.redirect = NULL;
+        if (readtoken() != TRP)
+            synexpect(TRP);
+        checkkwd = 1;
+        break;
+    case TBEGIN:
+        n1 = list(0);
+        if (readtoken() != TEND)
+            synexpect(TEND);
+        checkkwd = 1;
+        break;
+    /* Handle an empty command like other simple commands.  */
+    case TSEMI:
+    case TAND:
+    case TOR:
+    case TNL:
+    case TEOF:
+    case TRP:
+    case TBACKGND:
+        /*
+         * An empty command before a ; doesn't make much sense, and
+         * should certainly be disallowed in the case of `if ;'.
+         */
+        if (!redir)
+            synexpect(-1);
+    case TWORD:
+        tokpushback++;
+        n1 = simplecmd(rpp, redir);
+        return n1;
+    default:
+        synexpect(-1);
+        /* NOTREACHED */
+    }
+    /* Now check for redirection which may follow command */
+    while (readtoken() == TREDIR) {
+        *rpp = n2 = redirnode;
+        rpp = &n2->nfile.next;
+        parsefname();
+    }
+    tokpushback++;
+    *rpp = NULL;
+    if (redir) {
+        if (n1->type != NSUBSHELL) {
+            n2 = (union node *)stalloc(sizeof (struct nredir));
+            n2->type = NREDIR;
+            n2->nredir.n = n1;
+            n1 = n2;
+        }
+        n1->nredir.redirect = redir;
+    }
+    return n1;
+}
+STATIC union node *
+simplecmd(rpp, redir)
+    union node **rpp, *redir;
+    {
+    union node *args, **app;
+    union node **orig_rpp = rpp;
+    union node *n = NULL;
+    /* If we don't have any redirections already, then we must reset */
+    /* rpp to be the address of the local redir variable.  */
+    if (redir == 0)
+        rpp = &redir;
+    args = NULL;
+    app = &args;
+    /*
+     * We save the incoming value, because we need this for shell
+     * functions.  There can not be a redirect or an argument between
+     * the function name and the open parenthesis.
+     */
+    orig_rpp = rpp;
+    for (;;) {
+        if (readtoken() == TWORD) {
+            n = (union node *)stalloc(sizeof (struct narg));
+            n->type = NARG;
+            n->narg.text = wordtext;
+            n->narg.backquote = backquotelist;
+            *app = n;
+            app = &n->narg.next;
+        } else if (lasttoken == TREDIR) {
+            *rpp = n = redirnode;
+            rpp = &n->nfile.next;
+            parsefname();   /* read name of redirection file */
+        } else if (lasttoken == TLP && app == &args->narg.next
+                        && rpp == orig_rpp) {
+            /* We have a function */
+            if (readtoken() != TRP)
+                synexpect(TRP);
+#ifdef notdef
+            if (! goodname(n->narg.text))
+                synerror("Bad function name");
+#endif
+            n->type = NDEFUN;
+            checkkwd = 2;
+            n->narg.next = command();
+            return n;
+        } else {
+            tokpushback++;
+            break;
+        }
+    }
+    *app = NULL;
+    *rpp = NULL;
+    n = (union node *)stalloc(sizeof (struct ncmd));
+    n->type = NCMD;
+    n->ncmd.backgnd = 0;
+    n->ncmd.args = args;
+    n->ncmd.redirect = redir;
+    return n;
+}
+STATIC union node *
+makename() {
+    union node *n;
+    n = (union node *)stalloc(sizeof (struct narg));
+    n->type = NARG;
+    n->narg.next = NULL;
+    n->narg.text = wordtext;
+    n->narg.backquote = backquotelist;
+    return n;
+}
+void fixredir(union node *n, const char *text, int err)
+    {
+    TRACE(("Fix redir %s %d\n", text, err));
+    if (!err)
+        n->ndup.vname = NULL;
+    if (is_digit(text[0]) && text[1] == '\0')
+        n->ndup.dupfd = digit_val(text[0]);
+    else if (text[0] == '-' && text[1] == '\0')
+        n->ndup.dupfd = -1;
+    else {
+        if (err)
+            synerror("Bad fd number");
+        else
+            n->ndup.vname = makename();
+    }
+}
+STATIC void
+parsefname() {
+    union node *n = redirnode;
+    if (readtoken() != TWORD)
+        synexpect(-1);
+    if (n->type == NHERE) {
+        struct heredoc *here = heredoc;
+        struct heredoc *p;
+        int i;
+        if (quoteflag == 0)
+            n->type = NXHERE;
+        TRACE(("Here document %d\n", n->type));
+        if (here->striptabs) {
+            while (*wordtext == '\t')
+                wordtext++;
+        }
+        if (! noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
+            synerror("Illegal eof marker for << redirection");
+        rmescapes(wordtext);
+        here->eofmark = wordtext;
+        here->next = NULL;
+        if (heredoclist == NULL)
+            heredoclist = here;
+        else {
+            for (p = heredoclist ; p->next ; p = p->next);
+            p->next = here;
+        }
+    } else if (n->type == NTOFD || n->type == NFROMFD) {
+        fixredir(n, wordtext, 0);
+    } else {
+        n->nfile.fname = makename();
+    }
+}
+/*
+ * Input any here documents.
+ */
+STATIC void
+parseheredoc() {
+    struct heredoc *here;
+    union node *n;
+    while (heredoclist) {
+        here = heredoclist;
+        heredoclist = here->next;
+        if (needprompt) {
+            setprompt(2);
+            needprompt = 0;
+        }
+        readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX,
+                here->eofmark, here->striptabs);
+        n = (union node *)stalloc(sizeof (struct narg));
+        n->narg.type = NARG;
+        n->narg.next = NULL;
+        n->narg.text = wordtext;
+        n->narg.backquote = backquotelist;
+        here->here->nhere.doc = n;
+    }
+}
+STATIC int
+peektoken() {
+    int t;
+    t = readtoken();
+    tokpushback++;
+    return (t);
+}
+STATIC int
+readtoken() {
+    int t;
+    int savecheckkwd = checkkwd;
+    struct alias *ap;
+#ifdef DEBUG
+    int alreadyseen = tokpushback;
+#endif
+    top:
+    t = xxreadtoken();
+    if (checkkwd) {
+        /*
+         * eat newlines
+         */
+        if (checkkwd == 2) {
+            checkkwd = 0;
+            while (t == TNL) {
+                parseheredoc();
+                t = xxreadtoken();
+            }
+        } else
+            checkkwd = 0;
+        /*
+         * check for keywords and aliases
+         */
+        if (t == TWORD && !quoteflag)
+        {
+            const char *const *pp;
+            for (pp = parsekwd; *pp; pp++) {
+                if (**pp == *wordtext && equal(*pp, wordtext))
+                {
+                    lasttoken = t = pp -
+                        parsekwd + KWDOFFSET;
+                    TRACE(("keyword %s recognized\n", tokname[t]));
+                    goto out;
+                }
+            }
+            if ((ap = lookupalias(wordtext, 1)) != NULL) {
+                pushstring(ap->val, strlen(ap->val), ap);
+                checkkwd = savecheckkwd;
+                goto top;
+            }
+        }
+out:
+        checkkwd = 0;
+    }
+#ifdef DEBUG
+    if (!alreadyseen)
+        TRACE(("token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+    else
+        TRACE(("reread token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+#endif
+    return (t);
+}
+/*
+ * Read the next input token.
+ * If the token is a word, we set backquotelist to the list of cmds in
+ *  backquotes.  We set quoteflag to true if any part of the word was
+ *  quoted.
+ * If the token is TREDIR, then we set redirnode to a structure containing
+ *  the redirection.
+ * In all cases, the variable startlinno is set to the number of the line
+ *  on which the token starts.
+ *
+ * [Change comment:  here documents and internal procedures]
+ * [Readtoken shouldn't have any arguments.  Perhaps we should make the
+ *  word parsing code into a separate routine.  In this case, readtoken
+ *  doesn't need to have any internal procedures, but parseword does.
+ *  We could also make parseoperator in essence the main routine, and
+ *  have parseword (readtoken1?) handle both words and redirection.]
+ */
+#define RETURN(token)   return lasttoken = token
+STATIC int
+xxreadtoken() {
+    int c;
+    if (tokpushback) {
+        tokpushback = 0;
+        return lasttoken;
+    }
+    if (needprompt) {
+        setprompt(2);
+        needprompt = 0;
+    }
+    startlinno = plinno;
+    for (;;) {  /* until token or start of word found */
+        c = pgetc_macro();
+        if (c == ' ' || c == '\t')
+            continue;       /* quick check for white space first */
+        switch (c) {
+        case ' ': case '\t':
+            continue;
+        case '#':
+            while ((c = pgetc()) != '\n' && c != PEOF);
+            pungetc();
+            continue;
+        case '\\':
+            if (pgetc() == '\n') {
+                startlinno = ++plinno;
+                if (doprompt)
+                    setprompt(2);
+                else
+                    setprompt(0);
+                continue;
+            }
+            pungetc();
+            goto breakloop;
+        case '\n':
+            plinno++;
+            needprompt = doprompt;
+            RETURN(TNL);
+        case PEOF:
+            RETURN(TEOF);
+        case '&':
+            if (pgetc() == '&')
+                RETURN(TAND);
+            pungetc();
+            RETURN(TBACKGND);
+        case '|':
+            if (pgetc() == '|')
+                RETURN(TOR);
+            pungetc();
+            RETURN(TPIPE);
+        case ';':
+            if (pgetc() == ';')
+                RETURN(TENDCASE);
+            pungetc();
+            RETURN(TSEMI);
+        case '(':
+            RETURN(TLP);
+        case ')':
+            RETURN(TRP);
+        default:
+            goto breakloop;
+        }
+    }
+breakloop:
+    return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
+#undef RETURN
+}
+/*
+ * If eofmark is NULL, read a word or a redirection symbol.  If eofmark
+ * is not NULL, read a here document.  In the latter case, eofmark is the
+ * word which marks the end of the document and striptabs is true if
+ * leading tabs should be stripped from the document.  The argument firstc
+ * is the first character of the input token or document.
+ *
+ * Because C does not have internal subroutines, I have simulated them
+ * using goto's to implement the subroutine linkage.  The following macros
+ * will run code that appears at the end of readtoken1.
+ */
+#define CHECKEND()  {goto checkend; checkend_return:;}
+#define PARSEREDIR()    {goto parseredir; parseredir_return:;}
+#define PARSESUB()  {goto parsesub; parsesub_return:;}
+#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
+#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
+#define PARSEARITH()    {goto parsearith; parsearith_return:;}
+STATIC int
+readtoken1(firstc, syntax, eofmark, striptabs)
+    int firstc;
+    char const *syntax;
+    char *eofmark;
+    int striptabs;
+    {
+    int c = firstc;
+    char *out;
+    int len;
+    char line[EOFMARKLEN + 1];
+    struct nodelist *bqlist;
+    int quotef;
+    int dblquote;
+    int varnest;    /* levels of variables expansion */
+    int arinest;    /* levels of arithmetic expansion */
+    int parenlevel; /* levels of parens in arithmetic */
+    int dqvarnest;  /* levels of variables expansion within double quotes */
+    int oldstyle;
+    char const *prevsyntax; /* syntax before arithmetic */
+#if __GNUC__
+    /* Avoid longjmp clobbering */
+    (void) &out;
+    (void) &quotef;
+    (void) &dblquote;
+    (void) &varnest;
+    (void) &arinest;
+    (void) &parenlevel;
+    (void) &dqvarnest;
+    (void) &oldstyle;
+    (void) &prevsyntax;
+    (void) &syntax;
+#endif
+    startlinno = plinno;
+    dblquote = 0;
+    if (syntax == DQSYNTAX)
+        dblquote = 1;
+    quotef = 0;
+    bqlist = NULL;
+    varnest = 0;
+    arinest = 0;
+    parenlevel = 0;
+    dqvarnest = 0;
+    STARTSTACKSTR(out);
+    loop: { /* for each line, until end of word */
+#if ATTY
+        if (c == '\034' && doprompt
+         && attyset() && ! equal(termval(), "emacs")) {
+            attyline();
+            if (syntax == BASESYNTAX)
+                return readtoken();
+            c = pgetc();
+            goto loop;
+        }
+#endif
+        CHECKEND(); /* set c to PEOF if at end of here document */
+        for (;;) {  /* until end of line or end of word */
+            CHECKSTRSPACE(3, out);  /* permit 3 calls to USTPUTC */
+            switch(syntax[c]) {
+            case CNL:   /* '\n' */
+                if (syntax == BASESYNTAX)
+                    goto endword;   /* exit outer loop */
+                USTPUTC(c, out);
+                plinno++;
+                if (doprompt)
+                    setprompt(2);
+                else
+                    setprompt(0);
+                c = pgetc();
+                goto loop;      /* continue outer loop */
+            case CWORD:
+                USTPUTC(c, out);
+                break;
+            case CCTL:
+                if ((eofmark == NULL || dblquote) &&
+                    dqvarnest == 0)
+                    USTPUTC(CTLESC, out);
+                USTPUTC(c, out);
+                break;
+            case CBACK: /* backslash */
+                c = pgetc();
+                if (c == PEOF) {
+                    USTPUTC('\\', out);
+                    pungetc();
+                } else if (c == '\n') {
+                    if (doprompt)
+                        setprompt(2);
+                    else
+                        setprompt(0);
+                } else {
+                    if (dblquote && c != '\\' && c != '`' && c != '$'
+                             && (c != '"' || eofmark != NULL))
+                        USTPUTC('\\', out);
+                    if (SQSYNTAX[c] == CCTL)
+                        USTPUTC(CTLESC, out);
+                    else if (eofmark == NULL)
+                        USTPUTC(CTLQUOTEMARK, out);
+                    USTPUTC(c, out);
+                    quotef++;
+                }
+                break;
+            case CSQUOTE:
+                if (eofmark == NULL)
+                    USTPUTC(CTLQUOTEMARK, out);
+                syntax = SQSYNTAX;
+                break;
+            case CDQUOTE:
+                if (eofmark == NULL)
+                    USTPUTC(CTLQUOTEMARK, out);
+                syntax = DQSYNTAX;
+                dblquote = 1;
+                break;
+            case CENDQUOTE:
+                if (eofmark != NULL && arinest == 0 &&
+                    varnest == 0) {
+                    USTPUTC(c, out);
+                } else {
+                    if (arinest) {
+                        syntax = ARISYNTAX;
+                        dblquote = 0;
+                    } else if (eofmark == NULL &&
+                           dqvarnest == 0) {
+                        syntax = BASESYNTAX;
+                        dblquote = 0;
+                    }
+                    quotef++;
+                }
+                break;
+            case CVAR:  /* '$' */
+                PARSESUB();     /* parse substitution */
+                break;
+            case CENDVAR:   /* '}' */
+                if (varnest > 0) {
+                    varnest--;
+                    if (dqvarnest > 0) {
+                        dqvarnest--;
+                    }
+                    USTPUTC(CTLENDVAR, out);
+                } else {
+                    USTPUTC(c, out);
+                }
+                break;
+            case CLP:   /* '(' in arithmetic */
+                parenlevel++;
+                USTPUTC(c, out);
+                break;
+            case CRP:   /* ')' in arithmetic */
+                if (parenlevel > 0) {
+                    USTPUTC(c, out);
+                    --parenlevel;
+                } else {
+                    if (pgetc() == ')') {
+                        if (--arinest == 0) {
+                            USTPUTC(CTLENDARI, out);
+                            syntax = prevsyntax;
+                            if (syntax == DQSYNTAX)
+                                dblquote = 1;
+                            else
+                                dblquote = 0;
+                        } else
+                            USTPUTC(')', out);
+                    } else {
+                        /*
+                         * unbalanced parens
+                         *  (don't 2nd guess - no error)
+                         */
+                        pungetc();
+                        USTPUTC(')', out);
+                    }
+                }
+                break;
+            case CBQUOTE:   /* '`' */
+                PARSEBACKQOLD();
+                break;
+            case CEOF:
+                goto endword;       /* exit outer loop */
+            default:
+                if (varnest == 0)
+                    goto endword;   /* exit outer loop */
+                USTPUTC(c, out);
+            }
+            c = pgetc_macro();
+        }
+    }
+endword:
+    if (syntax == ARISYNTAX)
+        synerror("Missing '))'");
+    if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+        synerror("Unterminated quoted string");
+    if (varnest != 0) {
+        startlinno = plinno;
+        synerror("Missing '}'");
+    }
+    USTPUTC('\0', out);
+    len = out - stackblock();
+    out = stackblock();
+    if (eofmark == NULL) {
+        if ((c == '>' || c == '<')
+         && quotef == 0
+         && len <= 2
+         && (*out == '\0' || is_digit(*out))) {
+            PARSEREDIR();
+            return lasttoken = TREDIR;
+        } else {
+            pungetc();
+        }
+    }
+    quoteflag = quotef;
+    backquotelist = bqlist;
+    grabstackblock(len);
+    wordtext = out;
+    return lasttoken = TWORD;
+/* end of readtoken routine */
+/*
+ * Check to see whether we are at the end of the here document.  When this
+ * is called, c is set to the first character of the next input line.  If
+ * we are at the end of the here document, this routine sets the c to PEOF.
+ */
+checkend: {
+    if (eofmark) {
+        if (striptabs) {
+            while (c == '\t')
+                c = pgetc();
+        }
+        if (c == *eofmark) {
+            if (pfgets(line, sizeof line) != NULL) {
+                char *p, *q;
+                p = line;
+                for (q = eofmark + 1 ; *q && *p == *q ; p++, q++);
+                if (*p == '\n' && *q == '\0') {
+                    c = PEOF;
+                    plinno++;
+                    needprompt = doprompt;
+                } else {
+                    pushstring(line, strlen(line), NULL);
+                }
+            }
+        }
+    }
+    goto checkend_return;
+}
+/*
+ * Parse a redirection operator.  The variable "out" points to a string
+ * specifying the fd to be redirected.  The variable "c" contains the
+ * first character of the redirection operator.
+ */
+parseredir: {
+    char fd = *out;
+    union node *np;
+    np = (union node *)stalloc(sizeof (struct nfile));
+    if (c == '>') {
+        np->nfile.fd = 1;
+        c = pgetc();
+        if (c == '>')
+            np->type = NAPPEND;
+        else if (c == '&')
+            np->type = NTOFD;
+        else if (c == '|')
+            np->type = NTOOV;
+        else {
+            np->type = NTO;
+            pungetc();
+        }
+    } else {    /* c == '<' */
+        np->nfile.fd = 0;
+        switch (c = pgetc()) {
+        case '<':
+            if (sizeof (struct nfile) != sizeof (struct nhere)) {
+                np = (union node *)stalloc(sizeof (struct nhere));
+                np->nfile.fd = 0;
+            }
+            np->type = NHERE;
+            heredoc = (struct heredoc *)stalloc(sizeof (struct heredoc));
+            heredoc->here = np;
+            if ((c = pgetc()) == '-') {
+                heredoc->striptabs = 1;
+            } else {
+                heredoc->striptabs = 0;
+                pungetc();
+            }
+            break;
+        case '&':
+            np->type = NFROMFD;
+            break;
+        case '>':
+            np->type = NFROMTO;
+            break;
+        default:
+            np->type = NFROM;
+            pungetc();
+            break;
+        }
+    }
+    if (fd != '\0')
+        np->nfile.fd = digit_val(fd);
+    redirnode = np;
+    goto parseredir_return;
+}
+/*
+ * Parse a substitution.  At this point, we have read the dollar sign
+ * and nothing else.
+ */
+parsesub: {
+    int subtype;
+    int typeloc;
+    int flags;
+    char *p;
+    static const char types[] = "}-+?=";
+    c = pgetc();
+    if (c != '(' && c != '{' && !is_name(c) && !is_special(c)) {
+        USTPUTC('$', out);
+        pungetc();
+    } else if (c == '(') {  /* $(command) or $((arith)) */
+        if (pgetc() == '(') {
+            PARSEARITH();
+        } else {
+            pungetc();
+            PARSEBACKQNEW();
+        }
+    } else {
+        USTPUTC(CTLVAR, out);
+        typeloc = out - stackblock();
+        USTPUTC(VSNORMAL, out);
+        subtype = VSNORMAL;
+        if (c == '{') {
+            c = pgetc();
+            if (c == '#') {
+                if ((c = pgetc()) == '}')
+                    c = '#';
+                else
+                    subtype = VSLENGTH;
+            }
+            else
+                subtype = 0;
+        }
+        if (is_name(c)) {
+            do {
+                STPUTC(c, out);
+                c = pgetc();
+            } while (is_in_name(c));
+        } else if (is_digit(c)) {
+            do {
+                USTPUTC(c, out);
+                c = pgetc();
+            } while (is_digit(c));
+        }
+        else if (is_special(c)) {
+            USTPUTC(c, out);
+            c = pgetc();
+        }
+        else
+badsub:         synerror("Bad substitution");
+        STPUTC('=', out);
+        flags = 0;
+        if (subtype == 0) {
+            switch (c) {
+            case ':':
+                flags = VSNUL;
+                c = pgetc();
+                /*FALLTHROUGH*/
+            default:
+                p = strchr(types, c);
+                if (p == NULL)
+                    goto badsub;
+                subtype = p - types + VSNORMAL;
+                break;
+            case '%':
+            case '#':
+                {
+                    int cc = c;
+                    subtype = c == '#' ? VSTRIMLEFT :
+                                 VSTRIMRIGHT;
+                    c = pgetc();
+                    if (c == cc)
+                        subtype++;
+                    else
+                        pungetc();
+                    break;
+                }
+            }
+        } else {
+            pungetc();
+        }
+        if (dblquote || arinest)
+            flags |= VSQUOTE;
+        *(stackblock() + typeloc) = subtype | flags;
+        if (subtype != VSNORMAL) {
+            varnest++;
+            if (dblquote) {
+                dqvarnest++;
+            }
+        }
+    }
+    goto parsesub_return;
+}
+/*
+ * Called to parse command substitutions.  Newstyle is set if the command
+ * is enclosed inside $(...); nlpp is a pointer to the head of the linked
+ * list of commands (passed by reference), and savelen is the number of
+ * characters on the top of the stack which must be preserved.
+ */
+parsebackq: {
+    struct nodelist **nlpp;
+    int savepbq;
+    union node *n;
+    char *volatile str;
+    struct jmploc jmploc;
+    struct jmploc *volatile savehandler;
+    int savelen;
+    int saveprompt;
+#ifdef __GNUC__
+    (void) &saveprompt;
+#endif
+    savepbq = parsebackquote;
+    if (setjmp(jmploc.loc)) {
+        if (str)
+            ckfree(str);
+        parsebackquote = 0;
+        handler = savehandler;
+        longjmp(handler->loc, 1);
+    }
+    INTOFF;
+    str = NULL;
+    savelen = out - stackblock();
+    if (savelen > 0) {
+        str = ckmalloc(savelen);
+        memcpy(str, stackblock(), savelen);
+    }
+    savehandler = handler;
+    handler = &jmploc;
+    INTON;
+        if (oldstyle) {
+                /* We must read until the closing backquote, giving special
+                   treatment to some slashes, and then push the string and
+                   reread it as input, interpreting it normally.  */
+                char *pout;
+                int pc;
+                int psavelen;
+                char *pstr;
+                STARTSTACKSTR(pout);
+        for (;;) {
+            if (needprompt) {
+                setprompt(2);
+                needprompt = 0;
+            }
+            switch (pc = pgetc()) {
+            case '`':
+                goto done;
+            case '\\':
+                                if ((pc = pgetc()) == '\n') {
+                    plinno++;
+                    if (doprompt)
+                        setprompt(2);
+                    else
+                        setprompt(0);
+                    /*
+                     * If eating a newline, avoid putting
+                     * the newline into the new character
+                     * stream (via the STPUTC after the
+                     * switch).
+                     */
+                    continue;
+                }
+                                if (pc != '\\' && pc != '`' && pc != '$'
+                                    && (!dblquote || pc != '"'))
+                                        STPUTC('\\', pout);
+                break;
+            case '\n':
+                plinno++;
+                needprompt = doprompt;
+                break;
+            case PEOF:
+                    startlinno = plinno;
+                synerror("EOF in backquote substitution");
+                break;
+            default:
+                break;
+            }
+            STPUTC(pc, pout);
+                }
+done:
+                STPUTC('\0', pout);
+                psavelen = pout - stackblock();
+                if (psavelen > 0) {
+            pstr = grabstackstr(pout);
+            setinputstring(pstr, 1);
+                }
+        }
+    nlpp = &bqlist;
+    while (*nlpp)
+        nlpp = &(*nlpp)->next;
+    *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
+    (*nlpp)->next = NULL;
+    parsebackquote = oldstyle;
+    if (oldstyle) {
+        saveprompt = doprompt;
+        doprompt = 0;
+    }
+    n = list(0);
+    if (oldstyle)
+        doprompt = saveprompt;
+    else {
+        if (readtoken() != TRP)
+            synexpect(TRP);
+    }
+    (*nlpp)->n = n;
+        if (oldstyle) {
+        /*
+         * Start reading from old file again, ignoring any pushed back
+         * tokens left from the backquote parsing
+         */
+                popfile();
+        tokpushback = 0;
+    }
+    while (stackblocksize() <= savelen)
+        growstackblock();
+    STARTSTACKSTR(out);
+    if (str) {
+        memcpy(out, str, savelen);
+        STADJUST(savelen, out);
+        INTOFF;
+        ckfree(str);
+        str = NULL;
+        INTON;
+    }
+    parsebackquote = savepbq;
+    handler = savehandler;
+    if (arinest || dblquote)
+        USTPUTC(CTLBACKQ | CTLQUOTE, out);
+    else
+        USTPUTC(CTLBACKQ, out);
+    if (oldstyle)
+        goto parsebackq_oldreturn;
+    else
+        goto parsebackq_newreturn;
+}
+/*
+ * Parse an arithmetic expansion (indicate start of one and set state)
+ */
+parsearith: {
+    if (++arinest == 1) {
+        prevsyntax = syntax;
+        syntax = ARISYNTAX;
+        USTPUTC(CTLARI, out);
+        if (dblquote)
+            USTPUTC('"',out);
+        else
+            USTPUTC(' ',out);
+    } else {
+        /*
+         * we collapse embedded arithmetic expansion to
+         * parenthesis, which should be equivalent
+         */
+        USTPUTC('(', out);
+    }
+    goto parsearith_return;
+}
+} /* end of readtoken */
+#ifdef mkinit
+RESET {
+    tokpushback = 0;
+    checkkwd = 0;
+}
+#endif
+/*
+ * Returns true if the text contains nothing to expand (no dollar signs
+ * or backquotes).
+ */
+STATIC int
+noexpand(text)
+    char *text;
+    {
+    char *p;
+    char c;
+    p = text;
+    while ((c = *p++) != '\0') {
+        if (c == CTLQUOTEMARK)
+            continue;
+        if (c == CTLESC)
+            p++;
+        else if (BASESYNTAX[(int)c] == CCTL)
+            return 0;
+    }
+    return 1;
+}
+/*
+ * Return true if the argument is a legal variable name (a letter or
+ * underscore followed by zero or more letters, underscores, and digits).
+ */
+int
+goodname(char *name)
+    {
+    char *p;
+    p = name;
+    if (! is_name(*p))
+        return 0;
+    while (*++p) {
+        if (! is_in_name(*p))
+            return 0;
+    }
+    return 1;
+}
+/*
+ * Called when an unexpected token is read during the parse.  The argument
+ * is the token that is expected, or -1 if more than one type of token can
+ * occur at this point.
+ */
+STATIC void
+synexpect(token)
+    int token;
+{
+    char msg[64];
+    if (token >= 0) {
+        fmtstr(msg, 64, "%s unexpected (expecting %s)",
+            tokname[lasttoken], tokname[token]);
+    } else {
+        fmtstr(msg, 64, "%s unexpected", tokname[lasttoken]);
+    }
+    synerror(msg);
+    /* NOTREACHED */
+}
+STATIC void
+synerror(msg)
+    const char *msg;
+    {
+    if (commandname)
+        outfmt(&errout, "%s: %d: ", commandname, startlinno);
+    outfmt(&errout, "Syntax error: %s\n", msg);
+    error((char *)NULL);
+    /* NOTREACHED */
+}
+STATIC void
+setprompt(which)
+    int which;
+    {
+    whichprompt = which;
+#ifndef SMALL
+    if (!el)
+#endif
+        out2str(getprompt(NULL));
+}
+/*
+ * called by editline -- any expansions to the prompt
+ *    should be added here.
+ */
+const char *
+getprompt(void *unused)
+    {
+    switch (whichprompt) {
+    case 0:
+        return "";
+    case 1:
+        return ps1val();
+    case 2:
+        return ps2val();
+    default:
+        return "<internal prompt error>";
+    }
+}

 /trunk/uspace/app/ash/jobs.c
 ,0 → 1,1263
+/*  $NetBSD: jobs.c,v 1.36 2000/05/22 10:18:47 elric Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)jobs.c  8.5 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: jobs.c,v 1.36 2000/05/22 10:18:47 elric Exp $");
+#endif
+#endif /* not lint */
+#include <fcntl.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <paths.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#ifdef BSD
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+#include <sys/ioctl.h>
+#include "shell.h"
+#if JOBS
+#if OLD_TTY_DRIVER
+#include "sgtty.h"
+#else
+#include <termios.h>
+#endif
+#undef CEOF         /* syntax.h redefines this */
+#endif
+#include "redir.h"
+#include "show.h"
+#include "main.h"
+#include "parser.h"
+#include "nodes.h"
+#include "jobs.h"
+#include "options.h"
+#include "trap.h"
+#include "syntax.h"
+#include "input.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "mystring.h"
+struct job *jobtab;     /* array of jobs */
+int njobs;          /* size of array */
+MKINIT short backgndpid = -1;   /* pid of last background process */
+#if JOBS
+int initialpgrp;        /* pgrp of shell on invocation */
+short curjob;           /* current job */
+#endif
+STATIC int intreceived;
+STATIC void restartjob (struct job *);
+STATIC void freejob (struct job *);
+STATIC struct job *getjob (char *);
+STATIC int dowait (int, struct job *);
+STATIC int onsigchild (void);
+STATIC int waitproc (int, int *);
+STATIC void cmdtxt (union node *);
+STATIC void cmdputs (const char *);
+STATIC void waitonint(int);
+#if JOBS
+/*
+ * Turn job control on and off.
+ *
+ * Note:  This code assumes that the third arg to ioctl is a character
+ * pointer, which is true on Berkeley systems but not System V.  Since
+ * System V doesn't have job control yet, this isn't a problem now.
+ */
+MKINIT int jobctl;
+void
+setjobctl(on)
+    int on;
+{
+#ifdef OLD_TTY_DRIVER
+    int ldisc;
+#endif
+    if (on == jobctl || rootshell == 0)
+        return;
+    if (on) {
+        do { /* while we are in the background */
+#ifdef OLD_TTY_DRIVER
+            if (ioctl(fd2, TIOCGPGRP, (char *)&initialpgrp) < 0) {
+#else
+            initialpgrp = tcgetpgrp(fd2);
+            if (initialpgrp < 0) {
+#endif
+                out2str("sh: can't access tty; job control turned off\n");
+                mflag = 0;
+                return;
+            }
+            if (initialpgrp == -1)
+                initialpgrp = getpgrp();
+            else if (initialpgrp != getpgrp()) {
+                killpg(initialpgrp, SIGTTIN);
+                continue;
+            }
+        } while (0);
+#ifdef OLD_TTY_DRIVER
+        if (ioctl(fd2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
+            out2str("sh: need new tty driver to run job control; job control turned off\n");
+            mflag = 0;
+            return;
+        }
+#endif
+        setsignal(SIGTSTP);
+        setsignal(SIGTTOU);
+        setsignal(SIGTTIN);
+        setpgid(0, rootpid);
+#ifdef OLD_TTY_DRIVER
+        ioctl(fd2, TIOCSPGRP, (char *)&rootpid);
+#else
+        tcsetpgrp(fd2, rootpid);
+#endif
+    } else { /* turning job control off */
+        setpgid(0, initialpgrp);
+#ifdef OLD_TTY_DRIVER
+        ioctl(fd2, TIOCSPGRP, (char *)&initialpgrp);
+#else
+        tcsetpgrp(fd2, initialpgrp);
+#endif
+        setsignal(SIGTSTP);
+        setsignal(SIGTTOU);
+        setsignal(SIGTTIN);
+    }
+    jobctl = on;
+}
+#endif
+#ifdef mkinit
+INCLUDE <stdlib.h>
+SHELLPROC {
+    backgndpid = -1;
+#if JOBS
+    jobctl = 0;
+#endif
+}
+#endif
+#if JOBS
+int
+killcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    extern char *signal_names[];
+    int signo = -1;
+    int list = 0;
+    int i;
+    pid_t pid;
+    struct job *jp;
+    if (argc <= 1) {
+        error(
+"Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n"
+"kill -l [exitstatus]"
+        );
+    }
+    if (*argv[1] == '-') {
+        signo = decode_signal(argv[1]+1);
+        if (signo < 0) {
+            int c;
+            while ((c = nextopt("ls:")) != '\0')
+                switch (c) {
+                case 'l':
+                    list = 1;
+                    break;
+                case 's':
+                    signo = decode_signal(optarg);
+                                break;
+                default:
+                    error(
+    "nextopt returned character code 0%o", c);
+            }
+        } else
+            argptr++;
+    }
+    if (!list && signo < 0)
+        signo = SIGTERM;
+    if ((signo < 0 || !*argptr) ^ list) {
+        error(
+"Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n"
+"kill -l [exitstatus]"
+        );
+    }
+    if (list) {
+        if (!*argptr) {
+            out1fmt("0\n");
+            for (i = 1; i < NSIG; i++) {
+                if (strncmp(signal_names[i], "SIGJUNK(", 8)
+                    == 0)
+                    continue;
+                out1fmt("%s\n", signal_names[i] + 3);
+            }
+            return 0;
+        }
+        signo = atoi(*argptr);
+        if (signo > 128)
+            signo -= 128;
+        if (0 < signo && signo < NSIG)
+            out1fmt("%s\n", signal_names[signo] + 3);
+        else
+            error("invalid signal number or exit status: %s",
+                  *argptr);
+        return 0;
+    }
+    do {
+        if (**argptr == '%') {
+            jp = getjob(*argptr);
+            if (jp->jobctl == 0)
+                error("job %s not created under job control",
+                      *argptr);
+            pid = -jp->ps[0].pid;
+        } else
+            pid = atoi(*argptr);
+        if (kill(pid, signo) != 0)
+            error("%s: %s", *argptr, strerror(errno));
+    } while (*++argptr);
+    return 0;
+}
+int
+fgcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct job *jp;
+    int pgrp;
+    int status;
+    jp = getjob(argv[1]);
+    if (jp->jobctl == 0)
+        error("job not created under job control");
+    pgrp = jp->ps[0].pid;
+#ifdef OLD_TTY_DRIVER
+    ioctl(fd2, TIOCSPGRP, (char *)&pgrp);
+#else
+    tcsetpgrp(fd2, pgrp);
+#endif
+    restartjob(jp);
+    INTOFF;
+    status = waitforjob(jp);
+    INTON;
+    return status;
+}
+int
+bgcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct job *jp;
+    do {
+        jp = getjob(*++argv);
+        if (jp->jobctl == 0)
+            error("job not created under job control");
+        restartjob(jp);
+    } while (--argc > 1);
+    return 0;
+}
+STATIC void
+restartjob(jp)
+    struct job *jp;
+{
+    struct procstat *ps;
+    int i;
+    if (jp->state == JOBDONE)
+        return;
+    INTOFF;
+    killpg(jp->ps[0].pid, SIGCONT);
+    for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) {
+        if (WIFSTOPPED(ps->status)) {
+            ps->status = -1;
+            jp->state = 0;
+        }
+    }
+    INTON;
+}
+#endif
+int
+jobscmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    showjobs(0);
+    return 0;
+}
+/*
+ * Print a list of jobs.  If "change" is nonzero, only print jobs whose
+ * statuses have changed since the last call to showjobs.
+ *
+ * If the shell is interrupted in the process of creating a job, the
+ * result may be a job structure containing zero processes.  Such structures
+ * will be freed here.
+ */
+void
+showjobs(change)
+    int change;
+{
+    int jobno;
+    int procno;
+    int i;
+    struct job *jp;
+    struct procstat *ps;
+    int col;
+    char s[64];
+    TRACE(("showjobs(%d) called\n", change));
+    while (dowait(0, (struct job *)NULL) > 0);
+    for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) {
+        if (! jp->used)
+            continue;
+        if (jp->nprocs == 0) {
+            freejob(jp);
+            continue;
+        }
+        if (change && ! jp->changed)
+            continue;
+        procno = jp->nprocs;
+        for (ps = jp->ps ; ; ps++) {    /* for each process */
+            if (ps == jp->ps)
+                fmtstr(s, 64, "[%d] %ld ", jobno,
+                    (long)ps->pid);
+            else
+                fmtstr(s, 64, "    %ld ",
+                    (long)ps->pid);
+            out1str(s);
+            col = strlen(s);
+            s[0] = '\0';
+            if (ps->status == -1) {
+                /* don't print anything */
+            } else if (WIFEXITED(ps->status)) {
+                fmtstr(s, 64, "Exit %d",
+                       WEXITSTATUS(ps->status));
+            } else {
+#if JOBS
+                if (WIFSTOPPED(ps->status))
+                    i = WSTOPSIG(ps->status);
+                else /* WIFSIGNALED(ps->status) */
+#endif
+                    i = WTERMSIG(ps->status);
+                if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F])
+                    scopy(sys_siglist[i & 0x7F], s);
+                else
+                    fmtstr(s, 64, "Signal %d", i & 0x7F);
+                if (WCOREDUMP(ps->status))
+                    strcat(s, " (core dumped)");
+            }
+            out1str(s);
+            col += strlen(s);
+            do {
+                out1c(' ');
+                col++;
+            } while (col < 30);
+            out1str(ps->cmd);
+            out1c('\n');
+            if (--procno <= 0)
+                break;
+        }
+        jp->changed = 0;
+        if (jp->state == JOBDONE) {
+            freejob(jp);
+        }
+    }
+}
+/*
+ * Mark a job structure as unused.
+ */
+STATIC void
+freejob(jp)
+    struct job *jp;
+    {
+    struct procstat *ps;
+    int i;
+    INTOFF;
+    for (i = jp->nprocs, ps = jp->ps ; --i >= 0 ; ps++) {
+        if (ps->cmd != nullstr)
+            ckfree(ps->cmd);
+    }
+    if (jp->ps != &jp->ps0)
+        ckfree(jp->ps);
+    jp->used = 0;
+#if JOBS
+    if (curjob == jp - jobtab + 1)
+        curjob = 0;
+#endif
+    INTON;
+}
+int
+waitcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct job *job;
+    int status, retval;
+    struct job *jp;
+    if (argc > 1) {
+        job = getjob(argv[1]);
+    } else {
+        job = NULL;
+    }
+    for (;;) {  /* loop until process terminated or stopped */
+        if (job != NULL) {
+            if (job->state) {
+                status = job->ps[job->nprocs - 1].status;
+                if (WIFEXITED(status))
+                    retval = WEXITSTATUS(status);
+#if JOBS
+                else if (WIFSTOPPED(status))
+                    retval = WSTOPSIG(status) + 128;
+#endif
+                else {
+                    /* XXX: limits number of signals */
+                    retval = WTERMSIG(status) + 128;
+                }
+                if (! iflag)
+                    freejob(job);
+                return retval;
+            }
+        } else {
+            for (jp = jobtab ; ; jp++) {
+                if (jp >= jobtab + njobs) { /* no running procs */
+                    return 0;
+                }
+                if (jp->used && jp->state == 0)
+                    break;
+            }
+        }
+        dowait(1, (struct job *)NULL);
+    }
+}
+int
+jobidcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct job *jp;
+    int i;
+    jp = getjob(argv[1]);
+    for (i = 0 ; i < jp->nprocs ; ) {
+        out1fmt("%ld", (long)jp->ps[i].pid);
+        out1c(++i < jp->nprocs? ' ' : '\n');
+    }
+    return 0;
+}
+/*
+ * Convert a job name to a job structure.
+ */
+STATIC struct job *
+getjob(name)
+    char *name;
+    {
+    int jobno;
+    struct job *jp;
+    int pid;
+    int i;
+    if (name == NULL) {
+#if JOBS
+currentjob:
+        if ((jobno = curjob) == 0 || jobtab[jobno - 1].used == 0)
+            error("No current job");
+        return &jobtab[jobno - 1];
+#else
+        error("No current job");
+#endif
+    } else if (name[0] == '%') {
+        if (is_digit(name[1])) {
+            jobno = number(name + 1);
+            if (jobno > 0 && jobno <= njobs
+             && jobtab[jobno - 1].used != 0)
+                return &jobtab[jobno - 1];
+#if JOBS
+        } else if (name[1] == '%' && name[2] == '\0') {
+            goto currentjob;
+#endif
+        } else {
+            struct job *found = NULL;
+            for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
+                if (jp->used && jp->nprocs > 0
+                 && prefix(name + 1, jp->ps[0].cmd)) {
+                    if (found)
+                        error("%s: ambiguous", name);
+                    found = jp;
+                }
+            }
+            if (found)
+                return found;
+        }
+    } else if (is_number(name)) {
+        pid = number(name);
+        for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
+            if (jp->used && jp->nprocs > 0
+             && jp->ps[jp->nprocs - 1].pid == pid)
+                return jp;
+        }
+    }
+    error("No such job: %s", name);
+    /* NOTREACHED */
+}
+/*
+ * Return a new job structure,
+ */
+struct job *
+makejob(node, nprocs)
+    union node *node;
+    int nprocs;
+{
+    int i;
+    struct job *jp;
+    for (i = njobs, jp = jobtab ; ; jp++) {
+        if (--i < 0) {
+            INTOFF;
+            if (njobs == 0) {
+                jobtab = ckmalloc(4 * sizeof jobtab[0]);
+            } else {
+                jp = ckmalloc((njobs + 4) * sizeof jobtab[0]);
+                memcpy(jp, jobtab, njobs * sizeof jp[0]);
+                /* Relocate `ps' pointers */
+                for (i = 0; i < njobs; i++)
+                    if (jp[i].ps == &jobtab[i].ps0)
+                        jp[i].ps = &jp[i].ps0;
+                ckfree(jobtab);
+                jobtab = jp;
+            }
+            jp = jobtab + njobs;
+            for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0);
+            INTON;
+            break;
+        }
+        if (jp->used == 0)
+            break;
+    }
+    INTOFF;
+    jp->state = 0;
+    jp->used = 1;
+    jp->changed = 0;
+    jp->nprocs = 0;
+#if JOBS
+    jp->jobctl = jobctl;
+#endif
+    if (nprocs > 1) {
+        jp->ps = ckmalloc(nprocs * sizeof (struct procstat));
+    } else {
+        jp->ps = &jp->ps0;
+    }
+    INTON;
+    TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
+        jp - jobtab + 1));
+    return jp;
+}
+/*
+ * Fork of a subshell.  If we are doing job control, give the subshell its
+ * own process group.  Jp is a job structure that the job is to be added to.
+ * N is the command that will be evaluated by the child.  Both jp and n may
+ * be NULL.  The mode parameter can be one of the following:
+ *  FORK_FG - Fork off a foreground process.
+ *  FORK_BG - Fork off a background process.
+ *  FORK_NOJOB - Like FORK_FG, but don't give the process its own
+ *           process group even if job control is on.
+ *
+ * When job control is turned off, background processes have their standard
+ * input redirected to /dev/null (except for the second and later processes
+ * in a pipeline).
+ */
+int
+forkshell(jp, n, mode)
+    union node *n;
+    struct job *jp;
+    int mode;
+{
+    int pid;
+    int pgrp;
+    const char *devnull = _PATH_DEVNULL;
+    const char *nullerr = "Can't open %s";
+    TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n,
+        mode));
+    INTOFF;
+    pid = fork();
+    if (pid == -1) {
+        TRACE(("Fork failed, errno=%d\n", errno));
+        INTON;
+        error("Cannot fork");
+    }
+    if (pid == 0) {
+        struct job *p;
+        int wasroot;
+        int i;
+        TRACE(("Child shell %d\n", getpid()));
+        wasroot = rootshell;
+        rootshell = 0;
+        closescript();
+        INTON;
+        clear_traps();
+#if JOBS
+        jobctl = 0;     /* do job control only in root shell */
+        if (wasroot && mode != FORK_NOJOB && mflag) {
+            if (jp == NULL || jp->nprocs == 0)
+                pgrp = getpid();
+            else
+                pgrp = jp->ps[0].pid;
+            setpgid(0, pgrp);
+            if (mode == FORK_FG) {
+                /*** this causes superfluous TIOCSPGRPS ***/
+#ifdef OLD_TTY_DRIVER
+                if (ioctl(fd2, TIOCSPGRP, (char *)&pgrp) < 0)
+                    error("TIOCSPGRP failed, errno=%d", errno);
+#else
+                if (tcsetpgrp(fd2, pgrp) < 0)
+                    error("tcsetpgrp failed, errno=%d", errno);
+#endif
+            }
+            setsignal(SIGTSTP);
+            setsignal(SIGTTOU);
+        } else if (mode == FORK_BG) {
+            ignoresig(SIGINT);
+            ignoresig(SIGQUIT);
+            ignoresig(SIGHUP);
+            if ((jp == NULL || jp->nprocs == 0) &&
+                ! fd0_redirected_p ()) {
+                close(0);
+                if (open(devnull, O_RDONLY) != 0)
+                    error(nullerr, devnull);
+            }
+        }
+#else
+        if (mode == FORK_BG) {
+            ignoresig(SIGINT);
+            ignoresig(SIGQUIT);
+            ignoresig(SIGHUP);
+            if ((jp == NULL || jp->nprocs == 0) &&
+                ! fd0_redirected_p ()) {
+                close(0);
+                if (open(devnull, O_RDONLY) != 0)
+                    error(nullerr, devnull);
+            }
+        }
+#endif
+        for (i = njobs, p = jobtab ; --i >= 0 ; p++)
+            if (p->used)
+                freejob(p);
+        if (wasroot && iflag) {
+            setsignal(SIGINT);
+            setsignal(SIGQUIT);
+            setsignal(SIGTERM);
+        }
+        return pid;
+    }
+    if (rootshell && mode != FORK_NOJOB && mflag) {
+        if (jp == NULL || jp->nprocs == 0)
+            pgrp = pid;
+        else
+            pgrp = jp->ps[0].pid;
+        setpgid(pid, pgrp);
+    }
+    if (mode == FORK_BG)
+        backgndpid = pid;       /* set $! */
+    if (jp) {
+        struct procstat *ps = &jp->ps[jp->nprocs++];
+        ps->pid = pid;
+        ps->status = -1;
+        ps->cmd = nullstr;
+        if (iflag && rootshell && n)
+            ps->cmd = commandtext(n);
+    }
+    INTON;
+    TRACE(("In parent shell:  child = %d\n", pid));
+    return pid;
+}
+/*
+ * Wait for job to finish.
+ *
+ * Under job control we have the problem that while a child process is
+ * running interrupts generated by the user are sent to the child but not
+ * to the shell.  This means that an infinite loop started by an inter-
+ * active user may be hard to kill.  With job control turned off, an
+ * interactive user may place an interactive program inside a loop.  If
+ * the interactive program catches interrupts, the user doesn't want
+ * these interrupts to also abort the loop.  The approach we take here
+ * is to have the shell ignore interrupt signals while waiting for a
+ * forground process to terminate, and then send itself an interrupt
+ * signal if the child process was terminated by an interrupt signal.
+ * Unfortunately, some programs want to do a bit of cleanup and then
+ * exit on interrupt; unless these processes terminate themselves by
+ * sending a signal to themselves (instead of calling exit) they will
+ * confuse this approach.
+ */
+int
+waitforjob(jp)
+    struct job *jp;
+    {
+#if JOBS
+    int mypgrp = getpgrp();
+#endif
+    int status;
+    int st;
+    struct sigaction act, oact;
+    INTOFF;
+    intreceived = 0;
+#if JOBS
+    if (!jobctl) {
+#else
+    if (!iflag) {
+#endif
+        sigaction(SIGINT, 0, &act);
+        act.sa_handler = waitonint;
+        sigaction(SIGINT, &act, &oact);
+    }
+    TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1));
+    while (jp->state == 0) {
+        dowait(1, jp);
+    }
+#if JOBS
+    if (!jobctl) {
+#else
+    if (!iflag) {
+#endif
+        extern char *trap[];
+        sigaction(SIGINT, &oact, 0);
+        if (intreceived && trap[SIGINT]) kill(getpid(), SIGINT);
+    }
+#if JOBS
+    if (jp->jobctl) {
+#ifdef OLD_TTY_DRIVER
+        if (ioctl(fd2, TIOCSPGRP, (char *)&mypgrp) < 0)
+            error("TIOCSPGRP failed, errno=%d\n", errno);
+#else
+        if (tcsetpgrp(fd2, mypgrp) < 0)
+            error("tcsetpgrp failed, errno=%d\n", errno);
+#endif
+    }
+    if (jp->state == JOBSTOPPED)
+        curjob = jp - jobtab + 1;
+#endif
+    status = jp->ps[jp->nprocs - 1].status;
+    /* convert to 8 bits */
+    if (WIFEXITED(status))
+        st = WEXITSTATUS(status);
+#if JOBS
+    else if (WIFSTOPPED(status))
+        st = WSTOPSIG(status) + 128;
+#endif
+    else
+        st = WTERMSIG(status) + 128;
+#if JOBS
+    if (jp->jobctl) {
+        /*
+         * This is truly gross.
+         * If we're doing job control, then we did a TIOCSPGRP which
+         * caused us (the shell) to no longer be in the controlling
+         * session -- so we wouldn't have seen any ^C/SIGINT.  So, we
+         * intuit from the subprocess exit status whether a SIGINT
+         * occured, and if so interrupt ourselves.  Yuck.  - mycroft
+         */
+        if (WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
+            raise(SIGINT);
+    }
+#endif
+    if (! JOBS || jp->state == JOBDONE)
+        freejob(jp);
+    INTON;
+    return st;
+}
+/*
+ * Wait for a process to terminate.
+ */
+STATIC int
+dowait(block, job)
+    int block;
+    struct job *job;
+{
+    int pid;
+    int status;
+    struct procstat *sp;
+    struct job *jp;
+    struct job *thisjob;
+    int done;
+    int stopped;
+    int core;
+    int sig;
+    TRACE(("dowait(%d) called\n", block));
+    do {
+        pid = waitproc(block, &status);
+        TRACE(("wait returns %d, status=%d\n", pid, status));
+    } while (pid == -1 && errno == EINTR);
+    if (pid <= 0)
+        return pid;
+    INTOFF;
+    thisjob = NULL;
+    for (jp = jobtab ; jp < jobtab + njobs ; jp++) {
+        if (jp->used) {
+            done = 1;
+            stopped = 1;
+            for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) {
+                if (sp->pid == -1)
+                    continue;
+                if (sp->pid == pid) {
+                    TRACE(("Changing status of proc %d from 0x%x to 0x%x\n", pid, sp->status, status));
+                    sp->status = status;
+                    thisjob = jp;
+                }
+                if (sp->status == -1)
+                    stopped = 0;
+                else if (WIFSTOPPED(sp->status))
+                    done = 0;
+            }
+            if (stopped) {      /* stopped or done */
+                int state = done? JOBDONE : JOBSTOPPED;
+                if (jp->state != state) {
+                    TRACE(("Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state));
+                    jp->state = state;
+#if JOBS
+                    if (done && curjob == jp - jobtab + 1)
+                        curjob = 0;     /* no current job */
+#endif
+                }
+            }
+        }
+    }
+    INTON;
+    if (! rootshell || ! iflag || (job && thisjob == job)) {
+        core = WCOREDUMP(status);
+#if JOBS
+        if (WIFSTOPPED(status)) sig = WSTOPSIG(status);
+        else
+#endif
+        if (WIFEXITED(status)) sig = 0;
+        else sig = WTERMSIG(status);
+        if (sig != 0 && sig != SIGINT && sig != SIGPIPE) {
+            if (thisjob != job)
+                outfmt(out2, "%d: ", pid);
+#if JOBS
+            if (sig == SIGTSTP && rootshell && iflag)
+                outfmt(out2, "%%%ld ",
+                    (long)(job - jobtab + 1));
+#endif
+            if (sig < NSIG && sys_siglist[sig])
+                out2str(sys_siglist[sig]);
+            else
+                outfmt(out2, "Signal %d", sig);
+            if (core)
+                out2str(" - core dumped");
+            out2c('\n');
+            flushout(&errout);
+        } else {
+            TRACE(("Not printing status: status=%d, sig=%d\n",
+                   status, sig));
+        }
+    } else {
+        TRACE(("Not printing status, rootshell=%d, job=0x%x\n", rootshell, job));
+        if (thisjob)
+            thisjob->changed = 1;
+    }
+    return pid;
+}
+/*
+ * Do a wait system call.  If job control is compiled in, we accept
+ * stopped processes.  If block is zero, we return a value of zero
+ * rather than blocking.
+ *
+ * System V doesn't have a non-blocking wait system call.  It does
+ * have a SIGCLD signal that is sent to a process when one of it's
+ * children dies.  The obvious way to use SIGCLD would be to install
+ * a handler for SIGCLD which simply bumped a counter when a SIGCLD
+ * was received, and have waitproc bump another counter when it got
+ * the status of a process.  Waitproc would then know that a wait
+ * system call would not block if the two counters were different.
+ * This approach doesn't work because if a process has children that
+ * have not been waited for, System V will send it a SIGCLD when it
+ * installs a signal handler for SIGCLD.  What this means is that when
+ * a child exits, the shell will be sent SIGCLD signals continuously
+ * until is runs out of stack space, unless it does a wait call before
+ * restoring the signal handler.  The code below takes advantage of
+ * this (mis)feature by installing a signal handler for SIGCLD and
+ * then checking to see whether it was called.  If there are any
+ * children to be waited for, it will be.
+ *
+ * If neither SYSV nor BSD is defined, we don't implement nonblocking
+ * waits at all.  In this case, the user will not be informed when
+ * a background process until the next time she runs a real program
+ * (as opposed to running a builtin command or just typing return),
+ * and the jobs command may give out of date information.
+ */
+#ifdef SYSV
+STATIC int gotsigchild;
+STATIC int onsigchild() {
+    gotsigchild = 1;
+}
+#endif
+STATIC int
+waitproc(block, status)
+    int block;
+    int *status;
+{
+#ifdef BSD
+    int flags;
+    flags = 0;
+#if JOBS
+    if (jobctl)
+        flags |= WUNTRACED;
+#endif
+    if (block == 0)
+        flags |= WNOHANG;
+    return wait3(status, flags, (struct rusage *)NULL);
+#else
+#ifdef SYSV
+    int (*save)();
+    if (block == 0) {
+        gotsigchild = 0;
+        save = signal(SIGCLD, onsigchild);
+        signal(SIGCLD, save);
+        if (gotsigchild == 0)
+            return 0;
+    }
+    return wait(status);
+#else
+    if (block == 0)
+        return 0;
+    return wait(status);
+#endif
+#endif
+}
+/*
+ * return 1 if there are stopped jobs, otherwise 0
+ */
+int job_warning = 0;
+int
+stoppedjobs()
+{
+    int jobno;
+    struct job *jp;
+    if (job_warning)
+        return (0);
+    for (jobno = 1, jp = jobtab; jobno <= njobs; jobno++, jp++) {
+        if (jp->used == 0)
+            continue;
+        if (jp->state == JOBSTOPPED) {
+            out2str("You have stopped jobs.\n");
+            job_warning = 2;
+            return (1);
+        }
+    }
+    return (0);
+}
+/*
+ * Return a string identifying a command (to be printed by the
+ * jobs command.
+ */
+STATIC char *cmdnextc;
+STATIC int cmdnleft;
+#define MAXCMDTEXT  200
+char *
+commandtext(n)
+    union node *n;
+    {
+    char *name;
+    cmdnextc = name = ckmalloc(MAXCMDTEXT);
+    cmdnleft = MAXCMDTEXT - 4;
+    cmdtxt(n);
+    *cmdnextc = '\0';
+    return name;
+}
+STATIC void
+cmdtxt(n)
+    union node *n;
+    {
+    union node *np;
+    struct nodelist *lp;
+    const char *p;
+    int i;
+    char s[2];
+    if (n == NULL)
+        return;
+    switch (n->type) {
+    case NSEMI:
+        cmdtxt(n->nbinary.ch1);
+        cmdputs("; ");
+        cmdtxt(n->nbinary.ch2);
+        break;
+    case NAND:
+        cmdtxt(n->nbinary.ch1);
+        cmdputs(" && ");
+        cmdtxt(n->nbinary.ch2);
+        break;
+    case NOR:
+        cmdtxt(n->nbinary.ch1);
+        cmdputs(" || ");
+        cmdtxt(n->nbinary.ch2);
+        break;
+    case NPIPE:
+        for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) {
+            cmdtxt(lp->n);
+            if (lp->next)
+                cmdputs(" | ");
+        }
+        break;
+    case NSUBSHELL:
+        cmdputs("(");
+        cmdtxt(n->nredir.n);
+        cmdputs(")");
+        break;
+    case NREDIR:
+    case NBACKGND:
+        cmdtxt(n->nredir.n);
+        break;
+    case NIF:
+        cmdputs("if ");
+        cmdtxt(n->nif.test);
+        cmdputs("; then ");
+        cmdtxt(n->nif.ifpart);
+        cmdputs("...");
+        break;
+    case NWHILE:
+        cmdputs("while ");
+        goto until;
+    case NUNTIL:
+        cmdputs("until ");
+until:
+        cmdtxt(n->nbinary.ch1);
+        cmdputs("; do ");
+        cmdtxt(n->nbinary.ch2);
+        cmdputs("; done");
+        break;
+    case NFOR:
+        cmdputs("for ");
+        cmdputs(n->nfor.var);
+        cmdputs(" in ...");
+        break;
+    case NCASE:
+        cmdputs("case ");
+        cmdputs(n->ncase.expr->narg.text);
+        cmdputs(" in ...");
+        break;
+    case NDEFUN:
+        cmdputs(n->narg.text);
+        cmdputs("() ...");
+        break;
+    case NCMD:
+        for (np = n->ncmd.args ; np ; np = np->narg.next) {
+            cmdtxt(np);
+            if (np->narg.next)
+                cmdputs(" ");
+        }
+        for (np = n->ncmd.redirect ; np ; np = np->nfile.next) {
+            cmdputs(" ");
+            cmdtxt(np);
+        }
+        break;
+    case NARG:
+        cmdputs(n->narg.text);
+        break;
+    case NTO:
+        p = ">";  i = 1;  goto redir;
+    case NAPPEND:
+        p = ">>";  i = 1;  goto redir;
+    case NTOFD:
+        p = ">&";  i = 1;  goto redir;
+    case NTOOV:
+        p = ">|";  i = 1;  goto redir;
+    case NFROM:
+        p = "<";  i = 0;  goto redir;
+    case NFROMFD:
+        p = "<&";  i = 0;  goto redir;
+    case NFROMTO:
+        p = "<>";  i = 0;  goto redir;
+redir:
+        if (n->nfile.fd != i) {
+            s[0] = n->nfile.fd + '0';
+            s[1] = '\0';
+            cmdputs(s);
+        }
+        cmdputs(p);
+        if (n->type == NTOFD || n->type == NFROMFD) {
+            s[0] = n->ndup.dupfd + '0';
+            s[1] = '\0';
+            cmdputs(s);
+        } else {
+            cmdtxt(n->nfile.fname);
+        }
+        break;
+    case NHERE:
+    case NXHERE:
+        cmdputs("<<...");
+        break;
+    default:
+        cmdputs("???");
+        break;
+    }
+}
+STATIC void
+cmdputs(s)
+    const char *s;
+    {
+    const char *p;
+    char *q;
+    char c;
+    int subtype = 0;
+    if (cmdnleft <= 0)
+        return;
+    p = s;
+    q = cmdnextc;
+    while ((c = *p++) != '\0') {
+        if (c == CTLESC)
+            *q++ = *p++;
+        else if (c == CTLVAR) {
+            *q++ = '$';
+            if (--cmdnleft > 0)
+                *q++ = '{';
+            subtype = *p++;
+        } else if (c == '=' && subtype != 0) {
+            *q++ = "}-+?="[(subtype & VSTYPE) - VSNORMAL];
+            subtype = 0;
+        } else if (c == CTLENDVAR) {
+            *q++ = '}';
+        } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE)
+            cmdnleft++;     /* ignore it */
+        else
+            *q++ = c;
+        if (--cmdnleft <= 0) {
+            *q++ = '.';
+            *q++ = '.';
+            *q++ = '.';
+            break;
+        }
+    }
+    cmdnextc = q;
+}
+STATIC void waitonint(int sig) {
+    intreceived = 1;
+    return;
+}

 /trunk/uspace/app/ash/memalloc.h
 ,0 → 1,81
+/*  $NetBSD: memalloc.h,v 1.11 2000/11/01 19:56:01 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)memalloc.h  8.2 (Berkeley) 5/4/95
+ */
+struct stackmark {
+    struct stack_block *stackp;
+    char *stacknxt;
+    int stacknleft;
+    struct stackmark *marknext;
+};
+extern char *stacknxt;
+extern int stacknleft;
+extern int sstrnleft;
+extern int herefd;
+pointer ckmalloc (int);
+pointer ckrealloc (pointer, int);
+char *savestr (char *);
+pointer stalloc (int);
+void stunalloc (pointer);
+void setstackmark (struct stackmark *);
+void popstackmark (struct stackmark *);
+void growstackblock (void);
+void grabstackblock (int);
+char *growstackstr (void);
+char *makestrspace (void);
+void ungrabstackstr (char *, char *);
+#define stackblock() stacknxt
+#define stackblocksize() stacknleft
+#define STARTSTACKSTR(p)    p = stackblock(), sstrnleft = stackblocksize()
+#define STPUTC(c, p)    (--sstrnleft >= 0? (*p++ = (c)) : (p = growstackstr(), *p++ = (c)))
+#define CHECKSTRSPACE(n, p) { if (sstrnleft < n) p = makestrspace(); }
+#define USTPUTC(c, p)   (--sstrnleft, *p++ = (c))
+#define STACKSTRNUL(p)  (sstrnleft == 0? (p = growstackstr(), *p = '\0') : (*p = '\0'))
+#define STUNPUTC(p) (++sstrnleft, --p)
+#define STTOPC(p)   p[-1]
+#define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount))
+#define grabstackstr(p) stalloc(stackblocksize() - sstrnleft)
+#define ckfree(p)   free((pointer)(p))

 /trunk/uspace/app/ash/alias.h
 ,0 → 1,53
+/*  $NetBSD: alias.h,v 1.4 1995/05/11 21:28:42 christos Exp $   */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)alias.h 8.2 (Berkeley) 5/4/95
+ */
+#define ALIASINUSE  1
+struct alias {
+    struct alias *next;
+    char *name;
+    char *val;
+    int flag;
+};
+struct alias *lookupalias (char *, int);
+int aliascmd (int, char **);
+int unaliascmd (int, char **);
+void rmaliases (void);

 /trunk/uspace/app/ash/output.c
 ,0 → 1,634
+/*  $NetBSD: output.c,v 1.23 2001/01/07 23:39:07 lukem Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)output.c    8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: output.c,v 1.23 2001/01/07 23:39:07 lukem Exp $");
+#endif
+#endif /* not lint */
+/*
+ * Shell output routines.  We use our own output routines because:
+ *  When a builtin command is interrupted we have to discard
+ *      any pending output.
+ *  When a builtin command appears in back quotes, we want to
+ *      save the output of the command in a region obtained
+ *      via malloc, rather than doing a fork and reading the
+ *      output of the command via a pipe.
+ *  Our output routines may be smaller than the stdio routines.
+ */
+#include <sys/types.h>      /* quad_t */
+#include <sys/param.h>      /* BSD4_4 */
+#include <sys/ioctl.h>
+#include <stdio.h>  /* defines BUFSIZ */
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+#undef CEOF         /* get rid of the redefine warning */
+#include <fcntl.h>
+#endif
+#include "shell.h"
+#include "syntax.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#define OUTBUFSIZ BUFSIZ
+#define BLOCK_OUT -2        /* output to a fixed block of memory */
+#define MEM_OUT -3      /* output to dynamically allocated memory */
+#define OUTPUT_ERR 01       /* error occurred on output */
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+struct output output = {NULL, NULL, 0, NULL, 0, 1, 0};
+struct output errout = {NULL, NULL, 0, NULL, 0, 2, 0};
+struct output memout = {NULL, NULL, 0, NULL, 0, MEM_OUT, 0};
+#else
+struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
+struct output errout = {NULL, 0, NULL, 100, 2, 0};
+struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
+#endif
+struct output *out1 = &output;
+struct output *out2 = &errout;
+#ifdef mkinit
+INCLUDE "output.h"
+INCLUDE "memalloc.h"
+INIT {
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    initstreams();
+#endif
+}
+RESET {
+    out1 = &output;
+    out2 = &errout;
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    if (memout.stream != NULL)
+        closememout();
+#endif
+    if (memout.buf != NULL) {
+        ckfree(memout.buf);
+        memout.buf = NULL;
+    }
+}
+#endif
+#ifdef notdef   /* no longer used */
+/*
+ * Set up an output file to write to memory rather than a file.
+ */
+void
+open_mem(block, length, file)
+    char *block;
+    int length;
+    struct output *file;
+    {
+    file->nextc = block;
+    file->nleft = --length;
+    file->fd = BLOCK_OUT;
+    file->flags = 0;
+}
+#endif
+void
+outstr(p, file)
+    const char *p;
+    struct output *file;
+    {
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    fputs(p, file->stream);
+#else
+    while (*p)
+        outc(*p++, file);
+#endif
+    if (file == out2)
+        flushout(file);
+}
+#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+char out_junk[16];
+void
+emptyoutbuf(dest)
+    struct output *dest;
+    {
+    int offset;
+    if (dest->fd == BLOCK_OUT) {
+        dest->nextc = out_junk;
+        dest->nleft = sizeof out_junk;
+        dest->flags |= OUTPUT_ERR;
+    } else if (dest->buf == NULL) {
+        INTOFF;
+        dest->buf = ckmalloc(dest->bufsize);
+        dest->nextc = dest->buf;
+        dest->nleft = dest->bufsize;
+        INTON;
+    } else if (dest->fd == MEM_OUT) {
+        offset = dest->bufsize;
+        INTOFF;
+        dest->bufsize <<= 1;
+        dest->buf = ckrealloc(dest->buf, dest->bufsize);
+        dest->nleft = dest->bufsize - offset;
+        dest->nextc = dest->buf + offset;
+        INTON;
+    } else {
+        flushout(dest);
+    }
+    dest->nleft--;
+}
+#endif
+void
+flushall() {
+    flushout(&output);
+    flushout(&errout);
+}
+#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+void
+flushout(dest)
+    struct output *dest;
+    {
+    if (dest->buf == NULL || dest->nextc == dest->buf || dest->fd < 0)
+        return;
+    if (xwrite(dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
+        dest->flags |= OUTPUT_ERR;
+    dest->nextc = dest->buf;
+    dest->nleft = dest->bufsize;
+}
+#endif
+void
+freestdout() {
+    INTOFF;
+    if (output.buf) {
+        ckfree(output.buf);
+        output.buf = NULL;
+        output.nleft = 0;
+    }
+    INTON;
+}
+void
+#ifdef __STDC__
+outfmt(struct output *file, const char *fmt, ...)
+#else
+void
+outfmt(va_alist)
+    va_dcl
+#endif
+{
+    va_list ap;
+#ifndef __STDC__
+    struct output *file;
+    const char *fmt;
+    va_start(ap);
+    file = va_arg(ap, struct output *);
+    fmt = va_arg(ap, const char *);
+#else
+    va_start(ap, fmt);
+#endif
+    doformat(file, fmt, ap);
+    va_end(ap);
+}
+void
+#ifdef __STDC__
+out1fmt(const char *fmt, ...)
+#else
+out1fmt(va_alist)
+    va_dcl
+#endif
+{
+    va_list ap;
+#ifndef __STDC__
+    const char *fmt;
+    va_start(ap);
+    fmt = va_arg(ap, const char *);
+#else
+    va_start(ap, fmt);
+#endif
+    doformat(out1, fmt, ap);
+    va_end(ap);
+}
+#if !defined(__GLIBC__) && !defined(__UCLIBC__)
+void
+#ifdef __STDC__
+dprintf(const char *fmt, ...)
+#else
+dprintf(va_alist)
+    va_dcl
+#endif
+{
+    va_list ap;
+#ifndef __STDC__
+    const char *fmt;
+    va_start(ap);
+    fmt = va_arg(ap, const char *);
+#else
+    va_start(ap, fmt);
+#endif
+    doformat(out2, fmt, ap);
+    va_end(ap);
+    flushout(out2);
+}
+#endif
+void
+#ifdef __STDC__
+fmtstr(char *outbuf, size_t length, const char *fmt, ...)
+#else
+fmtstr(va_alist)
+    va_dcl
+#endif
+{
+    va_list ap;
+#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+    struct output strout;
+#endif
+#ifndef __STDC__
+    char *outbuf;
+    size_t length;
+    const char *fmt;
+    va_start(ap);
+    outbuf = va_arg(ap, char *);
+    length = va_arg(ap, size_t);
+    fmt = va_arg(ap, const char *);
+#else
+    va_start(ap, fmt);
+#endif
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    vsnprintf(outbuf, length, fmt, ap);
+#else
+    strout.nextc = outbuf;
+    strout.nleft = length;
+    strout.fd = BLOCK_OUT;
+    strout.flags = 0;
+    doformat(&strout, fmt, ap);
+    outc('\0', &strout);
+    if (strout.flags & OUTPUT_ERR)
+        outbuf[length - 1] = '\0';
+#endif
+}
+#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+/*
+ * Formatted output.  This routine handles a subset of the printf formats:
+ * - Formats supported: d, u, o, p, X, s, and c.
+ * - The x format is also accepted but is treated like X.
+ * - The l, ll and q modifiers are accepted.
+ * - The - and # flags are accepted; # only works with the o format.
+ * - Width and precision may be specified with any format except c.
+ * - An * may be given for the width or precision.
+ * - The obsolete practice of preceding the width with a zero to get
+ *   zero padding is not supported; use the precision field.
+ * - A % may be printed by writing %% in the format string.
+ */
+#define TEMPSIZE 24
+static const char digit[] = "0123456789ABCDEF";
+#ifdef BSD4_4
+#define HAVE_VASPRINTF 1
+#endif
+void
+doformat(dest, f, ap)
+    struct output *dest;
+    const char *f;      /* format string */
+    va_list ap;
+{
+#if HAVE_VASPRINTF
+    char *s;
+    vasprintf(&s, f, ap);
+    outstr(s, dest);
+    free(s);
+#else   /* !HAVE_VASPRINTF */
+    char c;
+    char temp[TEMPSIZE];
+    int flushleft;
+    int sharp;
+    int width;
+    int prec;
+    int islong;
+    int isquad;
+    char *p;
+    int sign;
+#ifdef BSD4_4
+    quad_t l;
+    u_quad_t num;
+#else
+    long l;
+    u_long num;
+#endif
+    unsigned base;
+    int len;
+    int size;
+    int pad;
+    while ((c = *f++) != '\0') {
+        if (c != '%') {
+            outc(c, dest);
+            continue;
+        }
+        flushleft = 0;
+        sharp = 0;
+        width = 0;
+        prec = -1;
+        islong = 0;
+        isquad = 0;
+        for (;;) {
+            if (*f == '-')
+                flushleft++;
+            else if (*f == '#')
+                sharp++;
+            else
+                break;
+            f++;
+        }
+        if (*f == '*') {
+            width = va_arg(ap, int);
+            f++;
+        } else {
+            while (is_digit(*f)) {
+                width = 10 * width + digit_val(*f++);
+            }
+        }
+        if (*f == '.') {
+            if (*++f == '*') {
+                prec = va_arg(ap, int);
+                f++;
+            } else {
+                prec = 0;
+                while (is_digit(*f)) {
+                    prec = 10 * prec + digit_val(*f++);
+                }
+            }
+        }
+        if (*f == 'l') {
+            f++;
+            if (*f == 'l') {
+                isquad++;
+                f++;
+            } else
+                islong++;
+        } else if (*f == 'q') {
+            isquad++;
+            f++;
+        }
+        switch (*f) {
+        case 'd':
+#ifdef BSD4_4
+            if (isquad)
+                l = va_arg(ap, quad_t);
+            else
+#endif
+            if (islong)
+                l = va_arg(ap, long);
+            else
+                l = va_arg(ap, int);
+            sign = 0;
+            num = l;
+            if (l < 0) {
+                num = -l;
+                sign = 1;
+            }
+            base = 10;
+            goto number;
+        case 'u':
+            base = 10;
+            goto uns_number;
+        case 'o':
+            base = 8;
+            goto uns_number;
+        case 'p':
+            outc('0', dest);
+            outc('x', dest);
+            /*FALLTHROUGH*/
+        case 'x':
+            /* we don't implement 'x'; treat like 'X' */
+        case 'X':
+            base = 16;
+uns_number:   /* an unsigned number */
+            sign = 0;
+#ifdef BSD4_4
+            if (isquad)
+                num = va_arg(ap, u_quad_t);
+            else
+#endif
+            if (islong)
+                num = va_arg(ap, unsigned long);
+            else
+                num = va_arg(ap, unsigned int);
+number:       /* process a number */
+            p = temp + TEMPSIZE - 1;
+            *p = '\0';
+            while (num) {
+                *--p = digit[num % base];
+                num /= base;
+            }
+            len = (temp + TEMPSIZE - 1) - p;
+            if (prec < 0)
+                prec = 1;
+            if (sharp && *f == 'o' && prec <= len)
+                prec = len + 1;
+            pad = 0;
+            if (width) {
+                size = len;
+                if (size < prec)
+                    size = prec;
+                size += sign;
+                pad = width - size;
+                if (flushleft == 0) {
+                    while (--pad >= 0)
+                        outc(' ', dest);
+                }
+            }
+            if (sign)
+                outc('-', dest);
+            prec -= len;
+            while (--prec >= 0)
+                outc('0', dest);
+            while (*p)
+                outc(*p++, dest);
+            while (--pad >= 0)
+                outc(' ', dest);
+            break;
+        case 's':
+            p = va_arg(ap, char *);
+            pad = 0;
+            if (width) {
+                len = strlen(p);
+                if (prec >= 0 && len > prec)
+                    len = prec;
+                pad = width - len;
+                if (flushleft == 0) {
+                    while (--pad >= 0)
+                        outc(' ', dest);
+                }
+            }
+            prec++;
+            while (--prec != 0 && *p)
+                outc(*p++, dest);
+            while (--pad >= 0)
+                outc(' ', dest);
+            break;
+        case 'c':
+            c = va_arg(ap, int);
+            outc(c, dest);
+            break;
+        default:
+            outc(*f, dest);
+            break;
+        }
+        f++;
+    }
+#endif  /* !HAVE_VASPRINTF */
+}
+#endif
+/*
+ * Version of write which resumes after a signal is caught.
+ */
+int
+xwrite(fd, buf, nbytes)
+    int fd;
+    const char *buf;
+    int nbytes;
+    {
+    int ntry;
+    int i;
+    int n;
+    n = nbytes;
+    ntry = 0;
+    for (;;) {
+        i = write(fd, buf, n);
+        if (i > 0) {
+            if ((n -= i) <= 0)
+                return nbytes;
+            buf += i;
+            ntry = 0;
+        } else if (i == 0) {
+            if (++ntry > 10)
+                return nbytes - n;
+        } else if (errno != EINTR) {
+            return -1;
+        }
+    }
+}
+#ifdef notdef
+/*
+ * Version of ioctl that retries after a signal is caught.
+ * XXX unused function
+ */
+int
+xioctl(fd, request, arg)
+    int fd;
+    unsigned long request;
+    char * arg;
+{
+    int i;
+    while ((i = ioctl(fd, request, arg)) == -1 && errno == EINTR);
+    return i;
+}
+#endif
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+void initstreams() {
+    output.stream = stdout;
+    errout.stream = stderr;
+}
+void
+openmemout() {
+    memout.stream = open_memstream(&memout.buf, &memout.bufsize);
+}
+void
+closememout() {
+    INTOFF;
+    fclose(memout.stream);
+    memout.stream = NULL;
+    INTON;
+}
+#endif

 /trunk/uspace/app/ash/parser.h
 ,0 → 1,83
+/*  $NetBSD: parser.h,v 1.14 2000/07/27 04:09:28 cgd Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)parser.h    8.3 (Berkeley) 5/4/95
+ */
+/* control characters in argument strings */
+#define CTLESC '\201'
+#define CTLVAR '\202'
+#define CTLENDVAR '\203'
+#define CTLBACKQ '\204'
+#define CTLQUOTE 01     /* ored with CTLBACKQ code if in quotes */
+/*  CTLBACKQ | CTLQUOTE == '\205' */
+#define CTLARI  '\206'
+#define CTLENDARI '\207'
+#define CTLQUOTEMARK '\210'
+/* variable substitution byte (follows CTLVAR) */
+#define VSTYPE  0x0f        /* type of variable substitution */
+#define VSNUL   0x10        /* colon--treat the empty string as unset */
+#define VSQUOTE 0x80        /* inside double quotes--suppress splitting */
+/* values of VSTYPE field */
+#define VSNORMAL    0x1     /* normal variable:  $var or ${var} */
+#define VSMINUS     0x2     /* ${var-text} */
+#define VSPLUS      0x3     /* ${var+text} */
+#define VSQUESTION  0x4     /* ${var?message} */
+#define VSASSIGN    0x5     /* ${var=text} */
+#define VSTRIMLEFT  0x6     /* ${var#pattern} */
+#define VSTRIMLEFTMAX   0x7     /* ${var##pattern} */
+#define VSTRIMRIGHT 0x8     /* ${var%pattern} */
+#define VSTRIMRIGHTMAX  0x9     /* ${var%%pattern} */
+#define VSLENGTH    0xa     /* ${#var} */
+/*
+ * NEOF is returned by parsecmd when it encounters an end of file.  It
+ * must be distinct from NULL, so we use the address of a variable that
+ * happens to be handy.
+ */
+extern int tokpushback;
+#define NEOF ((union node *)&tokpushback)
+extern int whichprompt;     /* 1 == PS1, 2 == PS2 */
+union node *parsecmd(int);
+void fixredir(union node *, const char *, int);
+int goodname(char *);
+const char *getprompt(void *);

 /trunk/uspace/app/ash/jobs.h
 ,0 → 1,98
+/*  $NetBSD: jobs.h,v 1.12 2000/05/22 10:18:47 elric Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)jobs.h  8.2 (Berkeley) 5/4/95
+ */
+/* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
+#define FORK_FG 0
+#define FORK_BG 1
+#define FORK_NOJOB 2
+/*
+ * A job structure contains information about a job.  A job is either a
+ * single process or a set of processes contained in a pipeline.  In the
+ * latter case, pidlist will be non-NULL, and will point to a -1 terminated
+ * array of pids.
+ */
+struct procstat {
+    pid_t pid;      /* process id */
+    int status;     /* status flags (defined above) */
+    char *cmd;      /* text of command being run */
+};
+/* states */
+#define JOBSTOPPED 1        /* all procs are stopped */
+#define JOBDONE 2       /* all procs are completed */
+struct job {
+    struct procstat ps0;    /* status of process */
+    struct procstat *ps;    /* status or processes when more than one */
+    short nprocs;       /* number of processes */
+    short pgrp;     /* process group of this job */
+    char state;     /* true if job is finished */
+    char used;      /* true if this entry is in used */
+    char changed;       /* true if status has changed */
+#if JOBS
+    char jobctl;        /* job running under job control */
+#endif
+};
+extern short backgndpid;    /* pid of last background process */
+extern int job_warning;     /* user was warned about stopped jobs */
+void setjobctl (int);
+int killcmd (int, char **);
+int fgcmd (int, char **);
+int bgcmd (int, char **);
+int jobscmd (int, char **);
+void showjobs (int);
+int waitcmd (int, char **);
+int jobidcmd (int, char **);
+struct job *makejob (union node *, int);
+int forkshell (struct job *, union node *, int);
+int waitforjob (struct job *);
+int stoppedjobs (void);
+char *commandtext (union node *);
+#if ! JOBS
+#define setjobctl(on)   /* do nothing */
+#endif

 /trunk/uspace/app/ash/output.h
 ,0 → 1,110
+/*  $NetBSD: output.h,v 1.14 1998/01/31 12:37:55 christos Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)output.h    8.2 (Berkeley) 5/4/95
+ */
+#ifndef OUTPUT_INCL
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+#include <stdio.h>
+#endif
+struct output {
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    FILE *stream;
+#endif
+    char *nextc;
+    int nleft;
+    char *buf;
+    int bufsize;
+    int fd;
+    short flags;
+};
+extern struct output output;
+extern struct output errout;
+extern struct output memout;
+extern struct output *out1;
+extern struct output *out2;
+void outstr (const char *, struct output *);
+#ifndef _GNU_SOURCE
+void emptyoutbuf (struct output *);
+#endif
+void flushall (void);
+#ifndef _GNU_SOURCE
+void flushout (struct output *);
+#endif
+void freestdout (void);
+void outfmt (struct output *, const char *, ...)
+    __attribute__((__format__(__printf__,2,3)));
+void out1fmt (const char *, ...)
+    __attribute__((__format__(__printf__,1,2)));
+#if !defined(__GLIBC__) && !defined(__UCLIBC__)
+void dprintf (const char *, ...)
+    __attribute__((__format__(__printf__,1,2)));
+#endif
+void fmtstr (char *, size_t, const char *, ...)
+    __attribute__((__format__(__printf__,3,4)));
+#ifndef _GNU_SOURCE
+void doformat (struct output *, const char *, va_list);
+#endif
+int xwrite (int, const char *, int);
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+void initstreams (void);
+void openmemout (void);
+void closememout (void);
+#define outc(c, o)  putc(c, (o)->stream)
+#define flushout(o) fflush((o)->stream)
+#define doformat(d, f, a)   vfprintf((d)->stream, f, a)
+#else
+#define outc(c, file)   (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c)))
+#endif
+#define out1c(c)    outc(c, out1)
+#define out2c(c)    outc(c, out2)
+#define out1str(s)  outstr(s, out1)
+#define out2str(s)  outstr(s, out2)
+#define OUTPUT_INCL
+#endif

 /trunk/uspace/app/ash/builtins.def
 ,0 → 1,96
+#!/bin/sh -
+#   $NetBSD: builtins.def,v 1.15 2000/04/09 23:27:03 christos Exp $
+#
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)builtins.def    8.4 (Berkeley) 5/4/95
+#
+# This file lists all the builtin commands.  The first column is the name
+# of a C routine.  The -j flag, if present, specifies that this command
+# is to be excluded from systems without job control, and the -h flag,
+# if present specifies that this command is to be excluded from systems
+# based on the SMALL compile-time symbol.  The rest of the line
+# specifies the command name or names used to run the command.  The entry
+# for bltincmd, which is run when the user does not specify a command, must
+# come first.
+#
+# NOTE: bltincmd must come first!
+bltincmd    builtin
+#alloccmd   alloc
+bgcmd -j    bg
+breakcmd    break continue
+#catfcmd    catf
+cdcmd       cd chdir
+commandcmd  command
+dotcmd      .
+echocmd     echo
+evalcmd     eval
+execcmd     exec
+exitcmd     exit
+expcmd      exp let
+exportcmd   export readonly
+#exprcmd        expr
+falsecmd    false
+histcmd -h  fc
+fgcmd -j    fg
+getoptscmd  getopts
+hashcmd     hash
+jobidcmd    jobid
+jobscmd     jobs
+killcmd -j  kill
+#linecmd        line
+localcmd    local
+#nlechocmd  nlecho
+#printfcmd  printf
+pwdcmd      pwd
+readcmd     read
+returncmd   return
+setcmd      set
+setvarcmd   setvar
+shiftcmd    shift
+trapcmd     trap
+truecmd     : true
+typecmd     type
+umaskcmd    umask
+unaliascmd  unalias
+unsetcmd    unset
+waitcmd     wait
+#foocmd     foo
+aliascmd    alias
+ulimitcmd   ulimit
+testcmd     test [
+timescmd    times

 /trunk/uspace/app/ash/mystring.c
 ,0 → 1,144
+/*  $NetBSD: mystring.c,v 1.14 1999/07/09 03:05:50 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)mystring.c  8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: mystring.c,v 1.14 1999/07/09 03:05:50 christos Exp $");
+#endif
+#endif /* not lint */
+/*
+ * String functions.
+ *
+ *  equal(s1, s2)       Return true if strings are equal.
+ *  scopy(from, to)     Copy a string.
+ *  scopyn(from, to, n) Like scopy, but checks for overflow.
+ *  number(s)       Convert a string of digits to an integer.
+ *  is_number(s)        Return true if s is a string of digits.
+ */
+#include <stdlib.h>
+#include "shell.h"
+#include "syntax.h"
+#include "error.h"
+#include "mystring.h"
+char nullstr[1];        /* zero length string */
+/*
+ * equal - #defined in mystring.h
+ */
+/*
+ * scopy - #defined in mystring.h
+ */
+/*
+ * scopyn - copy a string from "from" to "to", truncating the string
+ *      if necessary.  "To" is always nul terminated, even if
+ *      truncation is performed.  "Size" is the size of "to".
+ */
+void
+scopyn(from, to, size)
+    char const *from;
+    char *to;
+    int size;
+    {
+    while (--size > 0) {
+        if ((*to++ = *from++) == '\0')
+            return;
+    }
+    *to = '\0';
+}
+/*
+ * prefix -- see if pfx is a prefix of string.
+ */
+int
+prefix(pfx, string)
+    char const *pfx;
+    char const *string;
+    {
+    while (*pfx) {
+        if (*pfx++ != *string++)
+            return 0;
+    }
+    return 1;
+}
+/*
+ * Convert a string of digits to an integer, printing an error message on
+ * failure.
+ */
+int
+number(s)
+    const char *s;
+    {
+    if (! is_number(s))
+        error("Illegal number: %s", s);
+    return atoi(s);
+}
+/*
+ * Check for a valid number.  This should be elsewhere.
+ */
+int
+is_number(p)
+    const char *p;
+    {
+    do {
+        if (! is_digit(*p))
+            return 0;
+    } while (*++p != '\0');
+    return 1;
+}

 /trunk/uspace/app/ash/tags
 ,0 → 1,1207
+!_TAG_FILE_FORMAT   2   /extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED   1   /0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR    Darren Hiebert  /dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME  Exuberant Ctags //
+!_TAG_PROGRAM_URL   http://ctags.sourceforge.net    /official site/
+!_TAG_PROGRAM_VERSION   5.5.4   //
+ADDCMD  setmode.c   170;"   d   file:
+ALIASINUSE  alias.h 41;"    d
+ALIGN   machdep.h   52;"    d
+ALL error.c 223;"   d   file:
+ARB exec.c  88;"    d   file:
+ARITH_ADD   arith.c /^     ARITH_ADD = 275,$/;" e   enum:yytokentype    file:
+ARITH_ADD   arith.c 114;"   d   file:
+ARITH_ADD   arith.h /^     ARITH_ADD = 275,$/;" e   enum:yytokentype
+ARITH_ADD   arith.h 87;"    d
+ARITH_AND   arith.c /^     ARITH_AND = 262,$/;" e   enum:yytokentype    file:
+ARITH_AND   arith.c 101;"   d   file:
+ARITH_AND   arith.h /^     ARITH_AND = 262,$/;" e   enum:yytokentype
+ARITH_AND   arith.h 74;"    d
+ARITH_BAND  arith.c /^     ARITH_BAND = 265,$/;"    e   enum:yytokentype    file:
+ARITH_BAND  arith.c 104;"   d   file:
+ARITH_BAND  arith.h /^     ARITH_BAND = 265,$/;"    e   enum:yytokentype
+ARITH_BAND  arith.h 77;"    d
+ARITH_BNOT  arith.c /^     ARITH_BNOT = 279,$/;"    e   enum:yytokentype    file:
+ARITH_BNOT  arith.c 118;"   d   file:
+ARITH_BNOT  arith.h /^     ARITH_BNOT = 279,$/;"    e   enum:yytokentype
+ARITH_BNOT  arith.h 91;"    d
+ARITH_BOR   arith.c /^     ARITH_BOR = 263,$/;" e   enum:yytokentype    file:
+ARITH_BOR   arith.c 102;"   d   file:
+ARITH_BOR   arith.h /^     ARITH_BOR = 263,$/;" e   enum:yytokentype
+ARITH_BOR   arith.h 75;"    d
+ARITH_BXOR  arith.c /^     ARITH_BXOR = 264,$/;"    e   enum:yytokentype    file:
+ARITH_BXOR  arith.c 103;"   d   file:
+ARITH_BXOR  arith.h /^     ARITH_BXOR = 264,$/;"    e   enum:yytokentype
+ARITH_BXOR  arith.h 76;"    d
+ARITH_DIV   arith.c /^     ARITH_DIV = 277,$/;" e   enum:yytokentype    file:
+ARITH_DIV   arith.c 116;"   d   file:
+ARITH_DIV   arith.h /^     ARITH_DIV = 277,$/;" e   enum:yytokentype
+ARITH_DIV   arith.h 89;"    d
+ARITH_EQ    arith.c /^     ARITH_EQ = 267,$/;"  e   enum:yytokentype    file:
+ARITH_EQ    arith.c 106;"   d   file:
+ARITH_EQ    arith.h /^     ARITH_EQ = 267,$/;"  e   enum:yytokentype
+ARITH_EQ    arith.h 79;"    d
+ARITH_GE    arith.c /^     ARITH_GE = 269,$/;"  e   enum:yytokentype    file:
+ARITH_GE    arith.c 108;"   d   file:
+ARITH_GE    arith.h /^     ARITH_GE = 269,$/;"  e   enum:yytokentype
+ARITH_GE    arith.h 81;"    d
+ARITH_GT    arith.c /^     ARITH_GT = 270,$/;"  e   enum:yytokentype    file:
+ARITH_GT    arith.c 109;"   d   file:
+ARITH_GT    arith.h /^     ARITH_GT = 270,$/;"  e   enum:yytokentype
+ARITH_GT    arith.h 82;"    d
+ARITH_LE    arith.c /^     ARITH_LE = 268,$/;"  e   enum:yytokentype    file:
+ARITH_LE    arith.c 107;"   d   file:
+ARITH_LE    arith.h /^     ARITH_LE = 268,$/;"  e   enum:yytokentype
+ARITH_LE    arith.h 80;"    d
+ARITH_LPAREN    arith.c /^     ARITH_LPAREN = 259,$/;"  e   enum:yytokentype    file:
+ARITH_LPAREN    arith.c 98;"    d   file:
+ARITH_LPAREN    arith.h /^     ARITH_LPAREN = 259,$/;"  e   enum:yytokentype
+ARITH_LPAREN    arith.h 71;"    d
+ARITH_LSHIFT    arith.c /^     ARITH_LSHIFT = 273,$/;"  e   enum:yytokentype    file:
+ARITH_LSHIFT    arith.c 112;"   d   file:
+ARITH_LSHIFT    arith.h /^     ARITH_LSHIFT = 273,$/;"  e   enum:yytokentype
+ARITH_LSHIFT    arith.h 85;"    d
+ARITH_LT    arith.c /^     ARITH_LT = 271,$/;"  e   enum:yytokentype    file:
+ARITH_LT    arith.c 110;"   d   file:
+ARITH_LT    arith.h /^     ARITH_LT = 271,$/;"  e   enum:yytokentype
+ARITH_LT    arith.h 83;"    d
+ARITH_MUL   arith.c /^     ARITH_MUL = 278,$/;" e   enum:yytokentype    file:
+ARITH_MUL   arith.c 117;"   d   file:
+ARITH_MUL   arith.h /^     ARITH_MUL = 278,$/;" e   enum:yytokentype
+ARITH_MUL   arith.h 90;"    d
+ARITH_NE    arith.c /^     ARITH_NE = 266,$/;"  e   enum:yytokentype    file:
+ARITH_NE    arith.c 105;"   d   file:
+ARITH_NE    arith.h /^     ARITH_NE = 266,$/;"  e   enum:yytokentype
+ARITH_NE    arith.h 78;"    d
+ARITH_NOT   arith.c /^     ARITH_NOT = 280,$/;" e   enum:yytokentype    file:
+ARITH_NOT   arith.c 119;"   d   file:
+ARITH_NOT   arith.h /^     ARITH_NOT = 280,$/;" e   enum:yytokentype
+ARITH_NOT   arith.h 92;"    d
+ARITH_NUM   arith.c /^     ARITH_NUM = 258,$/;" e   enum:yytokentype    file:
+ARITH_NUM   arith.c 97;"    d   file:
+ARITH_NUM   arith.h /^     ARITH_NUM = 258,$/;" e   enum:yytokentype
+ARITH_NUM   arith.h 70;"    d
+ARITH_OR    arith.c /^     ARITH_OR = 261,$/;"  e   enum:yytokentype    file:
+ARITH_OR    arith.c 100;"   d   file:
+ARITH_OR    arith.h /^     ARITH_OR = 261,$/;"  e   enum:yytokentype
+ARITH_OR    arith.h 73;"    d
+ARITH_REM   arith.c /^     ARITH_REM = 276,$/;" e   enum:yytokentype    file:
+ARITH_REM   arith.c 115;"   d   file:
+ARITH_REM   arith.h /^     ARITH_REM = 276,$/;" e   enum:yytokentype
+ARITH_REM   arith.h 88;"    d
+ARITH_RPAREN    arith.c /^     ARITH_RPAREN = 260,$/;"  e   enum:yytokentype    file:
+ARITH_RPAREN    arith.c 99;"    d   file:
+ARITH_RPAREN    arith.h /^     ARITH_RPAREN = 260,$/;"  e   enum:yytokentype
+ARITH_RPAREN    arith.h 72;"    d
+ARITH_RSHIFT    arith.c /^     ARITH_RSHIFT = 272,$/;"  e   enum:yytokentype    file:
+ARITH_RSHIFT    arith.c 111;"   d   file:
+ARITH_RSHIFT    arith.h /^     ARITH_RSHIFT = 272,$/;"  e   enum:yytokentype
+ARITH_RSHIFT    arith.h 84;"    d
+ARITH_SUB   arith.c /^     ARITH_SUB = 274,$/;" e   enum:yytokentype    file:
+ARITH_SUB   arith.c 113;"   d   file:
+ARITH_SUB   arith.h /^     ARITH_SUB = 274,$/;" e   enum:yytokentype
+ARITH_SUB   arith.h 86;"    d
+ARITH_UNARYMINUS    arith.c /^     ARITH_UNARYMINUS = 282$/;"   e   enum:yytokentype    file:
+ARITH_UNARYMINUS    arith.c 121;"   d   file:
+ARITH_UNARYMINUS    arith.h /^     ARITH_UNARYMINUS = 282$/;"   e   enum:yytokentype
+ARITH_UNARYMINUS    arith.h 94;"    d
+ARITH_UNARYPLUS arith.c /^     ARITH_UNARYPLUS = 281,$/;"   e   enum:yytokentype    file:
+ARITH_UNARYPLUS arith.c 120;"   d   file:
+ARITH_UNARYPLUS arith.h /^     ARITH_UNARYPLUS = 281,$/;"   e   enum:yytokentype
+ARITH_UNARYPLUS arith.h 93;"    d
+ATABSIZE    alias.c 58;"    d   file:
+BAND    bltin/test.c    /^  BAND,$/;"   e   enum:token  file:
+BBINOP  bltin/test.c    /^  BBINOP,$/;" e   enum:token_types    file:
+BINOP   bltin/test.c    /^  BINOP,$/;"  e   enum:token_types    file:
+BITCMD  setmode.c   /^} BITCMD;$/;" t   file:
+BLOCKSIZE   mkinit.c    90;"    d   file:
+BLOCK_OUT   output.c    81;"    d   file:
+BOR bltin/test.c    /^  BOR,$/;"    e   enum:token  file:
+BSD shell.h 57;"    d
+BUFLEN  mknodes.c   71;"    d   file:
+BUNOP   bltin/test.c    /^  BUNOP,$/;"  e   enum:token_types    file:
+CEOF    jobs.c  70;"    d   file:
+CEOF    output.c    69;"    d   file:
+CHECKEND    parser.c    839;"   d   file:
+CHECKSTRSPACE   memalloc.h  73;"    d
+CLEAR_PENDING_INT   error.h 90;"    d
+CMD2_CLR    setmode.c   80;"    d   file:
+CMD2_GBITS  setmode.c   82;"    d   file:
+CMD2_OBITS  setmode.c   83;"    d   file:
+CMD2_SET    setmode.c   81;"    d   file:
+CMD2_UBITS  setmode.c   84;"    d   file:
+CMDBUILTIN  exec.h  44;"    d
+CMDFUNCTION exec.h  45;"    d
+CMDNORMAL   exec.h  43;"    d
+CMDTABLESIZE    exec.c  87;"    d   file:
+CMDUNKNOWN  exec.h  42;"    d
+CTLARI  parser.h    48;"    d
+CTLBACKQ    parser.h    45;"    d
+CTLENDARI   parser.h    49;"    d
+CTLENDVAR   parser.h    44;"    d
+CTLESC  parser.h    42;"    d
+CTLQUOTE    parser.h    46;"    d
+CTLQUOTEMARK    parser.h    50;"    d
+CTLVAR  parser.h    43;"    d
+Cflag   options.h   62;"    d
+DEFEDITOR   histedit.c  70;"    d   file:
+DEFINE_OPTIONS  options.c   53;"    d   file:
+DEFINE_OPTIONS  options.c   55;"    d   file:
+DEL hetio.c 49;"    d   file:
+DO_ABS  exec.h  58;"    d
+DO_BRUTE    exec.h  60;"    d
+DO_ERR  exec.h  57;"    d
+DO_NOFUN    exec.h  59;"    d
+EMPTY   redir.c 73;"    d   file:
+EOFMARKLEN  parser.c    73;"    d   file:
+EOF_NLEFT   input.c 77;"    d   file:
+EOI bltin/test.c    /^  EOI,$/;"    e   enum:token  file:
+ESC hetio.c 48;"    d   file:
+EV_BACKCMD  eval.c  84;"    d   file:
+EV_EXIT eval.c  82;"    d   file:
+EV_TESTED   eval.c  83;"    d   file:
+EXERROR error.h 71;"    d
+EXEXEC  error.h 73;"    d
+EXINT   error.h 70;"    d
+EXP_CASE    expand.h    59;"    d
+EXP_FULL    expand.h    55;"    d
+EXP_RECORD  expand.h    60;"    d
+EXP_REDIR   expand.h    58;"    d
+EXP_TILDE   expand.h    56;"    d
+EXP_VARTILDE    expand.h    57;"    d
+EXSHELLPROC error.h 72;"    d
+E_CREAT error.h 46;"    d
+E_EXEC  error.h 47;"    d
+E_OPEN  error.h 45;"    d
+Eflag   options.h   61;"    d
+FILBDEV bltin/test.c    /^  FILBDEV,$/;"    e   enum:token  file:
+FILCDEV bltin/test.c    /^  FILCDEV,$/;"    e   enum:token  file:
+FILDIR  bltin/test.c    /^  FILDIR,$/;" e   enum:token  file:
+FILEQ   bltin/test.c    /^  FILEQ,$/;"  e   enum:token  file:
+FILEX   bltin/test.c    /^  FILEX,$/;"  e   enum:token  file:
+FILEXIST    bltin/test.c    /^  FILEXIST,$/;"   e   enum:token  file:
+FILFIFO bltin/test.c    /^  FILFIFO,$/;"    e   enum:token  file:
+FILGID  bltin/test.c    /^  FILGID,$/;" e   enum:token  file:
+FILGZ   bltin/test.c    /^  FILGZ,$/;"  e   enum:token  file:
+FILNT   bltin/test.c    /^  FILNT,$/;"  e   enum:token  file:
+FILOT   bltin/test.c    /^  FILOT,$/;"  e   enum:token  file:
+FILRD   bltin/test.c    /^  FILRD,$/;"  e   enum:token  file:
+FILREG  bltin/test.c    /^  FILREG,$/;" e   enum:token  file:
+FILSGID bltin/test.c    /^  FILSGID,$/;"    e   enum:token  file:
+FILSOCK bltin/test.c    /^  FILSOCK,$/;"    e   enum:token  file:
+FILSTCK bltin/test.c    /^  FILSTCK,$/;"    e   enum:token  file:
+FILSUID bltin/test.c    /^  FILSUID,$/;"    e   enum:token  file:
+FILSYM  bltin/test.c    /^  FILSYM,$/;" e   enum:token  file:
+FILTT   bltin/test.c    /^  FILTT,$/;"  e   enum:token  file:
+FILUID  bltin/test.c    /^  FILUID,$/;" e   enum:token  file:
+FILWR   bltin/test.c    /^  FILWR,$/;"  e   enum:token  file:
+FORCEINTON  error.h 89;"    d
+FORK_BG jobs.h  43;"    d
+FORK_FG jobs.h  42;"    d
+FORK_NOJOB  jobs.h  44;"    d
+GENHEADERS  Makefile    /^GENHEADERS = \\$/;"   m
+GENSRCS Makefile    /^GENSRCS = builtins.c \\$/;"   m
+HAVE_VASPRINTF  output.c    359;"   d   file:
+INITARGS    bltin/bltin.h   67;"    d
+INITARGS    bltin/bltin.h   73;"    d
+INIT_DEPS   Makefile    /^INIT_DEPS = alias.c eval.c exec.c input.c jobs.c options.c parser.c \\$/;"    m
+INTEQ   bltin/test.c    /^  INTEQ,$/;"  e   enum:token  file:
+INTGE   bltin/test.c    /^  INTGE,$/;"  e   enum:token  file:
+INTGT   bltin/test.c    /^  INTGT,$/;"  e   enum:token  file:
+INTLE   bltin/test.c    /^  INTLE,$/;"  e   enum:token  file:
+INTLT   bltin/test.c    /^  INTLT,$/;"  e   enum:token  file:
+INTNE   bltin/test.c    /^  INTNE,$/;"  e   enum:token  file:
+INTOFF  error.h 87;"    d
+INTON   error.h 88;"    d
+Iflag   options.h   53;"    d
+JOBDONE jobs.h  63;"    d
+JOBS    shell.h 55;"    d
+JOBSTOPPED  jobs.h  62;"    d
+LIBC_PREFIX Makefile    /^LIBC_PREFIX = ..\/..\/lib\/libc$/;"   m
+LIBS    Makefile    /^LIBS = $(LIBC_PREFIX)\/libc.a$/;" m
+LPAREN  bltin/test.c    /^  LPAREN,$/;" e   enum:token  file:
+MAXCMDTEXT  jobs.c  1073;"  d   file:
+MAXFIELDS   mknodes.c   70;"    d   file:
+MAXHISTLOOPS    histedit.c  69;"    d   file:
+MAXMBOXES   mail.c  64;"    d   file:
+MAXPWD  cd.c    299;"   d   file:
+MAXTYPES    mknodes.c   69;"    d   file:
+MAX_HISTORY hetio.c 46;"    d   file:
+MEM_OUT output.c    82;"    d   file:
+MINSIZE memalloc.c  118;"   d   file:
+MKINIT  shell.h 72;"    d
+NEOF    parser.h    76;"    d
+NEWARGS exec.c  217;"   d   file:
+NOPTS   options.h   68;"    d
+NSIG    mksignames.c    28;"    d   file:
+NULL    bltin/bltin.h   70;"    d
+NULL    shell.h 63;"    d
+NULL    shell.h 68;"    d
+OBJECTS Makefile    /^OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))$/;" m
+OPERAND bltin/test.c    /^  OPERAND$/;" e   enum:token  file:
+OUTBUFSIZ   output.c    80;"    d   file:
+OUTFILE mkinit.c    78;"    d   file:
+OUTPUT  Makefile    /^OUTPUT =  sh$/;"  m
+OUTPUT_ERR  output.c    83;"    d   file:
+OUTPUT_INCL output.h    109;"   d
+OUTTEMP mkinit.c    79;"    d   file:
+PAREN   bltin/test.c    /^  PAREN$/;"   e   enum:token_types    file:
+PARSEARITH  parser.c    844;"   d   file:
+PARSEBACKQNEW   parser.c    843;"   d   file:
+PARSEBACKQOLD   parser.c    842;"   d   file:
+PARSEREDIR  parser.c    840;"   d   file:
+PARSESUB    parser.c    841;"   d   file:
+PIPESIZE    redir.c 75;"    d   file:
+PIPESIZE    redir.c 77;"    d   file:
+PROFILE main.c  86;"    d   file:
+REDIR_BACKQ redir.h 43;"    d
+REDIR_PUSH  redir.h 42;"    d
+RETURN  parser.c    754;"   d   file:
+RETURN  parser.c    822;"   d   file:
+RPAREN  bltin/test.c    /^  RPAREN,$/;" e   enum:token  file:
+RTLEN   mksignames.c    36;"    d   file:
+RTLIM   mksignames.c    37;"    d   file:
+SET_LEN setmode.c   71;"    d   file:
+SET_LEN_INCR    setmode.c   72;"    d   file:
+SHSRCS  Makefile    /^SHSRCS =  alias.c \\$/;"  m
+SIGSSIZE    main.c  217;"   d   file:
+SKIPBREAK   eval.h  72;"    d
+SKIPCONT    eval.h  73;"    d
+SKIPFILE    eval.h  75;"    d
+SKIPFUNC    eval.h  74;"    d
+SOFTINT_PREFIX  Makefile    /^SOFTINT_PREFIX = ..\/..\/lib\/softint$/;" m
+SOURCES Makefile    /^SOURCES = ${SHSRCS} ${GENSRCS}$/;"    m
+STACKSTRNUL memalloc.h  75;"    d
+STADJUST    memalloc.h  78;"    d
+STANDARD_BITS   setmode.c   186;"   d   file:
+STARTSTACKSTR   memalloc.h  71;"    d
+STATIC  shell.h 71;"    d
+STPUTC  memalloc.h  72;"    d
+STREQ   bltin/test.c    /^  STREQ,$/;"  e   enum:token  file:
+STREZ   bltin/test.c    /^  STREZ,$/;"  e   enum:token  file:
+STRGT   bltin/test.c    /^  STRGT,$/;"  e   enum:token  file:
+STRLT   bltin/test.c    /^  STRLT,$/;"  e   enum:token  file:
+STRNE   bltin/test.c    /^  STRNE,$/;"  e   enum:token  file:
+STRNZ   bltin/test.c    /^  STRNZ,$/;"  e   enum:token  file:
+STTOPC  memalloc.h  77;"    d
+STUNPUTC    memalloc.h  76;"    d
+S_CATCH trap.c  78;"    d   file:
+S_DFL   trap.c  77;"    d   file:
+S_HARD_IGN  trap.c  80;"    d   file:
+S_IGN   trap.c  79;"    d   file:
+S_ISTXT setmode.c   68;"    d   file:
+S_RESET trap.c  81;"    d   file:
+TEMPSIZE    output.c    354;"   d   file:
+TRACE   shell.h 80;"    d
+TRACE   shell.h 82;"    d
+T_INT   mknodes.c   77;"    d   file:
+T_NODE  mknodes.c   74;"    d   file:
+T_NODELIST  mknodes.c   75;"    d   file:
+T_OTHER mknodes.c   78;"    d   file:
+T_STRING    mknodes.c   76;"    d   file:
+T_TEMP  mknodes.c   79;"    d   file:
+UNOP    bltin/test.c    /^  UNOP,$/;"   e   enum:token_types    file:
+UNOT    bltin/test.c    /^  UNOT,$/;"   e   enum:token  file:
+USTPUTC memalloc.h  74;"    d
+VEXPORT var.h   46;"    d
+VNOFUNC var.h   52;"    d
+VREADONLY   var.h   47;"    d
+VSASSIGN    parser.h    62;"    d
+VSLENGTH    parser.h    67;"    d
+VSMINUS parser.h    59;"    d
+VSNORMAL    parser.h    58;"    d
+VSNUL   parser.h    54;"    d
+VSPLUS  parser.h    60;"    d
+VSQUESTION  parser.h    61;"    d
+VSQUOTE parser.h    55;"    d
+VSTACK  var.h   50;"    d
+VSTRFIXED   var.h   48;"    d
+VSTRIMLEFT  parser.h    63;"    d
+VSTRIMLEFTMAX   parser.h    64;"    d
+VSTRIMRIGHT parser.h    65;"    d
+VSTRIMRIGHTMAX  parser.h    66;"    d
+VSTYPE  parser.h    53;"    d
+VTABSIZE    var.c   75;"    d   file:
+VTEXTFIXED  var.h   49;"    d
+VUNSET  var.h   51;"    d
+Vflag   options.h   60;"    d
+YYABORT arith.c 744;"   d   file:
+YYACCEPT    arith.c 743;"   d   file:
+YYBACKUP    arith.c 756;"   d   file:
+YYBISON arith.c 47;"    d   file:
+YYBISON_VERSION arith.c 50;"    d   file:
+YYCOPY  arith.c 477;"   d   file:
+YYCOPY  arith.c 480;"   d   file:
+YYDEBUG arith.c 268;"   d   file:
+YYDPRINTF   arith.c 836;"   d   file:
+YYDPRINTF   arith.c 982;"   d   file:
+YYEMPTY arith.c 740;"   d   file:
+YYEOF   arith.c 741;"   d   file:
+YYERRCODE   arith.c 775;"   d   file:
+YYERROR arith.c 745;"   d   file:
+YYERROR_VERBOSE arith.c 273;"   d   file:
+YYERROR_VERBOSE arith.c 274;"   d   file:
+YYERROR_VERBOSE arith.c 276;"   d   file:
+YYFAIL  arith.c 752;"   d   file:
+YYFINAL arith.c 510;"   d   file:
+YYFPRINTF   arith.c 833;"   d   file:
+YYFREE  arith.c 443;"   d   file:
+YYID    arith.c /^YYID (i)$/;"  f   file:
+YYID    arith.c 367;"   d   file:
+YYINITDEPTH arith.c 991;"   d   file:
+YYLAST  arith.c 512;"   d   file:
+YYLEX   arith.c 823;"   d   file:
+YYLEX   arith.c 825;"   d   file:
+YYLLOC_DEFAULT  arith.c 784;"   d   file:
+YYLSP_NEEDED    arith.c 59;"    d   file:
+YYMALLOC    arith.c 436;"   d   file:
+YYMAXDEPTH  arith.c 1002;"  d   file:
+YYMAXUTOK   arith.c 525;"   d   file:
+YYNNTS  arith.c 517;"   d   file:
+YYNRULES    arith.c 519;"   d   file:
+YYNSTATES   arith.c 521;"   d   file:
+YYNTOKENS   arith.c 515;"   d   file:
+YYPACT_NINF arith.c 660;"   d   file:
+YYPOPSTACK  arith.c 1340;"  d   file:
+YYPURE  arith.c 56;"    d   file:
+YYRECOVERING    arith.c 754;"   d   file:
+YYRHSLOC    arith.c 782;"   d   file:
+YYSIZE_MAXIMUM  arith.c 344;"   d   file:
+YYSIZE_T    arith.c 332;"   d   file:
+YYSIZE_T    arith.c 334;"   d   file:
+YYSIZE_T    arith.c 338;"   d   file:
+YYSIZE_T    arith.c 340;"   d   file:
+YYSKELETON_NAME arith.c 53;"    d   file:
+YYSTACK_ALLOC   arith.c 390;"   d   file:
+YYSTACK_ALLOC   arith.c 394;"   d   file:
+YYSTACK_ALLOC   arith.c 399;"   d   file:
+YYSTACK_ALLOC   arith.c 422;"   d   file:
+YYSTACK_ALLOC_MAXIMUM   arith.c 419;"   d   file:
+YYSTACK_ALLOC_MAXIMUM   arith.c 425;"   d   file:
+YYSTACK_BYTES   arith.c 469;"   d   file:
+YYSTACK_FREE    arith.c 413;"   d   file:
+YYSTACK_FREE    arith.c 423;"   d   file:
+YYSTACK_GAP_MAXIMUM arith.c 465;"   d   file:
+YYSTACK_RELOCATE    arith.c 1428;"  d   file:
+YYSTACK_RELOCATE    arith.c 496;"   d   file:
+YYSTYPE arith.c /^typedef int YYSTYPE;$/;"  t   file:
+YYSTYPE arith.h /^typedef int YYSTYPE;$/;"  t
+YYSTYPE_IS_DECLARED arith.c 287;"   d   file:
+YYSTYPE_IS_DECLARED arith.h 102;"   d
+YYSTYPE_IS_TRIVIAL  arith.c 288;"   d   file:
+YYSTYPE_IS_TRIVIAL  arith.h 103;"   d
+YYTABLE_NINF    arith.c 681;"   d   file:
+YYTERROR    arith.c 774;"   d   file:
+YYTOKENTYPE arith.c 65;"    d   file:
+YYTOKENTYPE arith.h 38;"    d
+YYTOKEN_TABLE   arith.c 281;"   d   file:
+YYTRANSLATE arith.c 527;"   d   file:
+YYUNDEFTOK  arith.c 524;"   d   file:
+YYUSE   arith.c 360;"   d   file:
+YYUSE   arith.c 362;"   d   file:
+YY_ arith.c 350;"   d   file:
+YY_ arith.c 354;"   d   file:
+YY_LOCATION_PRINT   arith.c 810;"   d   file:
+YY_LOCATION_PRINT   arith.c 815;"   d   file:
+YY_REDUCE_PRINT arith.c 972;"   d   file:
+YY_REDUCE_PRINT arith.c 985;"   d   file:
+YY_STACK_PRINT  arith.c 934;"   d   file:
+YY_STACK_PRINT  arith.c 984;"   d   file:
+YY_SYMBOL_PRINT arith.c 842;"   d   file:
+YY_SYMBOL_PRINT arith.c 983;"   d   file:
+_STDLIB_H   arith.c 404;"   d   file:
+_STDLIB_H   arith.c 432;"   d   file:
+_rmescapes  expand.c    /^_rmescapes(str, flag)$/;" f
+action  error.c /^  short action;       \/* operation which encountered the error *\/$/;"   m   struct:errname  file:
+add mksyntax.c  /^add(p, type)$/;"  f   file:
+addchar mkinit.c    /^addchar(c, text)$/;"  f
+addcmd  setmode.c   /^addcmd(set, op, who, oparg, mask)$/;" f   file:
+addcmdentry exec.c  /^addcmdentry(name, entry)$/;"  f
+addfname    expand.c    /^addfname(name)$/;"    f
+addglob expand.c    /^addglob(pglob)$/;"    f
+addstr  mkinit.c    /^addstr(s, text)$/;"   f
+aexpr   bltin/test.c    /^aexpr(n)$/;"  f   file:
+aflag   options.h   63;"    d
+alias   alias.h /^struct alias {$/;"    s
+aliascmd    alias.c /^aliascmd(argc, argv)$/;"  f
+align   machdep.h   /^union align {$/;" u
+alloca  arith.c 397;"   d   file:
+amiddecls   mkinit.c    /^int amiddecls;                \/* for formatting *\/$/;"  v
+andor   parser.c    /^andor() {$/;" f
+ap  input.c /^  struct alias *ap;   \/* if push was associated with an alias *\/$/;"    m   struct:strpush  file:
+arg0    options.c   /^char *arg0;           \/* value of $0 *\/$/;" v
+argbackq    expand.c    /^struct nodelist *argbackq;    \/* list of back quote expressions *\/$/;"  v
+arglist expand.h    /^struct arglist {$/;"  s
+argptr  options.c   /^char **argptr;            \/* argument list for builtin commands *\/$/;"  v
+argstr  expand.c    /^argstr(p, flag)$/;"   f
+arith   arith.c /^arith(s)$/;"  f
+arith_buf   arith.c /^const char *arith_buf, *arith_startbuf;$/;"   v
+arith_startbuf  arith.c /^const char *arith_buf, *arith_startbuf;$/;"   v
+atab    alias.c /^struct alias *atab[ATABSIZE];$/;" v
+attyset var.h   110;"   d
+backcmd eval.h  /^struct backcmd {      \/* result of evalbackcmd *\/$/;"   s
+backgndpid  jobs.c  /^MKINIT short backgndpid = -1; \/* pid of last background process *\/$/;"  v
+backquotelist   parser.c    /^struct nodelist *backquotelist;$/;"   v
+base    mksyntax.c  /^static int base;$/;"  v   file:
+basebuf input.c /^char basebuf[BUFSIZ];     \/* buffer for top level input file *\/$/;" v
+basepf  input.c /^MKINIT struct parsefile basepf;   \/* top level input file *\/$/;"    v
+basestrpush input.c /^  struct strpush basestrpush; \/* so pushing one is fast *\/$/;"  m   struct:parsefile    file:
+bash_group_member   bltin/test.c    /^bash_group_member (gid)$/;"   f   file:
+begoff  expand.c    /^  int begoff;     \/* offset of start of region *\/$/;"   m   struct:ifsregion    file:
+bflag   options.h   64;"    d
+bgcmd   jobs.c  /^bgcmd(argc, argv)$/;" f
+binop   bltin/test.c    /^binop()$/;"   f   file:
+bitcmd  setmode.c   /^typedef struct bitcmd {$/;"   s   file:
+bits    setmode.c   /^  mode_t  bits;$/;"   m   struct:bitcmd   file:
+block   mkinit.c    /^struct block {$/;"    s   file:
+bltincmd    eval.c  /^bltincmd(argc, argv)$/;"  f
+bltinlookup var.c   /^bltinlookup(name, doall)$/;"  f
+breakcmd    eval.c  /^breakcmd(argc, argv)$/;"  f
+buf eval.h  /^  char *buf;      \/* buffer *\/$/;"  m   struct:backcmd
+buf input.c /^  char *buf;      \/* input buffer *\/$/;"    m   struct:parsefile    file:
+buf output.h    /^  char *buf;$/;"  m   struct:output
+bufsize output.h    /^  int bufsize;$/;"    m   struct:output
+builtinloc  exec.c  /^STATIC int builtinloc = -1;       \/* index in path of %builtin, or -1 *\/$/;"    v
+casematch   expand.c    /^casematch(pattern, val)$/;"   f
+cdcmd   cd.c    /^cdcmd(argc, argv)$/;" f
+cdcomppath  cd.c    /^STATIC char *cdcomppath;$/;"  v
+cfile   mksyntax.c  /^static FILE *cfile;$/;"   v   file:
+changed jobs.h  /^  char changed;       \/* true if status has changed *\/$/;"  m   struct:job
+changepath  exec.c  /^changepath(newval)$/;"    f
+checkkwd    parser.c    /^MKINIT int checkkwd;            \/* 1 == check for kwds, 2 == also eat newlines *\/$/;"   v
+chkmail mail.c  /^chkmail(silent)$/;"   f
+ckfopen mkinit.c    /^ckfopen(file, mode)$/;"   f
+ckfree  memalloc.h  81;"    d
+ckmalloc    memalloc.c  /^ckmalloc(nbytes)$/;"  f
+ckmalloc    mkinit.c    /^ckmalloc(nbytes)$/;"  f
+ckrealloc   memalloc.c  /^ckrealloc(p, nbytes)$/;"  f
+clear_traps trap.c  /^clear_traps() {$/;"   f
+clearcmdentry   exec.c  /^clearcmdentry(firstchange)$/;"    f
+clearredir  redir.c /^clearredir() {$/;"    f
+closememout output.c    /^closememout() {$/;"   f
+closescript input.c /^closescript() {$/;"   f
+cmd jobs.h  /^  char *cmd;      \/* text of command being run *\/$/;"   m   struct:procstat
+cmd miscbltin.c /^  int cmd;$/;"    m   struct:limits   file:
+cmd setmode.c   /^  char    cmd;$/;"    m   struct:bitcmd   file:
+cmd2    setmode.c   /^  char    cmd2;$/;"   m   struct:bitcmd   file:
+cmdentry    exec.h  /^struct cmdentry {$/;" s
+cmdenviron  eval.c  /^struct strlist *cmdenviron;$/;"   v
+cmdlookup   exec.c  /^cmdlookup(name, add)$/;"  f
+cmdloop main.c  /^cmdloop(top)$/;"  f
+cmdname exec.c  /^  char cmdname[ARB];  \/* name of command *\/$/;" m   struct:tblentry file:
+cmdnextc    jobs.c  /^STATIC char *cmdnextc;$/;"    v
+cmdnleft    jobs.c  /^STATIC int cmdnleft;$/;"  v
+cmdputs jobs.c  /^cmdputs(s)$/;"    f
+cmdtable    exec.c  /^STATIC struct tblentry *cmdtable[CMDTABLESIZE];$/;"   v
+cmdtxt  jobs.c  /^cmdtxt(n)$/;" f
+cmdtype exec.c  /^  short cmdtype;      \/* index identifying command *\/$/;"   m   struct:tblentry file:
+cmdtype exec.h  /^  int cmdtype;$/;"    m   struct:cmdentry
+code    mkinit.c    /^  struct text code;   \/* code for handling event *\/$/;" m   struct:event    file:
+command parser.c    /^command() {$/;"   f
+commandcmd  exec.c  /^commandcmd(argc, argv)$/;"    f
+commandname error.c /^char *commandname;$/;"    v
+commandname eval.c  /^char *commandname;$/;"    v
+commandtext jobs.c  /^commandtext(n)$/;"    f
+comment mkinit.c    /^  char *comment;      \/* comment describing routine *\/$/;"  m   struct:event    file:
+comment mksyntax.c  /^  char *comment;$/;"  m   struct:synclass file:
+compress_mode   setmode.c   /^compress_mode(set)$/;"    f   file:
+copyfd  redir.c /^copyfd(from, to)$/;"  f
+copyright   mkinit.c    /^static const char copyright[] =$/;"   v   file:
+copyright   mknodes.c   /^static const char copyright[] =$/;"   v   file:
+copyright   mksyntax.c  /^static const char copyright[] =$/;"   v   file:
+cp  machdep.h   /^  char *cp;$/;"   m   union:align
+curcmd  main.c  /^STATIC union node *curcmd;$/;"    v
+curdir  cd.c    /^char *curdir = NULL;      \/* current working directory *\/$/;"   v
+curfile mkinit.c    /^char *curfile;                \/* current file *\/$/;"    v
+curjob  jobs.c  /^short curjob;         \/* current job *\/$/;" v
+curstr  mknodes.c   /^static struct str *curstr;        \/* current structure *\/$/;"   v   file:
+cvtnum  expand.c    /^cvtnum(num, buf)$/;"  f
+debug   show.c  /^int debug = 0;$/;"    v
+debug   show.c  /^int debug = 1;$/;"    v
+decl    mknodes.c   /^  char *decl;     \/* declaration of field *\/$/;"    m   struct:field    file:
+decls   mkinit.c    /^struct text decls;            \/* declarations *\/$/;"    v
+decode_signal   trap.c  /^int decode_signal(const char *string)$/;" f
+defines mkinit.c    /^struct text defines;          \/* #define statements *\/$/;"  v
+defun   exec.c  /^defun(name, func)$/;" f
+delete_cmd_entry    exec.c  /^delete_cmd_entry() {$/;"  f
+deletefuncs exec.c  /^deletefuncs() {$/;"   f
+describe_command    exec.c  /^describe_command(command, verbose)$/;"    f
+digit   output.c    /^static const char digit[] = "0123456789ABCDEF";$/;"   v   file:
+digit_contig    mksyntax.c  /^static int digit_contig;\/* true if digits are contiguous *\/$/;" v   file:
+digit_convert   mksyntax.c  /^digit_convert()$/;"   f   file:
+displayhist histedit.c  /^int displayhist;$/;"  v
+docd    cd.c    /^docd(dest, print)$/;" f
+dodecl  mkinit.c    /^dodecl(line1, fp)$/;" f
+doevent mkinit.c    /^doevent(ep, fp, fname)$/;"    f
+doformat    output.c    /^doformat(dest, f, ap)$/;" f
+doformat    output.h    100;"   d
+doinclude   mkinit.c    /^doinclude(line)$/;"   f
+done    mknodes.c   /^  int done;           \/* set if fully parsed *\/$/;" m   struct:str  file:
+doprompt    parser.c    /^int doprompt;         \/* if set, prompt the user *\/$/;" v
+dotcmd  main.c  /^dotcmd(argc, argv)$/;"    f
+dotrap  trap.c  /^dotrap() {$/;"    f
+dowait  jobs.c  /^dowait(block, job)$/;"    f
+dprintf output.c    /^dprintf(const char *fmt, ...)$/;" f
+dumpmode    setmode.c   /^dumpmode(set)$/;" f   file:
+dupredirect redir.c /^dupredirect(redir, f, memory)$/;" f
+editing histedit.c  87;"    d   file:
+eflag   options.h   51;"    d
+el  histedit.c  /^EditLine *el; \/* editline cookie *\/$/;" v
+el  input.c /^EditLine *el;         \/* cookie for editline package *\/$/;" v
+el_in   histedit.c  /^static FILE *el_in, *el_out;$/;"  v   file:
+el_out  histedit.c  /^static FILE *el_in, *el_out;$/;"  v   file:
+emptyoutbuf output.c    /^emptyoutbuf(dest)$/;" f
+endoff  expand.c    /^  int endoff;     \/* offset of end of region *\/$/;" m   struct:ifsregion    file:
+environment var.c   /^environment() {$/;"   f
+eofmark parser.c    /^  char *eofmark;      \/* string indicating end of input *\/$/;"  m   struct:heredoc  file:
+equal   mkinit.c    172;"   d   file:
+equal   mystring.h  48;"    d
+equalf  bltin/test.c    /^equalf (f1, f2)$/;"   f   file:
+errcode error.c /^  short errcode;      \/* error number *\/$/;"    m   struct:errname  file:
+errmsg  error.c /^errmsg(e, action)$/;" f
+errname error.c /^struct errname {$/;"  s   file:
+error   arith.c /^error(s)$/;"  f
+error   bltin/test.c    /^error(const char *msg, ...)$/;"   f   file:
+error   error.c /^error(const char *msg, ...)$/;"   f
+error   mkinit.c    /^error(msg)$/;"    f
+error   mknodes.c   /^error(const char *msg, ...)$/;"   f   file:
+errormsg    error.c /^STATIC const struct errname errormsg[] = {$/;"    v
+errout  output.c    /^struct output errout = {NULL, 0, NULL, 100, 2, 0};$/;"    v
+errout  output.c    /^struct output errout = {NULL, NULL, 0, NULL, 0, 2, 0};$/;"    v
+evalbackcmd eval.c  /^evalbackcmd(n, result)$/;"    f
+evalcase    eval.c  /^evalcase(n, flags)$/;"    f
+evalcmd eval.c  /^evalcmd(argc, argv)$/;"   f
+evalcommand eval.c  /^evalcommand(cmd, flags, backcmd)$/;"  f
+evalfor eval.c  /^evalfor(n, flags)$/;" f
+evalloop    eval.c  /^evalloop(n, flags)$/;"    f
+evalpipe    eval.c  /^evalpipe(n)$/;"   f
+evalskip    eval.c  /^MKINIT int evalskip;      \/* set if we are skipping commands *\/$/;" v
+evalstring  eval.c  /^evalstring(s, flag)$/;"   f
+evalsubshell    eval.c  /^evalsubshell(n, flags)$/;"    f
+evaltree    eval.c  /^evaltree(n, flags)$/;"    f
+evalvar expand.c    /^evalvar(p, flag)$/;"  f
+event   mkinit.c    /^struct event event[] = {$/;"  v
+event   mkinit.c    /^struct event {$/;"    s   file:
+exception   error.c /^int exception;$/;"    v
+execcmd eval.c  /^execcmd(argc, argv)$/;"   f
+execinterp  exec.c  /^execinterp(argv, envp)$/;"    f
+exerrno exec.c  /^int exerrno = 0;          \/* Last exec error *\/$/;" v
+exerror error.c /^exerror(int cond, const char *msg, ...)$/;"   f
+exitcmd main.c  /^exitcmd(argc, argv)$/;"   f
+exitshell   trap.c  /^exitshell(status)$/;" f
+exitstatus  eval.c  /^int exitstatus;           \/* exit status of last command *\/$/;" v
+exp arith.y /^exp:  expr {$/;"  l
+expandarg   expand.c    /^expandarg(arg, arglist, flag)$/;" f
+expandhere  expand.c    /^expandhere(arg, fd)$/;"   f
+expandmeta  expand.c    /^expandmeta(str, flag)$/;" f
+exparg  expand.c    /^struct arglist exparg;        \/* holds expanded arg list *\/$/;" v
+expari  expand.c    /^expari(flag)$/;"  f
+expbackq    expand.c    /^expbackq(cmd, quoted, flag)$/;"   f
+expcmd  arith.c /^expcmd(argc, argv)$/;"    f
+expdest expand.c    /^char *expdest;            \/* output of current string *\/$/;"    v
+expdir  expand.c    /^char *expdir;$/;" v
+expmeta expand.c    /^expmeta(enddir, name)$/;" f
+exportcmd   var.c   /^exportcmd(argc, argv)$/;" f
+expr    arith.y /^expr: ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; }$/;" l
+expredir    eval.c  /^expredir(n)$/;"   f
+expsort expand.c    /^expsort(str)$/;"  f
+exptilde    expand.c    /^exptilde(p, flag)$/;" f
+exraise error.c /^exraise(e)$/;"    f
+exverror    error.c /^exverror(cond, msg, ap)$/;"   f   file:
+factor  miscbltin.c /^  int factor; \/* multiply by to get rlim_{cur,max} values *\/$/;"    m   struct:limits   file:
+falsecmd    eval.c  /^falsecmd(argc, argv)$/;"  f
+fc_replace  histedit.c  /^fc_replace(s, p, r)$/;"   f
+fd  eval.h  /^  int fd;         \/* file descriptor to read from *\/$/;"    m   struct:backcmd
+fd  input.c /^  int fd;         \/* file descriptor (or -1 if string) *\/$/;"   m   struct:parsefile    file:
+fd  output.h    /^  int fd;$/;" m   struct:output
+fd0_redirected  redir.c /^int fd0_redirected = 0;$/;"   v
+fd0_redirected_p    redir.c /^fd0_redirected_p () {$/;" f
+fd2 redir.c /^int fd2 = 2;$/;"  v
+fflag   options.h   52;"    d
+fflush  bltin/bltin.h   60;"    d
+fgcmd   jobs.c  /^fgcmd(argc, argv)$/;" f
+field   mknodes.c   /^  struct field field[MAXFIELDS];  \/* the fields of the structure *\/$/;" m   struct:str  file:
+field   mknodes.c   /^struct field {            \/* a structure field *\/$/;"   s   file:
+filltable   mksyntax.c  /^filltable(dftval)$/;" f   file:
+filstat bltin/test.c    /^filstat(nm, mode)$/;" f   file:
+find_builtin    exec.c  /^find_builtin(name)$/;"    f
+find_command    exec.c  /^find_command(name, entry, act, path)$/;"  f
+find_dot_file   main.c  /^find_dot_file(basename)$/;"   f
+fixredir    parser.c    /^void fixredir(union node *n, const char *text, int err)$/;"   f
+flag    alias.h /^  int flag;$/;"   m   struct:alias
+flags   output.h    /^  short flags;$/;"    m   struct:output
+flags   var.c   /^  int flags;$/;"  m   struct:varinit  file:
+flags   var.h   /^  int flags;          \/* flags are defined above *\/$/;" m   struct:var
+flags   var.h   /^  int flags;          \/* saved flags *\/$/;" m   struct:localvar
+flushall    output.c    /^flushall() {$/;"  f
+flushout    output.c    /^flushout(dest)$/;"    f
+flushout    output.h    99;"    d
+fmtstr  output.c    /^fmtstr(char *outbuf, size_t length, const char *fmt, ...)$/;" f
+forkshell   jobs.c  /^forkshell(jp, n, mode)$/;"    f
+fprintf bltin/bltin.h   58;"    d
+fputs   bltin/bltin.h   59;"    d
+freejob jobs.c  /^freejob(jp)$/;"   f
+freeparam   options.c   /^freeparam(param)$/;"  f
+freestdout  output.c    /^freestdout() {$/;"    f
+func    exec.h  /^      union node *func;$/;"   m   union:cmdentry::param
+func    var.c   /^  void (*func) __P((const char *));$/;"   m   struct:varinit  file:
+func    var.h   /^  void (*func) __P((const char *));$/;"   m   struct:var
+funcnest    eval.c  /^int funcnest;         \/* depth of function calls *\/$/;" v
+get_standard_path   eval.c  /^get_standard_path()$/;"   f
+getcmdentry exec.c  /^getcmdentry(name, entry)$/;"  f
+getcomponent    cd.c    /^getcomponent() {$/;"  f
+getjob  jobs.c  /^getjob(name)$/;"  f
+getmode setmode.c   /^getmode(bbox, omode)$/;"  f
+getn    bltin/test.c    /^getn(s)$/;"   f   file:
+getopts options.c   /^getopts(optstr, optvar, optfirst, optind, optoff)$/;" f
+getoptscmd  options.c   /^getoptscmd(argc, argv)$/;"    f
+getoptsreset    options.c   /^getoptsreset(value)$/;"   f
+getprompt   parser.c    /^getprompt(void *unused)$/;"   f
+getpwd  cd.c    /^getpwd()$/;"  f
+gooddefine  mkinit.c    /^gooddefine(line)$/;"  f
+goodname    parser.c    /^goodname(char *name)$/;"  f
+gotsig  trap.c  /^char gotsig[NSIG];        \/* indicates specified signal received *\/$/;" v
+gotsigchild jobs.c  /^STATIC int gotsigchild;$/;"   v
+grabstackblock  memalloc.c  /^grabstackblock(len)$/;"   f
+grabstackstr    memalloc.h  79;"    d
+group_array bltin/test.c    /^static gid_t *group_array = NULL;$/;" v   file:
+growstackblock  memalloc.c  /^growstackblock() {$/;"    f
+growstackstr    memalloc.c  /^growstackstr() {$/;"  f
+handler error.c /^struct jmploc *handler;$/;"   v
+hashalias   alias.c /^hashalias(p)$/;"  f
+hashcd  exec.c  /^hashcd() {$/;"    f
+hashcmd exec.c  /^hashcmd(argc, argv)$/;"   f
+hashvar var.c   /^hashvar(p)$/;"    f
+header_files    mkinit.c    /^char *header_files[200];      \/* list of header files *\/$/;"    v
+here    parser.c    /^  union node *here;       \/* redirection node *\/$/;"    m   struct:heredoc  file:
+heredoc parser.c    /^struct heredoc *heredoc;$/;"  v
+heredoc parser.c    /^struct heredoc {$/;"  s   file:
+heredoclist parser.c    /^struct heredoc *heredoclist;  \/* list of here documents to read *\/$/;"  v
+herefd  memalloc.c  /^int herefd = -1;$/;"  v
+hetio_init  hetio.c /^void hetio_init(void)$/;" f
+hetio_inter hetio.c /^int hetio_inter = 0;$/;"  v
+hetio_read_input    hetio.c /^int hetio_read_input(int fd)$/;"  f
+hetio_reset_term    hetio.c /^void hetio_reset_term(void)$/;"   f
+hfile   mksyntax.c  /^static FILE *hfile;$/;"   v   file:
+his_end hetio.c /^static struct history *his_end = NULL;        \/* Last element in command line list *\/$/;"   v   file:
+his_front   hetio.c /^static struct history *his_front = NULL;  \/* First element in command line list *\/$/;"  v   file:
+hist    histedit.c  /^History *hist;    \/* history cookie *\/$/;"  v
+histcmd histedit.c  /^histcmd(argc, argv)$/;"   f
+histedit    histedit.c  /^histedit()$/;"    f
+history hetio.c /^struct history$/;"    s   file:
+history_counter hetio.c /^static int history_counter = 0;           \/* Number of commands in history list *\/$/;"  v   file:
+histsizeval var.h   105;"   d
+i   machdep.h   /^  int i;$/;"  m   union:align
+iflag   options.h   54;"    d
+ifsbreakup  expand.c    /^ifsbreakup(string, arglist)$/;"   f
+ifsfirst    expand.c    /^struct ifsregion ifsfirst;    \/* first struct in list of ifs regions *\/$/;" v
+ifsfree expand.c    /^ifsfree()$/;" f
+ifslastp    expand.c    /^struct ifsregion *ifslastp;   \/* last struct in list *\/$/;" v
+ifsregion   expand.c    /^struct ifsregion {$/;"    s   file:
+ifsset  var.h   97;"    d
+ifsval  var.h   96;"    d
+ignoresig   trap.c  /^ignoresig(signo)$/;"  f
+in_function eval.h  67;"    d
+indent  mknodes.c   /^indent(amount, fp)$/;"    f   file:
+indent  show.c  /^indent(amount, pfx, fp)$/;"   f   file:
+index   exec.h  /^      int index;$/;"  m   union:cmdentry::param
+infp    mknodes.c   /^static FILE *infp;$/;"    v   file:
+init    mkinit.c    /^char init[] = "\\$/;" v
+init    mksyntax.c  /^init()$/;"    f   file:
+init_editline   input.c /^int init_editline = 0;        \/* editline library initialized? *\/$/;"   v
+initialize_group_array  bltin/test.c    /^initialize_group_array ()$/;" f   file:
+initialize_signames mksignames.c    /^initialize_signames ()$/;"    f
+initialpgrp jobs.c  /^int initialpgrp;      \/* pgrp of shell on invocation *\/$/;" v
+initstreams output.c    /^void initstreams() {$/;"  f
+initvar var.c   /^initvar() {$/;"   f
+input_backspace hetio.c /^input_backspace(int *cursor, int *len)$/;"    f
+input_delete    hetio.c /^void input_delete(int cursor)$/;" f
+input_end   hetio.c /^void input_end(int *cursor, int len)$/;"  f
+input_home  hetio.c /^void input_home(int *cursor)              \/* Command line input routines *\/$/;" f
+int_pending error.h 91;"    d
+intpending  error.c /^volatile int intpending;$/;"  v
+intreceived jobs.c  /^STATIC int intreceived;$/;"   v
+is_assignment_builtin   eval.c  /^is_assignment_builtin (command)$/;"   f
+is_entry    mksyntax.c  /^struct synclass is_entry[] = {$/;"    v
+is_number   mystring.c  /^is_number(p)$/;"  f
+is_regular_builtin  exec.c  /^is_regular_builtin(name)$/;"  f
+is_special_builtin  eval.c  /^is_special_builtin(name)$/;"  f
+isoperand   bltin/test.c    /^isoperand()$/;"   f   file:
+jmploc  error.h /^struct jmploc {$/;"   s
+job jobs.h  /^struct job {$/;"  s
+job_warning jobs.c  /^int job_warning = 0;$/;"  v
+jobctl  jobs.c  /^MKINIT int jobctl;$/;"    v
+jobctl  jobs.h  /^  char jobctl;        \/* job running under job control *\/$/;"   m   struct:job
+jobidcmd    jobs.c  /^jobidcmd(argc, argv)$/;"  f
+jobscmd jobs.c  /^jobscmd(argc, argv)$/;"   f
+jobtab  jobs.c  /^struct job *jobtab;       \/* array of jobs *\/$/;"   v
+jp  eval.h  /^  struct job *jp;     \/* job structure for command *\/$/;"   m   struct:backcmd
+killcmd jobs.c  /^killcmd(argc, argv)$/;"   f
+last    mkinit.c    /^  struct block *last;$/;" m   struct:text file:
+lastcmdentry    exec.c  /^struct tblentry **lastcmdentry;$/;"   v
+lastp   expand.h    /^  struct strlist **lastp;$/;" m   struct:arglist
+lasttoken   parser.c    /^int lasttoken;            \/* last token read *\/$/;" v
+letter  options.h   /^  const char letter;$/;"  m   struct:optent
+limits  miscbltin.c /^static const struct limits limits[] = {$/;"   v   file:
+limits  miscbltin.c /^struct limits {$/;"   s   file:
+line    mknodes.c   /^static char line[1024];$/;"   v   file:
+linep   mknodes.c   /^static char *linep;$/;"   v   file:
+linno   input.c /^  int linno;      \/* current line *\/$/;"    m   struct:parsefile    file:
+linno   mkinit.c    /^int linno;                \/* current line *\/$/;"    v
+linno   mknodes.c   /^static int linno;$/;" v   file:
+list    expand.h    /^  struct strlist *list;$/;"   m   struct:arglist
+list    parser.c    /^list(nlflag)$/;"  f
+listsetvar  var.c   /^listsetvar(list)$/;"  f
+lleft   input.c /^  int lleft;      \/* number of chars left in this buffer *\/$/;" m   struct:parsefile    file:
+loc error.h /^  jmp_buf loc;$/;"    m   struct:jmploc
+localcmd    var.c   /^localcmd(argc, argv)$/;"  f
+localvar    var.h   /^struct localvar {$/;" s
+localvars   var.h   /^struct localvar *localvars;$/;"   v
+longjmp error.h 107;"   d
+lookupalias alias.c /^lookupalias(name, check)$/;"  f
+lookupvar   var.c   /^lookupvar(name)$/;"   f
+loopnest    eval.c  /^MKINIT int loopnest;      \/* current loop nesting level *\/$/;"  v
+macro   mksyntax.c  /^static char *macro[] = {$/;"  v   file:
+mailtime    mail.c  /^STATIC time_t mailtime[MAXMBOXES];    \/* times of mailboxes *\/$/;"  v
+mailval var.h   98;"    d
+main    arith.c /^main(argc, argv)$/;"  f
+main    bltin/bltin.h   72;"    d
+main    bltin/echo.c    /^main(argc, argv)  char **argv; {$/;"  f
+main    bltin/echo.c    45;"    d   file:
+main    bltin/times.c   /^int main() {$/;"  f
+main    bltin/times.c   12;"    d   file:
+main    main.c  /^main(argc, argv)$/;"  f
+main    mkinit.c    /^main(argc, argv)$/;"  f
+main    mknodes.c   /^main(argc, argv)$/;"  f
+main    mksignames.c    /^main (argc, argv)$/;" f
+main    mksyntax.c  /^main(argc, argv)$/;"  f
+makejob jobs.c  /^makejob(node, nprocs)$/;" f
+makename    parser.c    /^makename() {$/;"  f
+makestrspace    memalloc.c  /^makestrspace() {$/;"  f
+malloc  options.h   /^  unsigned char malloc;   \/* if parameter list dynamically allocated *\/$/;" m   struct:shparam
+marknext    memalloc.h  /^  struct stackmark *marknext;$/;" m   struct:stackmark
+markp   memalloc.c  /^struct stackmark *markp;$/;"  v
+match   mkinit.c    /^match(name, line)$/;" f
+memout  output.c    /^struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};$/;"    v
+memout  output.c    /^struct output memout = {NULL, NULL, 0, NULL, 0, MEM_OUT, 0};$/;"  v
+mflag   options.h   55;"    d
+minus_o options.c   /^minus_o(name, val)$/;"    f
+minusc  options.c   /^char *minusc;         \/* argument to -c option *\/$/;"   v
+mklocal var.c   /^mklocal(name)$/;" f
+mpathset    var.h   112;"   d
+mpathval    var.h   99;"    d
+msg error.c /^  const char *msg;    \/* text describing the error *\/$/;"   m   struct:errname  file:
+msort   expand.c    /^msort(list, len)$/;"  f
+n   hetio.c /^   struct history *n;$/;" m   struct:history  file:
+name    alias.h /^  char *name;$/;" m   struct:alias
+name    miscbltin.c /^  const char *name;$/;"   m   struct:limits   file:
+name    mkinit.c    /^  char *name;     \/* name of event (e.g. INIT) *\/$/;"   m   struct:event    file:
+name    mknodes.c   /^  char *name;     \/* name of field *\/$/;"   m   struct:field    file:
+name    mksyntax.c  /^  char *name;$/;" m   struct:synclass file:
+name    options.h   /^  const char *name;$/;"   m   struct:optent
+nbits   mksyntax.c  /^static int nbits; \/* number of bits in a character *\/$/;"   v   file:
+needprompt  parser.c    /^int needprompt;           \/* true if interactive and at start of line *\/$/;"    v
+new_term    hetio.c /^static struct termios old_term, new_term; \/* Current termio and the previous termio before starting ash *\/$/;"  v   file:
+newerf  bltin/test.c    /^newerf (f1, f2)$/;"   f   file:
+nexpr   bltin/test.c    /^nexpr(n)$/;"  f   file:
+next    alias.h /^  struct alias *next;$/;" m   struct:alias
+next    exec.c  /^  struct tblentry *next;  \/* next entry in hash chain *\/$/;"    m   struct:tblentry file:
+next    expand.c    /^  struct ifsregion *next; \/* next region in list *\/$/;" m   struct:ifsregion    file:
+next    expand.h    /^  struct strlist *next;$/;"   m   struct:strlist
+next    mkinit.c    /^  struct block *next;$/;" m   struct:block    file:
+next    parser.c    /^  struct heredoc *next;   \/* next here document in list *\/$/;"  m   struct:heredoc  file:
+next    redir.c /^  struct redirtab *next;$/;"  m   struct:redirtab file:
+next    var.h   /^  struct localvar *next;      \/* next local variable in list *\/$/;" m   struct:localvar
+next    var.h   /^  struct var *next;       \/* next entry in hash list *\/$/;" m   struct:var
+nextc   input.c /^  char *nextc;        \/* next char in buffer *\/$/;" m   struct:parsefile    file:
+nextc   mkinit.c    /^  char *nextc;$/;"    m   struct:text file:
+nextc   output.h    /^  char *nextc;$/;"    m   struct:output
+nextfield   mknodes.c   /^nextfield(buf)$/;"    f   file:
+nextopt options.c   /^nextopt(optstring)$/;"    f
+nfields mknodes.c   /^  int nfields;        \/* number of fields in the structure *\/$/;"   m   struct:str  file:
+nflag   options.h   56;"    d
+ngroups bltin/test.c    /^static int ngroups;$/;"   v   file:
+njobs   jobs.c  /^int njobs;            \/* size of array *\/$/;"   v
+nleft   eval.h  /^  int nleft;      \/* number of chars in buffer *\/$/;"   m   struct:backcmd
+nleft   input.c /^  int nleft;      \/* number of chars left in this line *\/$/;"   m   struct:parsefile    file:
+nleft   mkinit.c    /^  int nleft;$/;"  m   struct:text file:
+nleft   output.h    /^  int nleft;$/;"  m   struct:output
+nmboxes mail.c  /^STATIC int nmboxes;           \/* number of mailboxes *\/$/;" v
+noclobberopen   redir.c /^noclobberopen(fname)$/;"  f
+nodename    mknodes.c   /^static char *nodename[MAXTYPES];  \/* names of the nodes *\/$/;"  v   file:
+nodestr mknodes.c   /^static struct str *nodestr[MAXTYPES]; \/* type of structure used by the node *\/$/;"  v   file:
+noexpand    parser.c    /^noexpand(text)$/;"    f
+not_fcnumber    histedit.c  /^not_fcnumber(s)$/;"   f
+nparam  options.h   /^  int nparam;     \/* # of positional parameters (without $0) *\/$/;" m   struct:shparam
+nprocs  jobs.h  /^  short nprocs;       \/* number of processes *\/$/;" m   struct:job
+nstr    mknodes.c   /^static int nstr;          \/* number of structures *\/$/;"    v   file:
+ntypes  mknodes.c   /^static int ntypes;            \/* number of node types *\/$/;"    v   file:
+nullstr mystring.c  /^char nullstr[1];      \/* zero length string *\/$/;"  v
+nulonly expand.c    /^  int nulonly;        \/* search for nul bytes only *\/$/;"   m   struct:ifsregion    file:
+number  mystring.c  /^number(s)$/;" f
+oexitstatus eval.c  /^int oexitstatus;      \/* saved exit status *\/$/;"   v
+oexpr   bltin/test.c    /^oexpr(n)$/;"  f   file:
+old_term    hetio.c /^static struct termios old_term, new_term; \/* Current termio and the previous termio before starting ash *\/$/;"  v   file:
+olderf  bltin/test.c    /^olderf (f1, f2)$/;"   f   file:
+onint   error.c /^onint() {$/;" f
+onsig   trap.c  /^onsig(signo)$/;"  f
+onsigchild  jobs.c  /^STATIC int onsigchild() {$/;" f
+op_num  bltin/test.c    /^  short op_num, op_type;$/;"  m   struct:t_op file:
+op_text bltin/test.c    /^  const char *op_text;$/;"    m   struct:t_op file:
+op_type bltin/test.c    /^  short op_num, op_type;$/;"  m   struct:t_op file:
+open_mem    output.c    /^open_mem(block, length, file)$/;" f
+openhere    redir.c /^openhere(redir)$/;"   f
+openmemout  output.c    /^openmemout() {$/;"    f
+openredirect    redir.c /^openredirect(redir)$/;"   f
+opentrace   show.c  /^opentrace() {$/;" f
+ops bltin/test.c    /^} const ops [] = {$/;"    v   file:
+optarg  options.c   /^char *optarg;         \/* set by nextopt (like getopt) *\/$/;"    v
+optent  options.h   /^struct optent {$/;"   s
+optind  options.h   /^  int optind;     \/* next parameter to be processed by getopts *\/$/;"   m   struct:shparam
+optindval   var.h   103;"   d
+option  miscbltin.c /^  char    option;$/;" m   struct:limits   file:
+options options.c   /^options(cmdline)$/;"  f
+optlist options.h   /^struct optent optlist[NOPTS] = {$/;"  v
+optoff  options.h   /^  int optoff;     \/* used by getopts *\/$/;" m   struct:shparam
+optptr  options.c   /^char *optptr;         \/* used by nextopt *\/$/;" v
+optschanged options.c   /^optschanged()$/;" f
+out1    output.c    /^struct output *out1 = &output;$/;"    v
+out1c   output.h    104;"   d
+out1fmt output.c    /^out1fmt(const char *fmt, ...)$/;" f
+out1str output.h    106;"   d
+out2    output.c    /^struct output *out2 = &errout;$/;"    v
+out2c   output.h    105;"   d
+out2str output.h    107;"   d
+out_junk    output.c    /^char out_junk[16];$/;"    v
+outc    output.h    102;"   d
+outc    output.h    98;"    d
+outfmt  output.c    /^outfmt(struct output *file, const char *fmt, ...)$/;" f
+outfunc mknodes.c   /^outfunc(cfile, calcsize)$/;"  f   file:
+output  mkinit.c    /^output() {$/;"    f
+output  mknodes.c   /^output(file)$/;"  f   file:
+output  output.c    /^struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};$/;"  v
+output  output.c    /^struct output output = {NULL, NULL, 0, NULL, 0, 1, 0};$/;"    v
+output  output.h    /^struct output {$/;"   s
+output_type_macros  mksyntax.c  /^output_type_macros()$/;"  f   file:
+outsizes    mknodes.c   /^outsizes(cfile)$/;"   f   file:
+outstr  output.c    /^outstr(p, file)$/;"   f
+p   hetio.c /^   struct history *p;$/;" m   struct:history  file:
+p   options.h   /^  char **p;       \/* parameter list *\/$/;"  m   struct:shparam
+padvance    exec.c  /^padvance(path, name)$/;"  f
+param   exec.c  /^  union param param;  \/* definition of builtin function *\/$/;"  m   struct:tblentry file:
+param   exec.h  /^  union param {$/;"   u   struct:cmdentry
+parsebackquote  parser.c    /^int parsebackquote;       \/* nonzero if we are inside backquotes *\/$/;" v
+parsecmd    parser.c    /^parsecmd(int interact)$/;"    f
+parsefield  mknodes.c   /^parsefield()$/;"  f   file:
+parsefile   input.c /^struct parsefile *parsefile = &basepf;    \/* current input file *\/$/;"  v
+parsefile   input.c /^struct parsefile {$/;"    s   file:
+parsefname  parser.c    /^parsefname() {$/;"    f
+parseheredoc    parser.c    /^parseheredoc() {$/;"  f
+parselleft  input.c /^MKINIT int parselleft;        \/* copy of parsefile->lleft *\/$/;"    v
+parsenextc  input.c /^char *parsenextc;     \/* copy of parsefile->nextc *\/$/;"    v
+parsenleft  input.c /^MKINIT int parsenleft;        \/* copy of parsefile->nleft *\/$/;"    v
+parsenode   mknodes.c   /^parsenode()$/;"   f   file:
+path_change exec.c  /^path_change(newval, bltin)$/;"    f
+pathopt exec.c  /^const char *pathopt;$/;"  v
+pathval var.h   100;"   d
+patmatch    expand.c    /^patmatch(pattern, string, squoted)$/;"    f
+patmatch2   expand.c    /^patmatch2(pattern, string, squoted)$/;"   f
+patmatch2   expand.c    131;"   d   file:
+peektoken   parser.c    /^peektoken() {$/;" f
+pendingsigs trap.c  /^int pendingsigs;          \/* indicates some signal received *\/$/;"  v
+pfgets  input.c /^pfgets(line, len)$/;" f
+pgetc   input.c /^pgetc()$/;"   f
+pgetc_macro input.h 66;"    d
+pgrp    jobs.h  /^  short pgrp;     \/* process group of this job *\/$/;"   m   struct:job
+pid jobs.h  /^  pid_t pid;      \/* process id *\/$/;"  m   struct:procstat
+pipeline    parser.c    /^pipeline() {$/;"  f
+plinno  input.c /^int plinno = 1;           \/* input line number *\/$/;"   v
+pmatch  expand.c    /^pmatch(pattern, string, squoted)$/;"  f
+pointer shell.h /^typedef char *pointer;$/;"    t
+pointer shell.h /^typedef void *pointer;$/;"    t
+popallfiles input.c /^popallfiles() {$/;"   f
+popfile input.c /^popfile() {$/;"   f
+poplocalvars    var.c   /^poplocalvars() {$/;"  f
+popredir    redir.c /^popredir() {$/;"  f
+popstackmark    memalloc.c  /^popstackmark(mark)$/;"    f
+popstring   input.c /^popstring()$/;"   f
+preadbuffer input.c /^preadbuffer()$/;" f
+preadfd input.c /^preadfd()$/;" f   file:
+prefix  mystring.c  /^prefix(pfx, string)$/;"   f
+preglob expand.c    /^preglob(str)$/;"  f
+prehash eval.c  /^prehash(n)$/;"    f
+prev    input.c /^  struct parsefile *prev; \/* preceding file on stack *\/$/;" m   struct:parsefile    file:
+prev    input.c /^  struct strpush *prev;   \/* preceding string on stack *\/$/;"   m   struct:strpush  file:
+prev    memalloc.c  /^  struct stack_block *prev;$/;"   m   struct:stack_block  file:
+prevcmd main.c  /^STATIC union node *prevcmd;$/;"   v
+prevdir cd.c    /^char *prevdir;            \/* previous working directory *\/$/;"  v
+prevlleft   input.c /^  int prevlleft;$/;"  m   struct:strpush  file:
+prevnleft   input.c /^  int prevnleft;$/;"  m   struct:strpush  file:
+prevstring  input.c /^  char *prevstring;$/;"   m   struct:strpush  file:
+primary bltin/test.c    /^primary(n)$/;"    f   file:
+print   mksyntax.c  /^print(name)$/;"   f   file:
+printentry  exec.c  /^printentry(cmdp, verbose)$/;" f
+printf  bltin/bltin.h   55;"    d
+procargs    options.c   /^procargs(argc, argv)$/;"  f
+procstat    jobs.h  /^struct procstat {$/;" s
+profile_buf main.c  /^short profile_buf[16384];$/;" v
+progname    mksignames.c    /^char *progname;$/;"   v
+ps  jobs.h  /^  struct procstat *ps;    \/* status or processes when more than one *\/$/;"  m   struct:job
+ps0 jobs.h  /^  struct procstat ps0;    \/* status of process *\/$/;"   m   struct:job
+ps1val  var.h   101;"   d
+ps2val  var.h   102;"   d
+pungetc input.c /^pungetc() {$/;"   f
+pushfile    input.c /^pushfile() {$/;"  f
+pushstring  input.c /^pushstring(s, len, ap)$/;"    f
+putc    bltin/bltin.h   56;"    d
+putchar bltin/bltin.h   57;"    d
+pwdcmd  cd.c    /^pwdcmd(argc, argv)$/;"    f
+qflag   options.h   66;"    d
+quoteflag   parser.c    /^int quoteflag;            \/* set if (part of) last token was quoted *\/$/;"  v
+rcsid   mkinit.c    /^static const char rcsid[] =$/;"   v   file:
+rcsid   mknodes.c   /^static const char rcsid[] =$/;"   v   file:
+rcsid   mksyntax.c  /^static const char rcsid[] =$/;"   v   file:
+read_profile    main.c  /^read_profile(name)$/;"    f
+readcmd miscbltin.c /^readcmd(argc, argv)$/;"   f
+readcmdfile main.c  /^readcmdfile(name)$/;" f
+readfile    mkinit.c    /^readfile(fname)$/;"   f
+readline    mknodes.c   /^readline()$/;"    f   file:
+readtoken   parser.c    /^readtoken() {$/;" f
+readtoken1  parser.c    /^readtoken1(firstc, syntax, eofmark, striptabs)$/;"    f
+recordregion    expand.c    /^recordregion(start, end, nulonly)$/;" f
+redirect    redir.c /^redirect(redir, flags)$/;"    f
+redirlist   redir.c /^MKINIT struct redirtab *redirlist;$/;"    v
+redirnode   parser.c    /^union node *redirnode;$/;"    v
+redirtab    redir.c /^struct redirtab {$/;" s   file:
+rehash  exec.c  /^  char rehash;        \/* if set, cd done since entry created *\/$/;" m   struct:tblentry file:
+removerecordregions expand.c    /^removerecordregions(endoff)$/;"   f
+renamed redir.c /^  short renamed[10];$/;"  m   struct:redirtab file:
+reset   mkinit.c    /^char reset[] = "\\$/;"    v
+reset_term  hetio.c /^static int reset_term = 0;            \/* Set to true if the terminal needs to be reset upon exit *\/$/;" v   file:
+restartjob  jobs.c  /^restartjob(jp)$/;"    f
+returncmd   eval.c  /^returncmd(argc, argv)$/;" f
+rflag   miscbltin.c 71;"    d   file:
+rlim_t  miscbltin.c /^typedef enum __rlimit_resource rlim_t;$/;"    t   file:
+rmaliases   alias.c /^rmaliases() {$/;" f
+rmescapes   expand.c    /^rmescapes(str)$/;"    f
+rootpid main.c  /^int rootpid;$/;"  v
+rootshell   main.c  /^int rootshell;$/;"    v
+routine mkinit.c    /^  char *routine;      \/* name of routine called on event *\/$/;" m   struct:event    file:
+s   hetio.c /^   char *s;$/;"   m   struct:history  file:
+savestr memalloc.c  /^savestr(s)$/;"    f
+savestr mkinit.c    /^savestr(s)$/;"    f
+savestr mknodes.c   /^savestr(s)$/;"    f   file:
+sccsid  arith.c /^static char sccsid[] = "@(#)arith.y   8.3 (Berkeley) 5\/4\/95";$/;"   v   file:
+scopy   mystring.h  49;"    d
+scopyn  mystring.c  /^scopyn(from, to, size)$/;"    f
+setIO   hetio.c /^void setIO(struct termios *new, struct termios *old)  \/* Set terminal IO to canonical mode, and save old term settings. *\/$/;"  f
+setalias    alias.c /^setalias(name, val)$/;"   f
+setcmd  options.c   /^setcmd(argc, argv)$/;"    f
+sethistsize histedit.c  /^sethistsize(hs)$/;"   f
+setinputfd  input.c /^setinputfd(fd, push)$/;"  f
+setinputfile    input.c /^setinputfile(fname, push)$/;" f
+setinputstring  input.c /^setinputstring(string, push)$/;"  f
+setinteractive  trap.c  /^setinteractive(on)$/;"    f
+setjmp  error.h 106;"   d
+setjobctl   jobs.c  /^setjobctl(on)$/;" f
+setjobctl   jobs.h  97;"    d
+setmode setmode.c   /^setmode(p)$/;"    f
+setoption   options.c   /^setoption(flag, val)$/;"  f
+setparam    options.c   /^setparam(argv)$/;"    f
+setprompt   parser.c    /^setprompt(which)$/;"  f
+setsignal   trap.c  /^setsignal(signo)$/;"  f
+setstackmark    memalloc.c  /^setstackmark(mark)$/;"    f
+setterm histedit.c  /^setterm(term)$/;" f
+setvar  var.c   /^setvar(name, val, flags)$/;"  f
+setvarcmd   var.c   /^setvarcmd(argc, argv)$/;" f
+setvareq    var.c   /^setvareq(s, flags)$/;"    f
+setvarsafe  var.c   /^setvarsafe(name, val, flags)$/;"  f
+sflag   options.h   57;"    d
+sharg   show.c  /^sharg(arg, fp)$/;"    f   file:
+shcmd   show.c  /^shcmd(cmd, fp)$/;"    f   file:
+shellexec   exec.c  /^shellexec(argv, envp, path, idx)$/;"  f
+shellparam  options.c   /^struct shparam shellparam;    \/* current positional parameters *\/$/;"   v
+shellproc   mkinit.c    /^char shellproc[] = "\\$/;"    v
+shiftcmd    options.c   /^shiftcmd(argc, argv)$/;"  f
+short   arith.c 300;"   d   file:
+showjobs    jobs.c  /^showjobs(change)$/;"  f
+showtree    show.c  /^showtree(n)$/;"   f
+showvarscmd var.c   /^showvarscmd(argc, argv)$/;"   f
+shparam options.h   /^struct shparam {$/;"  s
+shprocvar   var.c   /^shprocvar() {$/;" f
+shtree  show.c  /^shtree(n, ind, pfx, fp)$/;"   f   file:
+sigmode trap.c  /^MKINIT char sigmode[NSIG];    \/* current value of signal *\/$/;" v
+signal_names    mksignames.c    /^char *signal_names[2 * NSIG];$/;" v
+simplecmd   parser.c    /^simplecmd(rpp, redir)$/;" f
+size    mksyntax.c  /^static int size;  \/* number of values which a char variable can have *\/$/;" v   file:
+skipbl  mknodes.c   /^skipbl()$/;"  f   file:
+skipcount   eval.c  /^STATIC int skipcount;     \/* number of levels to skip *\/$/;"    v
+space   memalloc.c  /^  char space[MINSIZE];$/;"    m   struct:stack_block  file:
+sstrnleft   memalloc.c  /^int sstrnleft;$/;"    v
+stack_block memalloc.c  /^struct stack_block {$/;"  s   file:
+stackbase   memalloc.c  /^struct stack_block stackbase;$/;" v
+stackblock  memalloc.h  69;"    d
+stackblocksize  memalloc.h  70;"    d
+stackmark   memalloc.h  /^struct stackmark {$/;"    s
+stacknleft  memalloc.c  /^int stacknleft = MINSIZE;$/;" v
+stacknleft  memalloc.h  /^  int stacknleft;$/;" m   struct:stackmark
+stacknxt    memalloc.c  /^char *stacknxt = stackbase.space;$/;" v
+stacknxt    memalloc.h  /^  char *stacknxt;$/;" m   struct:stackmark
+stackp  memalloc.c  /^struct stack_block *stackp = &stackbase;$/;"  v
+stackp  memalloc.h  /^  struct stack_block *stackp;$/;" m   struct:stackmark
+stalloc memalloc.c  /^stalloc(nbytes)$/;"   f
+start   mkinit.c    /^  struct block *start;$/;"    m   struct:text file:
+startlinno  parser.c    /^int startlinno;           \/* line # where last token started *\/$/;" v
+state   jobs.h  /^  char state;     \/* true if job is finished *\/$/;" m   struct:job
+status  jobs.h  /^  int status;     \/* status flags (defined above) *\/$/;"    m   struct:procstat
+stderr  bltin/bltin.h   54;"    d
+stdout  bltin/bltin.h   53;"    d
+stoppedjobs jobs.c  /^stoppedjobs()$/;" f
+str mknodes.c   /^static struct str str[MAXTYPES];  \/* the structures *\/$/;"  v   file:
+str mknodes.c   /^struct str {          \/* struct representing a node structure *\/$/;"    s   file:
+str_to_event    histedit.c  /^str_to_event(str, last)$/;"   f
+stream  output.h    /^  FILE *stream;$/;"   m   struct:output
+striptabs   parser.c    /^  int striptabs;      \/* if set, strip leading tabs *\/$/;"  m   struct:heredoc  file:
+strlist expand.h    /^struct strlist {$/;"  s
+strpush input.c /^  struct strpush *strpush; \/* for pushing strings at this level *\/$/;"  m   struct:parsefile    file:
+strpush input.c /^struct strpush {$/;"  s   file:
+strtodest   expand.c    /^strtodest(p, quoted, allow_split)$/;" f
+stunalloc   memalloc.c  /^stunalloc(p)$/;"  f
+subevalvar  expand.c    /^subevalvar(p, str, strloc, subtype, startloc, varflags)$/;"   f
+suppressint error.c /^volatile int suppressint;$/;" v
+synclass    mksyntax.c  /^struct synclass synclass[] = {$/;"    v
+synclass    mksyntax.c  /^struct synclass {$/;" s   file:
+synerror    parser.c    /^synerror(msg)$/;" f
+synexpect   parser.c    /^synexpect(token)$/;"  f
+syntax  bltin/test.c    /^syntax(op, msg)$/;"   f   file:
+syntax  mksyntax.c  /^static char *syntax[513];$/;" v   file:
+t_lex   bltin/test.c    /^t_lex(s)$/;"  f   file:
+t_op    bltin/test.c    /^static struct t_op {$/;"  s   file:
+t_wp    bltin/test.c    /^static char **t_wp;$/;"   v   file:
+t_wp_op bltin/test.c    /^static struct t_op const *t_wp_op;$/;"    v   file:
+tag mknodes.c   /^  char *tag;      \/* structure tag *\/$/;"   m   struct:str  file:
+tblentry    exec.c  /^struct tblentry {$/;" s   file:
+termval var.h   106;"   d
+test_eaccess    bltin/test.c    /^test_eaccess (path, mode)$/;" f   file:
+testcmd bltin/test.c    /^testcmd(argc, argv)$/;"   f
+text    expand.h    /^  char *text;$/;" m   struct:strlist
+text    mkinit.c    /^  char text[BLOCKSIZE];$/;"   m   struct:block    file:
+text    mkinit.c    /^struct text {$/;" s   file:
+text    var.c   /^  const char *text;$/;"   m   struct:varinit  file:
+text    var.h   /^  char *text;         \/* name=value *\/$/;"  m   struct:var
+text    var.h   /^  char *text;         \/* saved text *\/$/;"  m   struct:localvar
+token   bltin/test.c    /^enum token {$/;"  g   file:
+token_types bltin/test.c    /^enum token_types {$/;"    g   file:
+tokpushback parser.c    /^MKINIT int tokpushback;       \/* last token pushed back *\/$/;"  v
+trace   show.c  /^trace(const char *fmt, ...)$/;"   f
+tracefile   show.c  /^FILE *tracefile;$/;"  v
+trap    trap.c  /^char *trap[NSIG+1];       \/* trap handler commands *\/$/;"   v
+trapcmd trap.c  /^trapcmd(argc, argv)$/;"   f
+trargs  show.c  /^trargs(ap)$/;"    f
+trputc  show.c  /^trputc(c)$/;" f
+trputs  show.c  /^trputs(s)$/;" f
+trstring    show.c  /^trstring(s)$/;"   f   file:
+truecmd eval.c  /^truecmd(argc, argv)$/;"   f
+tryexec exec.c  /^tryexec(cmd, argv, envp)$/;"  f
+type    mknodes.c   /^  int type;           \/* type of field *\/$/;"   m   struct:field    file:
+typecmd exec.c  /^typecmd(argc, argv)$/;"   f
+u   exec.h  /^  } u;$/;"    m   struct:cmdentry
+uflag   options.h   65;"    d
+ulimitcmd   miscbltin.c /^ulimitcmd(argc, argv)$/;" f
+umaskcmd    miscbltin.c /^umaskcmd(argc, argv)$/;"  f
+unalias alias.c /^unalias(name)$/;" f
+unaliascmd  alias.c /^unaliascmd(argc, argv)$/;"    f
+ungrabstackstr  memalloc.c  /^ungrabstackstr(s, p)$/;"  f
+unsetcmd    var.c   /^unsetcmd(argc, argv)$/;"  f
+unsetfunc   exec.c  /^unsetfunc(name)$/;"   f
+unsetvar    var.c   /^unsetvar(s)$/;"   f
+updatepwd   cd.c    /^updatepwd(dir)$/;"    f
+used    jobs.h  /^  char used;      \/* true if this entry is in used *\/$/;"   m   struct:job
+val alias.h /^  char *val;$/;"  m   struct:alias
+val options.h   /^  char val;$/;"   m   struct:optent
+var var.c   /^  struct var *var;$/;"    m   struct:varinit  file:
+var var.h   /^struct var {$/;"  s
+varequal    var.c   /^varequal(p, q)$/;"    f
+varinit var.c   /^const struct varinit varinit[] = {$/;"    v
+varinit var.c   /^struct varinit {$/;"  s   file:
+varisset    expand.c    /^varisset(name, nulok)$/;" f
+vartab  var.c   /^struct var *vartab[VTABSIZE];$/;" v
+varvalue    expand.c    /^varvalue(name, quoted, allow_split)$/;"   f
+vatty   var.c   /^struct var vatty;$/;" v
+vflag   options.h   59;"    d
+vhistsize   var.c   /^struct var vhistsize;$/;" v
+vifs    var.c   /^struct var vifs;$/;"  v
+vmail   var.c   /^struct var vmail;$/;" v
+vmpath  var.c   /^struct var vmpath;$/;"    v
+voptind var.c   /^struct var voptind;$/;"   v
+vp  var.h   /^  struct var *vp;         \/* the variable that was made local *\/$/;"    m   struct:localvar
+vpath   var.c   /^struct var vpath;$/;" v
+vps1    var.c   /^struct var vps1;$/;"  v
+vps2    var.c   /^struct var vps2;$/;"  v
+vterm   var.c   /^struct var vterm;$/;" v
+vvers   var.c   /^struct var vvers;$/;" v
+waitcmd jobs.c  /^waitcmd(argc, argv)$/;"   f
+waitforjob  jobs.c  /^waitforjob(jp)$/;"    f
+waitonint   jobs.c  /^STATIC void waitonint(int sig) {$/;"  f
+waitproc    jobs.c  /^waitproc(block, status)$/;"   f
+warnx   bltin/bltin.h   61;"    d
+whichprompt input.c /^int whichprompt;      \/* 1 == PS1, 2 == PS2 *\/$/;"  v
+wordtext    parser.c    /^char *wordtext;           \/* text of last word returned by readtoken *\/$/;" v
+write_signames  mksignames.c    /^write_signames (stream)$/;"   f
+writer  mkinit.c    /^char writer[] = "\\$/;"   v
+writer  mknodes.c   /^char writer[] = "\\$/;"   v
+writer  mksyntax.c  /^static char writer[] = "\\$/;"    v   file:
+writetext   mkinit.c    /^writetext(text, fp)$/;"   f
+xflag   options.h   58;"    d
+xioctl  output.c    /^xioctl(fd, request, arg)$/;"  f
+xwrite  output.c    /^xwrite(fd, buf, nbytes)$/;"   f
+xxreadtoken parser.c    /^xxreadtoken() {$/;"   f
+yy_reduce_print arith.c /^yy_reduce_print (yyvsp, yyrule)$/;"   f   file:
+yy_stack_print  arith.c /^yy_stack_print (bottom, top)$/;"  f   file:
+yy_symbol_print arith.c /^yy_symbol_print (yyoutput, yytype, yyvaluep)$/;"  f   file:
+yy_symbol_value_print   arith.c /^yy_symbol_value_print (yyoutput, yytype, yyvaluep)$/;"    f   file:
+yyalloc arith.c /^union yyalloc$/;" u   file:
+yychar  arith.c /^int yychar;$/;"   v
+yycheck arith.c /^static const yytype_int8 yycheck[] =$/;"  v   file:
+yyclearin   arith.c 739;"   d   file:
+yydebug arith.c /^int yydebug;$/;"  v
+yydefact    arith.c /^static const yytype_uint8 yydefact[] =$/;"    v   file:
+yydefgoto   arith.c /^static const yytype_int8 yydefgoto[] =$/;"    v   file:
+yydestruct  arith.c /^yydestruct (yymsg, yytype, yyvaluep)$/;"  f   file:
+yyerrok arith.c 738;"   d   file:
+yyerror arith.c /^yyerror(s)$/;"    f
+yylval  arith.c /^YYSTYPE yylval;$/;"   v
+yynerrs arith.c /^int yynerrs;$/;"  v
+yypact  arith.c /^static const yytype_int16 yypact[] =$/;"  v   file:
+yypgoto arith.c /^static const yytype_int8 yypgoto[] =$/;"  v   file:
+yyprhs  arith.c /^static const yytype_uint8 yyprhs[] =$/;"  v   file:
+yyr1    arith.c /^static const yytype_uint8 yyr1[] =$/;"    v   file:
+yyr2    arith.c /^static const yytype_uint8 yyr2[] =$/;"    v   file:
+yyrhs   arith.c /^static const yytype_int8 yyrhs[] =$/;"    v   file:
+yyrline arith.c /^static const yytype_uint8 yyrline[] =$/;" v   file:
+yyss    arith.c /^  yytype_int16 yyss;$/;"  m   union:yyalloc   file:
+yystos  arith.c /^static const yytype_uint8 yystos[] =$/;"  v   file:
+yystpcpy    arith.c /^yystpcpy (yydest, yysrc)$/;"  f   file:
+yystpcpy    arith.c 1034;"  d   file:
+yystrlen    arith.c /^yystrlen (yystr)$/;"  f   file:
+yystrlen    arith.c 1011;"  d   file:
+yystype arith.c 286;"   d   file:
+yystype arith.h 101;"   d
+yysyntax_error  arith.c /^yysyntax_error (char *yyresult, int yystate, int yychar)$/;"  f   file:
+yytable arith.c /^static const yytype_uint8 yytable[] =$/;" v   file:
+yytname arith.c /^static const char *const yytname[] =$/;"  v   file:
+yytnamerr   arith.c /^yytnamerr (char *yyres, const char *yystr)$/;"    f   file:
+yytokentype arith.c /^   enum yytokentype {$/;" g   file:
+yytokentype arith.h /^   enum yytokentype {$/;" g
+yytoknum    arith.c /^static const yytype_uint16 yytoknum[] =$/;"   v   file:
+yytranslate arith.c /^static const yytype_uint8 yytranslate[] =$/;" v   file:
+yytype_int16    arith.c /^typedef YYTYPE_INT16 yytype_int16;$/;"    t   file:
+yytype_int16    arith.c /^typedef short int yytype_int16;$/;"   t   file:
+yytype_int8 arith.c /^typedef YYTYPE_INT8 yytype_int8;$/;"  t   file:
+yytype_int8 arith.c /^typedef short int yytype_int8;$/;"    t   file:
+yytype_int8 arith.c /^typedef signed char yytype_int8;$/;"  t   file:
+yytype_uint16   arith.c /^typedef YYTYPE_UINT16 yytype_uint16;$/;"  t   file:
+yytype_uint16   arith.c /^typedef unsigned short int yytype_uint16;$/;" t   file:
+yytype_uint8    arith.c /^typedef YYTYPE_UINT8 yytype_uint8;$/;"    t   file:
+yytype_uint8    arith.c /^typedef unsigned char yytype_uint8;$/;"   t   file:
+yyvs    arith.c /^  YYSTYPE yyvs;$/;"   m   union:yyalloc   file:

 /trunk/uspace/app/ash/histedit.c
 ,0 → 1,513
+/*  $NetBSD: histedit.c,v 1.24 2000/11/06 04:21:14 mycroft Exp $    */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)histedit.c  8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: histedit.c,v 1.24 2000/11/06 04:21:14 mycroft Exp $");
+#endif
+#endif /* not lint */
+#include <sys/param.h>
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+/*
+ * Editline and history functions (and glue).
+ */
+#include "shell.h"
+#include "parser.h"
+#include "var.h"
+#include "options.h"
+#include "main.h"
+#include "output.h"
+#include "mystring.h"
+#include "error.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#include "eval.h"
+#include "memalloc.h"
+#define MAXHISTLOOPS    4   /* max recursions through fc */
+#define DEFEDITOR   "ed"    /* default editor *should* be $EDITOR */
+History *hist;  /* history cookie */
+EditLine *el;   /* editline cookie */
+int displayhist;
+static FILE *el_in, *el_out;
+STATIC const char *fc_replace (const char *, char *, char *);
+/*
+ * Set history and editing status.  Called whenever the status may
+ * have changed (figures out what to do).
+ */
+void
+histedit()
+{
+#define editing (Eflag || Vflag)
+    if (iflag) {
+        if (!hist) {
+            /*
+             * turn history on
+             */
+            INTOFF;
+            hist = history_init();
+            INTON;
+            if (hist != NULL)
+                sethistsize(histsizeval());
+            else
+                out2str("sh: can't initialize history\n");
+        }
+        if (editing && !el && isatty(0)) { /* && isatty(2) ??? */
+            /*
+             * turn editing on
+             */
+            INTOFF;
+            if (el_in == NULL)
+                el_in = fdopen(0, "r");
+            if (el_out == NULL)
+                el_out = fdopen(2, "w");
+            if (el_in == NULL || el_out == NULL)
+                goto bad;
+            el = el_init(arg0, el_in, el_out, el_out);
+            if (el != NULL) {
+                if (hist)
+                    el_set(el, EL_HIST, history, hist);
+                el_set(el, EL_PROMPT, getprompt);
+            } else {
+bad:
+                out2str("sh: can't initialize editing\n");
+            }
+            INTON;
+        } else if (!editing && el) {
+            INTOFF;
+            el_end(el);
+            el = NULL;
+            INTON;
+        }
+        if (el) {
+            if (Vflag)
+                el_set(el, EL_EDITOR, "vi");
+            else if (Eflag)
+                el_set(el, EL_EDITOR, "emacs");
+            el_source(el, NULL);
+        }
+    } else {
+        INTOFF;
+        if (el) {   /* no editing if not interactive */
+            el_end(el);
+            el = NULL;
+        }
+        if (hist) {
+            history_end(hist);
+            hist = NULL;
+        }
+        INTON;
+    }
+}
+void
+sethistsize(hs)
+    const char *hs;
+{
+    int histsize;
+    HistEvent he;
+    if (hist != NULL) {
+        if (hs == NULL || *hs == '\0' ||
+           (histsize = atoi(hs)) < 0)
+            histsize = 100;
+        history(hist, &he, H_SETSIZE, histsize);
+    }
+}
+void
+setterm(term)
+    const char *term;
+{
+    if (el != NULL && term != NULL)
+        if (el_set(el, EL_TERMINAL, term) != 0) {
+            outfmt(out2, "sh: Can't set terminal type %s\n", term);
+            outfmt(out2, "sh: Using dumb terminal settings.\n");
+        }
+}
+/*
+ *  This command is provided since POSIX decided to standardize
+ *  the Korn shell fc command.  Oh well...
+ */
+int
+histcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int ch;
+    const char *editor = NULL;
+    HistEvent he;
+    int lflg = 0, nflg = 0, rflg = 0, sflg = 0;
+    int i, retval;
+    const char *firststr, *laststr;
+    int first, last, direction;
+    char *pat = NULL, *repl;    /* ksh "fc old=new" crap */
+    static int active = 0;
+    struct jmploc jmploc;
+    struct jmploc *volatile savehandler;
+    char editfile[MAXPATHLEN + 1];
+    FILE *efp;
+#ifdef __GNUC__
+    /* Avoid longjmp clobbering */
+    (void) &editor;
+    (void) &lflg;
+    (void) &nflg;
+    (void) &rflg;
+    (void) &sflg;
+    (void) &firststr;
+    (void) &laststr;
+    (void) &pat;
+    (void) &repl;
+    (void) &efp;
+    (void) &argc;
+    (void) &argv;
+#endif
+    if (hist == NULL)
+        error("history not active");
+    if (argc == 1)
+        error("missing history argument");
+#ifdef __GLIBC__
+    optind = 1;
+#else
+    optreset = 1; optind = 1; /* initialize getopt */
+#endif
+    while (not_fcnumber(argv[optind]) &&
+          (ch = getopt(argc, argv, ":e:lnrs")) != -1)
+        switch ((char)ch) {
+        case 'e':
+            editor = optarg;
+            break;
+        case 'l':
+            lflg = 1;
+            break;
+        case 'n':
+            nflg = 1;
+            break;
+        case 'r':
+            rflg = 1;
+            break;
+        case 's':
+            sflg = 1;
+            break;
+        case ':':
+            error("option -%c expects argument", optopt);
+            /* NOTREACHED */
+        case '?':
+        default:
+            error("unknown option: -%c", optopt);
+            /* NOTREACHED */
+        }
+    argc -= optind, argv += optind;
+    /*
+     * If executing...
+     */
+    if (lflg == 0 || editor || sflg) {
+        lflg = 0;   /* ignore */
+        editfile[0] = '\0';
+        /*
+         * Catch interrupts to reset active counter and
+         * cleanup temp files.
+         */
+        if (setjmp(jmploc.loc)) {
+            active = 0;
+            if (*editfile)
+                unlink(editfile);
+            handler = savehandler;
+            longjmp(handler->loc, 1);
+        }
+        savehandler = handler;
+        handler = &jmploc;
+        if (++active > MAXHISTLOOPS) {
+            active = 0;
+            displayhist = 0;
+            error("called recursively too many times");
+        }
+        /*
+         * Set editor.
+         */
+        if (sflg == 0) {
+            if (editor == NULL &&
+                (editor = bltinlookup("FCEDIT", 1)) == NULL &&
+                (editor = bltinlookup("EDITOR", 1)) == NULL)
+                editor = DEFEDITOR;
+            if (editor[0] == '-' && editor[1] == '\0') {
+                sflg = 1;   /* no edit */
+                editor = NULL;
+            }
+        }
+    }
+    /*
+     * If executing, parse [old=new] now
+     */
+    if (lflg == 0 && argc > 0 &&
+         ((repl = strchr(argv[0], '=')) != NULL)) {
+        pat = argv[0];
+        *repl++ = '\0';
+        argc--, argv++;
+    }
+    /*
+     * determine [first] and [last]
+     */
+    switch (argc) {
+    case 0:
+        firststr = lflg ? "-16" : "-1";
+        laststr = "-1";
+        break;
+    case 1:
+        firststr = argv[0];
+        laststr = lflg ? "-1" : argv[0];
+        break;
+    case 2:
+        firststr = argv[0];
+        laststr = argv[1];
+        break;
+    default:
+        error("too many args");
+        /* NOTREACHED */
+    }
+    /*
+     * Turn into event numbers.
+     */
+    first = str_to_event(firststr, 0);
+    last = str_to_event(laststr, 1);
+    if (rflg) {
+        i = last;
+        last = first;
+        first = i;
+    }
+    /*
+     * XXX - this should not depend on the event numbers
+     * always increasing.  Add sequence numbers or offset
+     * to the history element in next (diskbased) release.
+     */
+    direction = first < last ? H_PREV : H_NEXT;
+    /*
+     * If editing, grab a temp file.
+     */
+    if (editor) {
+        int fd;
+        INTOFF;     /* easier */
+        sprintf(editfile, "%s_shXXXXXX", _PATH_TMP);
+        if ((fd = mkstemp(editfile)) < 0)
+            error("can't create temporary file %s", editfile);
+        if ((efp = fdopen(fd, "w")) == NULL) {
+            close(fd);
+            error("can't allocate stdio buffer for temp");
+        }
+    }
+    /*
+     * Loop through selected history events.  If listing or executing,
+     * do it now.  Otherwise, put into temp file and call the editor
+     * after.
+     *
+     * The history interface needs rethinking, as the following
+     * convolutions will demonstrate.
+     */
+    history(hist, &he, H_FIRST);
+    retval = history(hist, &he, H_NEXT_EVENT, first);
+    for (;retval != -1; retval = history(hist, &he, direction)) {
+        if (lflg) {
+            if (!nflg)
+                out1fmt("%5d ", he.num);
+            out1str(he.str);
+        } else {
+            const char *s = pat ?
+               fc_replace(he.str, pat, repl) : he.str;
+            char *sp;
+            if (sflg) {
+                if (displayhist) {
+                    out2str(s);
+                }
+                evalstring(strcpy(stalloc(strlen(s) + 1), s), 0);
+                free(sp);
+                if (displayhist && hist) {
+                    /*
+                     *  XXX what about recursive and
+                     *  relative histnums.
+                     */
+                    history(hist, &he, H_ENTER, s);
+                }
+            } else
+                fputs(s, efp);
+        }
+        /*
+         * At end?  (if we were to lose last, we'd sure be
+         * messed up).
+         */
+        if (he.num == last)
+            break;
+    }
+    if (editor) {
+        char *editcmd;
+        fclose(efp);
+        editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
+        sprintf(editcmd, "%s %s", editor, editfile);
+        evalstring(editcmd, 0); /* XXX - should use no JC command */
+        INTON;
+        readcmdfile(editfile);  /* XXX - should read back - quick tst */
+        unlink(editfile);
+    }
+    if (lflg == 0 && active > 0)
+        --active;
+    if (displayhist)
+        displayhist = 0;
+    return 0;
+}
+STATIC const char *
+fc_replace(s, p, r)
+    const char *s;
+    char *p, *r;
+{
+    char *dest;
+    int plen = strlen(p);
+    STARTSTACKSTR(dest);
+    while (*s) {
+        if (*s == *p && strncmp(s, p, plen) == 0) {
+            while (*r)
+                STPUTC(*r++, dest);
+            s += plen;
+            *p = '\0';  /* so no more matches */
+        } else
+            STPUTC(*s++, dest);
+    }
+    STACKSTRNUL(dest);
+    dest = grabstackstr(dest);
+    return (dest);
+}
+int
+not_fcnumber(s)
+        char *s;
+{
+    if (s == NULL)
+        return 0;
+        if (*s == '-')
+                s++;
+    return (!is_number(s));
+}
+int
+str_to_event(str, last)
+    const char *str;
+    int last;
+{
+    HistEvent he;
+    const char *s = str;
+    int relative = 0;
+    int i, retval;
+    retval = history(hist, &he, H_FIRST);
+    switch (*s) {
+    case '-':
+        relative = 1;
+        /*FALLTHROUGH*/
+    case '+':
+        s++;
+    }
+    if (is_number(s)) {
+        i = atoi(s);
+        if (relative) {
+            while (retval != -1 && i--) {
+                retval = history(hist, &he, H_NEXT);
+            }
+            if (retval == -1)
+                retval = history(hist, &he, H_LAST);
+        } else {
+            retval = history(hist, &he, H_NEXT_EVENT, i);
+            if (retval == -1) {
+                /*
+                 * the notion of first and last is
+                 * backwards to that of the history package
+                 */
+                retval = history(hist, &he,
+                        last ? H_FIRST : H_LAST);
+            }
+        }
+        if (retval == -1)
+            error("history number %s not found (internal error)",
+                   str);
+    } else {
+        /*
+         * pattern
+         */
+        retval = history(hist, &he, H_PREV_STR, str);
+        if (retval == -1)
+            error("history pattern not found: %s", str);
+    }
+    return (he.num);
+}
+#else
+int
+histcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    error("not compiled with history support");
+    /* NOTREACHED */
+}
+#endif

 /trunk/uspace/app/ash/show.c
 ,0 → 1,447
+/*  $NetBSD: show.c,v 1.18 1999/10/08 21:10:44 pk Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)show.c  8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: show.c,v 1.18 1999/10/08 21:10:44 pk Exp $");
+#endif
+#endif /* not lint */
+#include <stdio.h>
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include "shell.h"
+#include "parser.h"
+#include "nodes.h"
+#include "mystring.h"
+#include "show.h"
+#ifdef DEBUG
+static void shtree (union node *, int, char *, FILE*);
+static void shcmd (union node *, FILE *);
+static void sharg (union node *, FILE *);
+static void indent (int, char *, FILE *);
+static void trstring (char *);
+void
+showtree(n)
+    union node *n;
+{
+    trputs("showtree called\n");
+    shtree(n, 1, NULL, stdout);
+}
+static void
+shtree(n, ind, pfx, fp)
+    union node *n;
+    int ind;
+    char *pfx;
+    FILE *fp;
+{
+    struct nodelist *lp;
+    const char *s;
+    if (n == NULL)
+        return;
+    indent(ind, pfx, fp);
+    switch(n->type) {
+    case NSEMI:
+        s = "; ";
+        goto binop;
+    case NAND:
+        s = " && ";
+        goto binop;
+    case NOR:
+        s = " || ";
+binop:
+        shtree(n->nbinary.ch1, ind, NULL, fp);
+       /*    if (ind < 0) */
+            fputs(s, fp);
+        shtree(n->nbinary.ch2, ind, NULL, fp);
+        break;
+    case NCMD:
+        shcmd(n, fp);
+        if (ind >= 0)
+            putc('\n', fp);
+        break;
+    case NPIPE:
+        for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) {
+            shcmd(lp->n, fp);
+            if (lp->next)
+                fputs(" | ", fp);
+        }
+        if (n->npipe.backgnd)
+            fputs(" &", fp);
+        if (ind >= 0)
+            putc('\n', fp);
+        break;
+    default:
+        fprintf(fp, "<node type %d>", n->type);
+        if (ind >= 0)
+            putc('\n', fp);
+        break;
+    }
+}
+static void
+shcmd(cmd, fp)
+    union node *cmd;
+    FILE *fp;
+{
+    union node *np;
+    int first;
+    const char *s;
+    int dftfd;
+    first = 1;
+    for (np = cmd->ncmd.args ; np ; np = np->narg.next) {
+        if (! first)
+            putchar(' ');
+        sharg(np, fp);
+        first = 0;
+    }
+    for (np = cmd->ncmd.redirect ; np ; np = np->nfile.next) {
+        if (! first)
+            putchar(' ');
+        switch (np->nfile.type) {
+            case NTO:   s = ">";  dftfd = 1; break;
+            case NAPPEND:   s = ">>"; dftfd = 1; break;
+            case NTOFD: s = ">&"; dftfd = 1; break;
+            case NTOOV: s = ">|"; dftfd = 1; break;
+            case NFROM: s = "<";  dftfd = 0; break;
+            case NFROMFD:   s = "<&"; dftfd = 0; break;
+            case NFROMTO:   s = "<>"; dftfd = 0; break;
+            default:    s = "*error*"; dftfd = 0; break;
+        }
+        if (np->nfile.fd != dftfd)
+            fprintf(fp, "%d", np->nfile.fd);
+        fputs(s, fp);
+        if (np->nfile.type == NTOFD || np->nfile.type == NFROMFD) {
+            fprintf(fp, "%d", np->ndup.dupfd);
+        } else {
+            sharg(np->nfile.fname, fp);
+        }
+        first = 0;
+    }
+}
+static void
+sharg(arg, fp)
+    union node *arg;
+    FILE *fp;
+    {
+    char *p;
+    struct nodelist *bqlist;
+    int subtype;
+    if (arg->type != NARG) {
+        printf("<node type %d>\n", arg->type);
+        fflush(stdout);
+        abort();
+    }
+    bqlist = arg->narg.backquote;
+    for (p = arg->narg.text ; *p ; p++) {
+        switch (*p) {
+        case CTLESC:
+            putc(*++p, fp);
+            break;
+        case CTLVAR:
+            putc('$', fp);
+            putc('{', fp);
+            subtype = *++p;
+            if (subtype == VSLENGTH)
+                putc('#', fp);
+            while (*p != '=')
+                putc(*p++, fp);
+            if (subtype & VSNUL)
+                putc(':', fp);
+            switch (subtype & VSTYPE) {
+            case VSNORMAL:
+                putc('}', fp);
+                break;
+            case VSMINUS:
+                putc('-', fp);
+                break;
+            case VSPLUS:
+                putc('+', fp);
+                break;
+            case VSQUESTION:
+                putc('?', fp);
+                break;
+            case VSASSIGN:
+                putc('=', fp);
+                break;
+            case VSTRIMLEFT:
+                putc('#', fp);
+                break;
+            case VSTRIMLEFTMAX:
+                putc('#', fp);
+                putc('#', fp);
+                break;
+            case VSTRIMRIGHT:
+                putc('%', fp);
+                break;
+            case VSTRIMRIGHTMAX:
+                putc('%', fp);
+                putc('%', fp);
+                break;
+            case VSLENGTH:
+                break;
+            default:
+                printf("<subtype %d>", subtype);
+            }
+            break;
+        case CTLENDVAR:
+             putc('}', fp);
+             break;
+        case CTLBACKQ:
+        case CTLBACKQ|CTLQUOTE:
+            putc('$', fp);
+            putc('(', fp);
+            shtree(bqlist->n, -1, NULL, fp);
+            putc(')', fp);
+            break;
+        default:
+            putc(*p, fp);
+            break;
+        }
+    }
+}
+static void
+indent(amount, pfx, fp)
+    int amount;
+    char *pfx;
+    FILE *fp;
+{
+    int i;
+    for (i = 0 ; i < amount ; i++) {
+        if (pfx && i == amount - 1)
+            fputs(pfx, fp);
+        putc('\t', fp);
+    }
+}
+#endif
+/*
+ * Debugging stuff.
+ */
+FILE *tracefile;
+#if DEBUG == 2
+int debug = 1;
+#else
+int debug = 0;
+#endif
+#ifdef DEBUG
+void
+trputc(c)
+    int c;
+{
+    if (tracefile == NULL)
+        return;
+    putc(c, tracefile);
+    if (c == '\n')
+        fflush(tracefile);
+}
+#endif
+void
+#ifdef __STDC__
+trace(const char *fmt, ...)
+#else
+trace(va_alist)
+    va_dcl
+#endif
+{
+#ifdef DEBUG
+    va_list va;
+#ifdef __STDC__
+    va_start(va, fmt);
+#else
+    char *fmt;
+    va_start(va);
+    fmt = va_arg(va, char *);
+#endif
+    if (tracefile != NULL) {
+        (void) vfprintf(tracefile, fmt, va);
+        if (strchr(fmt, '\n'))
+            (void) fflush(tracefile);
+    }
+    va_end(va);
+#endif
+}
+#ifdef DEBUG
+void
+trputs(s)
+    const char *s;
+{
+    if (tracefile == NULL)
+        return;
+    fputs(s, tracefile);
+    if (strchr(s, '\n'))
+        fflush(tracefile);
+}
+static void
+trstring(s)
+    char *s;
+{
+    char *p;
+    char c;
+    if (tracefile == NULL)
+        return;
+    putc('"', tracefile);
+    for (p = s ; *p ; p++) {
+        switch (*p) {
+        case '\n':  c = 'n';  goto backslash;
+        case '\t':  c = 't';  goto backslash;
+        case '\r':  c = 'r';  goto backslash;
+        case '"':  c = '"';  goto backslash;
+        case '\\':  c = '\\';  goto backslash;
+        case CTLESC:  c = 'e';  goto backslash;
+        case CTLVAR:  c = 'v';  goto backslash;
+        case CTLVAR+CTLQUOTE:  c = 'V';  goto backslash;
+        case CTLBACKQ:  c = 'q';  goto backslash;
+        case CTLBACKQ+CTLQUOTE:  c = 'Q';  goto backslash;
+backslash:    putc('\\', tracefile);
+            putc(c, tracefile);
+            break;
+        default:
+            if (*p >= ' ' && *p <= '~')
+                putc(*p, tracefile);
+            else {
+                putc('\\', tracefile);
+                putc(*p >> 6 & 03, tracefile);
+                putc(*p >> 3 & 07, tracefile);
+                putc(*p & 07, tracefile);
+            }
+            break;
+        }
+    }
+    putc('"', tracefile);
+}
+#endif
+void
+trargs(ap)
+    char **ap;
+{
+#ifdef DEBUG
+    if (tracefile == NULL)
+        return;
+    while (*ap) {
+        trstring(*ap++);
+        if (*ap)
+            putc(' ', tracefile);
+        else
+            putc('\n', tracefile);
+    }
+    fflush(tracefile);
+#endif
+}
+#ifdef DEBUG
+void
+opentrace() {
+    char s[100];
+#ifdef O_APPEND
+    int flags;
+#endif
+    if (!debug)
+        return;
+#ifdef not_this_way
+    {
+        char *p;
+        if ((p = getenv("HOME")) == NULL) {
+            if (geteuid() == 0)
+                p = "/";
+            else
+                p = "/tmp";
+        }
+        scopy(p, s);
+        strcat(s, "/trace");
+    }
+#else
+    scopy("./trace", s);
+#endif /* not_this_way */
+    if ((tracefile = fopen(s, "a")) == NULL) {
+        fprintf(stderr, "Can't open %s\n", s);
+        return;
+    }
+#ifdef O_APPEND
+    if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0)
+        fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
+#endif
+    fputs("\nTracing started.\n", tracefile);
+    fflush(tracefile);
+}
+#endif /* DEBUG */

 /trunk/uspace/app/ash/mystring.h
 ,0 → 1,49
+/*  $NetBSD: mystring.h,v 1.9 1995/05/11 21:29:42 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)mystring.h  8.2 (Berkeley) 5/4/95
+ */
+#include <string.h>
+void scopyn (const char *, char *, int);
+int prefix (const char *, const char *);
+int number (const char *);
+int is_number (const char *);
+#define equal(s1, s2)   (strcmp(s1, s2) == 0)
+#define scopy(s1, s2)   ((void)strcpy(s2, s1))

 /trunk/uspace/app/ash/show.h
 ,0 → 1,46
+/*  $NetBSD: show.h,v 1.4 1999/10/08 21:10:44 pk Exp $  */
+/*-
+ * Copyright (c) 1995
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)show.h  1.1 (Berkeley) 5/4/95
+ */
+union node;
+void showtree (union node *);
+void trace (const char *, ...);
+void trargs (char **);
+#ifdef DEBUG
+void trputc (int);
+void trputs (const char *);
+void opentrace (void);
+#endif

 /trunk/uspace/app/ash/myhistedit.h
 ,0 → 1,50
+/*  $NetBSD: myhistedit.h,v 1.7 1999/07/09 03:05:50 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)myhistedit.h    8.2 (Berkeley) 5/4/95
+ */
+#include <histedit.h>
+extern History *hist;
+extern EditLine *el;
+extern int displayhist;
+void histedit (void);
+void sethistsize (const char *);
+void setterm (const char *);
+int histcmd (int, char **);
+int not_fcnumber (char *);
+int str_to_event (const char *, int);

 /trunk/uspace/app/ash/arith_lex.l
 ,0 → 1,95
+%{
+/*  $NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $");
+#endif
+#endif /* not lint */
+#include <unistd.h>
+#include "arith.h"
+#include "error.h"
+#include "expand.h"
+extern int yylval;
+extern char *arith_buf, *arith_startbuf;
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max) \
+    result = (*buf = *arith_buf++) ? 1 : YY_NULL;
+#define YY_NO_UNPUT
+%}
+%%
+[ \t\n] { ; }
+[0-9]+  { yylval = atol(yytext); return(ARITH_NUM); }
+"(" { return(ARITH_LPAREN); }
+")" { return(ARITH_RPAREN); }
+"||"    { return(ARITH_OR); }
+"&&"    { return(ARITH_AND); }
+"|" { return(ARITH_BOR); }
+"^" { return(ARITH_BXOR); }
+"&" { return(ARITH_BAND); }
+"=="    { return(ARITH_EQ); }
+"!="    { return(ARITH_NE); }
+">" { return(ARITH_GT); }
+">="    { return(ARITH_GE); }
+"<" { return(ARITH_LT); }
+"<="    { return(ARITH_LE); }
+"<<"    { return(ARITH_LSHIFT); }
+">>"    { return(ARITH_RSHIFT); }
+"*" { return(ARITH_MUL); }
+"/" { return(ARITH_DIV); }
+"%" { return(ARITH_REM); }
+"+" { return(ARITH_ADD); }
+"-" { return(ARITH_SUB); }
+"~" { return(ARITH_BNOT); }
+"!" { return(ARITH_NOT); }
+.   { error("arith: syntax error: \"%s\"\n", arith_startbuf); }
+%%
+void
+arith_lex_reset() {
+#ifdef YY_NEW_FILE
+    YY_NEW_FILE;
+#endif
+}

 /trunk/uspace/app/ash/funcs/dirs
 ,0 → 1,74
+#   $NetBSD: dirs,v 1.7 1995/05/11 21:31:08 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)dirs    8.2 (Berkeley) 5/4/95
+# pushd, popd, and dirs --- written by Chris Bertin
+# Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
+# as modified by Patrick Elam of GTRI and Kenneth Almquist at UW
+pushd () {
+    SAVE=`pwd`
+    if [ "$1" = "" ]
+    then    if [ "$DSTACK" = "" ]
+        then    echo "pushd: directory stack empty."
+            return 1
+        fi
+        set $DSTACK
+        cd $1 || return
+        shift 1
+        DSTACK="$*"
+    else    cd $1 > /dev/null || return
+    fi
+    DSTACK="$SAVE $DSTACK"
+    dirs
+}
+popd () {
+    if [ "$DSTACK" = "" ]
+    then    echo "popd: directory stack empty."
+        return 1
+    fi
+    set $DSTACK
+    cd $1
+    shift
+    DSTACK=$*
+    dirs
+}
+dirs () {
+    echo "`pwd` $DSTACK"
+    return 0
+}

 /trunk/uspace/app/ash/funcs/suspend
 ,0 → 1,42
+#   $NetBSD: suspend,v 1.7 1995/05/11 21:31:17 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)suspend 8.2 (Berkeley) 5/4/95
+suspend() {
+    local -
+    set +j
+    kill -TSTP 0
+}

 /trunk/uspace/app/ash/funcs/newgrp
 ,0 → 1,38
+#   $NetBSD: newgrp,v 1.7 1995/05/11 21:31:12 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)newgrp  8.2 (Berkeley) 5/4/95
+newgrp() exec newgrp "$@"

 /trunk/uspace/app/ash/funcs/popd
 ,0 → 1,74
+#   $NetBSD: popd,v 1.7 1995/05/11 21:31:13 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)popd    8.2 (Berkeley) 5/4/95
+# pushd, popd, and dirs --- written by Chris Bertin
+# Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
+# as modified by Patrick Elam of GTRI and Kenneth Almquist at UW
+pushd () {
+    SAVE=`pwd`
+    if [ "$1" = "" ]
+    then    if [ "$DSTACK" = "" ]
+        then    echo "pushd: directory stack empty."
+            return 1
+        fi
+        set $DSTACK
+        cd $1 || return
+        shift 1
+        DSTACK="$*"
+    else    cd $1 > /dev/null || return
+    fi
+    DSTACK="$SAVE $DSTACK"
+    dirs
+}
+popd () {
+    if [ "$DSTACK" = "" ]
+    then    echo "popd: directory stack empty."
+        return 1
+    fi
+    set $DSTACK
+    cd $1
+    shift
+    DSTACK=$*
+    dirs
+}
+dirs () {
+    echo "`pwd` $DSTACK"
+    return 0
+}

 /trunk/uspace/app/ash/funcs/pushd
 ,0 → 1,74
+#   $NetBSD: pushd,v 1.7 1995/05/11 21:31:15 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)pushd   8.2 (Berkeley) 5/4/95
+# pushd, popd, and dirs --- written by Chris Bertin
+# Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
+# as modified by Patrick Elam of GTRI and Kenneth Almquist at UW
+pushd () {
+    SAVE=`pwd`
+    if [ "$1" = "" ]
+    then    if [ "$DSTACK" = "" ]
+        then    echo "pushd: directory stack empty."
+            return 1
+        fi
+        set $DSTACK
+        cd $1 || return
+        shift 1
+        DSTACK="$*"
+    else    cd $1 > /dev/null || return
+    fi
+    DSTACK="$SAVE $DSTACK"
+    dirs
+}
+popd () {
+    if [ "$DSTACK" = "" ]
+    then    echo "popd: directory stack empty."
+        return 1
+    fi
+    set $DSTACK
+    cd $1
+    shift
+    DSTACK=$*
+    dirs
+}
+dirs () {
+    echo "`pwd` $DSTACK"
+    return 0
+}

 /trunk/uspace/app/ash/funcs/cmv
 ,0 → 1,50
+#   $NetBSD: cmv,v 1.7 1995/05/11 21:31:05 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)cmv 8.2 (Berkeley) 5/4/95
+# Conditional move--don't replace an existing file.
+cmv() {
+    if test $# != 2
+    then    echo "cmv: arg count"
+        return 2
+    fi
+    if test -f "$2" -o -w "$2"
+    then    echo "$2 exists"
+        return 2
+    fi
+    /bin/mv "$1" "$2"
+}

 /trunk/uspace/app/ash/funcs/login
 ,0 → 1,39
+#   $NetBSD: login,v 1.7 1995/05/11 21:31:11 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)login   8.2 (Berkeley) 5/4/95
+# replaces the login builtin in the BSD shell
+login () exec login "$@"

 /trunk/uspace/app/ash/funcs/kill
 ,0 → 1,50
+#   $NetBSD: kill,v 1.7 1995/05/11 21:31:10 christos Exp $
+# Copyright (c) 1991, 1993
+#   The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#   This product includes software developed by the University of
+#   California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#   @(#)kill    8.2 (Berkeley) 5/4/95
+# Convert job names to process ids and then run /bin/kill.
+kill() {
+    local args x
+    args=
+    for x in "$@"
+    do  case $x in
+        %*) x=`jobid "$x"` ;;
+        esac
+        args="$args $x"
+    done
+    /bin/kill $args
+}

 /trunk/uspace/app/ash/input.c
 ,0 → 1,531
+/*  $NetBSD: input.c,v 1.34 2000/05/22 10:18:47 elric Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
+#else
+__RCSID("$NetBSD: input.c,v 1.34 2000/05/22 10:18:47 elric Exp $");
+#endif
+#endif /* not lint */
+#include <stdio.h>  /* defines BUFSIZ */
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+/*
+ * This file implements the input routines used by the parser.
+ */
+#include "shell.h"
+#include "redir.h"
+#include "syntax.h"
+#include "input.h"
+#include "output.h"
+#include "options.h"
+#include "memalloc.h"
+#include "error.h"
+#include "alias.h"
+#include "parser.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#endif
+#ifdef HETIO
+#include "hetio.h"
+#endif
+#define EOF_NLEFT -99       /* value of parsenleft when EOF pushed back */
+MKINIT
+struct strpush {
+    struct strpush *prev;   /* preceding string on stack */
+    char *prevstring;
+    int prevnleft;
+    int prevlleft;
+    struct alias *ap;   /* if push was associated with an alias */
+};
+/*
+ * The parsefile structure pointed to by the global variable parsefile
+ * contains information about the current file being read.
+ */
+MKINIT
+struct parsefile {
+    struct parsefile *prev; /* preceding file on stack */
+    int linno;      /* current line */
+    int fd;         /* file descriptor (or -1 if string) */
+    int nleft;      /* number of chars left in this line */
+    int lleft;      /* number of chars left in this buffer */
+    char *nextc;        /* next char in buffer */
+    char *buf;      /* input buffer */
+    struct strpush *strpush; /* for pushing strings at this level */
+    struct strpush basestrpush; /* so pushing one is fast */
+};
+int plinno = 1;         /* input line number */
+MKINIT int parsenleft;      /* copy of parsefile->nleft */
+MKINIT int parselleft;      /* copy of parsefile->lleft */
+char *parsenextc;       /* copy of parsefile->nextc */
+MKINIT struct parsefile basepf; /* top level input file */
+char basebuf[BUFSIZ];       /* buffer for top level input file */
+struct parsefile *parsefile = &basepf;  /* current input file */
+int init_editline = 0;      /* editline library initialized? */
+int whichprompt;        /* 1 == PS1, 2 == PS2 */
+#ifndef SMALL
+EditLine *el;           /* cookie for editline package */
+#endif
+STATIC void pushfile (void);
+static int preadfd (void);
+#ifdef mkinit
+INCLUDE "input.h"
+INCLUDE "error.h"
+INIT {
+    extern char basebuf[];
+    basepf.nextc = basepf.buf = basebuf;
+}
+RESET {
+    if (exception != EXSHELLPROC)
+        parselleft = parsenleft = 0;    /* clear input buffer */
+    popallfiles();
+}
+SHELLPROC {
+    popallfiles();
+}
+#endif
+/*
+ * Read a line from the script.
+ */
+char *
+pfgets(line, len)
+    char *line;
+    int len;
+{
+    char *p = line;
+    int nleft = len;
+    int c;
+    while (--nleft > 0) {
+        c = pgetc_macro();
+        if (c == PEOF) {
+            if (p == line)
+                return NULL;
+            break;
+        }
+        *p++ = c;
+        if (c == '\n')
+            break;
+    }
+    *p = '\0';
+    return line;
+}
+/*
+ * Read a character from the script, returning PEOF on end of file.
+ * Nul characters in the input are silently discarded.
+ */
+int
+pgetc()
+{
+    return pgetc_macro();
+}
+static int
+preadfd()
+{
+    int nr;
+    char *buf =  parsefile->buf;
+    parsenextc = buf;
+retry:
+#ifndef SMALL
+    if (parsefile->fd == 0 && el) {
+        const char *rl_cp;
+        rl_cp = el_gets(el, &nr);
+        if (rl_cp == NULL)
+            nr = 0;
+        else {
+            /* XXX - BUFSIZE should redesign so not necessary */
+            (void) strcpy(buf, rl_cp);
+        }
+    } else
+#endif
+#ifdef HETIO
+        nr = hetio_read_input(parsefile->fd);
+        if (nr == -255)
+#endif
+        nr = read(parsefile->fd, buf, BUFSIZ - 1);
+    if (nr <= 0) {
+                if (nr < 0) {
+                        if (errno == EINTR)
+                                goto retry;
+                        if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
+                                int flags = fcntl(0, F_GETFL, 0);
+                                if (flags >= 0 && flags & O_NONBLOCK) {
+                                        flags &=~ O_NONBLOCK;
+                                        if (fcntl(0, F_SETFL, flags) >= 0) {
+                        out2str("sh: turning off NDELAY mode\n");
+                                                goto retry;
+                                        }
+                                }
+                        }
+                }
+                nr = -1;
+    }
+    return nr;
+}
+/*
+ * Refill the input buffer and return the next input character:
+ *
+ * 1) If a string was pushed back on the input, pop it;
+ * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
+ *    from a string so we can't refill the buffer, return EOF.
+ * 3) If the is more stuff in this buffer, use it else call read to fill it.
+ * 4) Process input up to the next newline, deleting nul characters.
+ */
+int
+preadbuffer()
+{
+    char *p, *q;
+    int more;
+    int something;
+    char savec;
+    if (parsefile->strpush) {
+        popstring();
+        if (--parsenleft >= 0)
+            return (*parsenextc++);
+    }
+    if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
+        return PEOF;
+    flushout(&output);
+    flushout(&errout);
+again:
+    if (parselleft <= 0) {
+        if ((parselleft = preadfd()) == -1) {
+            parselleft = parsenleft = EOF_NLEFT;
+            return PEOF;
+        }
+    }
+    q = p = parsenextc;
+    /* delete nul characters */
+    something = 0;
+    for (more = 1; more;) {
+        switch (*p) {
+        case '\0':
+            p++;    /* Skip nul */
+            goto check;
+        case '\t':
+        case ' ':
+            break;
+        case '\n':
+            parsenleft = q - parsenextc;
+            more = 0; /* Stop processing here */
+            break;
+        default:
+            something = 1;
+            break;
+        }
+        *q++ = *p++;
+check:
+        if (--parselleft <= 0) {
+            parsenleft = q - parsenextc - 1;
+            if (parsenleft < 0)
+                goto again;
+            *q = '\0';
+            more = 0;
+        }
+    }
+    savec = *q;
+    *q = '\0';
+#ifndef SMALL
+    if (parsefile->fd == 0 && hist && something) {
+        HistEvent he;
+        INTOFF;
+        history(hist, &he, whichprompt == 1? H_ENTER : H_APPEND,
+            parsenextc);
+        INTON;
+    }
+#endif
+    if (vflag) {
+        out2str(parsenextc);
+        flushout(out2);
+    }
+    *q = savec;
+    return *parsenextc++;
+}
+/*
+ * Undo the last call to pgetc.  Only one character may be pushed back.
+ * PEOF may be pushed back.
+ */
+void
+pungetc() {
+    parsenleft++;
+    parsenextc--;
+}
+/*
+ * Push a string back onto the input at this current parsefile level.
+ * We handle aliases this way.
+ */
+void
+pushstring(s, len, ap)
+    char *s;
+    int len;
+    void *ap;
+    {
+    struct strpush *sp;
+    INTOFF;
+/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+    if (parsefile->strpush) {
+        sp = ckmalloc(sizeof (struct strpush));
+        sp->prev = parsefile->strpush;
+        parsefile->strpush = sp;
+    } else
+        sp = parsefile->strpush = &(parsefile->basestrpush);
+    sp->prevstring = parsenextc;
+    sp->prevnleft = parsenleft;
+    sp->prevlleft = parselleft;
+    sp->ap = (struct alias *)ap;
+    if (ap)
+        ((struct alias *)ap)->flag |= ALIASINUSE;
+    parsenextc = s;
+    parsenleft = len;
+    INTON;
+}
+void
+popstring()
+{
+    struct strpush *sp = parsefile->strpush;
+    INTOFF;
+    parsenextc = sp->prevstring;
+    parsenleft = sp->prevnleft;
+    parselleft = sp->prevlleft;
+/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+    if (sp->ap)
+        sp->ap->flag &= ~ALIASINUSE;
+    parsefile->strpush = sp->prev;
+    if (sp != &(parsefile->basestrpush))
+        ckfree(sp);
+    INTON;
+}
+/*
+ * Set the input to take input from a file.  If push is set, push the
+ * old input onto the stack first.
+ */
+void
+setinputfile(fname, push)
+    const char *fname;
+    int push;
+{
+    int fd;
+    int fd2;
+    INTOFF;
+    if ((fd = open(fname, O_RDONLY)) < 0)
+        error("Can't open %s", fname);
+    if (fd < 10) {
+        fd2 = copyfd(fd, 10);
+        close(fd);
+        if (fd2 < 0)
+            error("Out of file descriptors");
+        fd = fd2;
+    }
+    setinputfd(fd, push);
+    INTON;
+}
+/*
+ * Like setinputfile, but takes an open file descriptor.  Call this with
+ * interrupts off.
+ */
+void
+setinputfd(fd, push)
+    int fd, push;
+{
+    (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
+    if (push) {
+        pushfile();
+        parsefile->buf = ckmalloc(BUFSIZ);
+    }
+    if (parsefile->fd > 0)
+        close(parsefile->fd);
+    parsefile->fd = fd;
+    if (parsefile->buf == NULL)
+        parsefile->buf = ckmalloc(BUFSIZ);
+    parselleft = parsenleft = 0;
+    plinno = 1;
+}
+/*
+ * Like setinputfile, but takes input from a string.
+ */
+void
+setinputstring(string, push)
+    char *string;
+    int push;
+    {
+    INTOFF;
+    if (push)
+        pushfile();
+    parsenextc = string;
+    parselleft = parsenleft = strlen(string);
+    parsefile->buf = NULL;
+    plinno = 1;
+    INTON;
+}
+/*
+ * To handle the "." command, a stack of input files is used.  Pushfile
+ * adds a new entry to the stack and popfile restores the previous level.
+ */
+STATIC void
+pushfile() {
+    struct parsefile *pf;
+    parsefile->nleft = parsenleft;
+    parsefile->lleft = parselleft;
+    parsefile->nextc = parsenextc;
+    parsefile->linno = plinno;
+    pf = (struct parsefile *)ckmalloc(sizeof (struct parsefile));
+    pf->prev = parsefile;
+    pf->fd = -1;
+    pf->strpush = NULL;
+    pf->basestrpush.prev = NULL;
+    parsefile = pf;
+}
+void
+popfile() {
+    struct parsefile *pf = parsefile;
+    INTOFF;
+    if (pf->fd >= 0)
+        close(pf->fd);
+    if (pf->buf)
+        ckfree(pf->buf);
+    while (pf->strpush)
+        popstring();
+    parsefile = pf->prev;
+    ckfree(pf);
+    parsenleft = parsefile->nleft;
+    parselleft = parsefile->lleft;
+    parsenextc = parsefile->nextc;
+    plinno = parsefile->linno;
+    INTON;
+}
+/*
+ * Return to top level.
+ */
+void
+popallfiles() {
+    while (parsefile != &basepf)
+        popfile();
+}
+/*
+ * Close the file(s) that the shell is reading commands from.  Called
+ * after a fork is done.
+ */
+void
+closescript() {
+    popallfiles();
+    if (parsefile->fd > 0) {
+        close(parsefile->fd);
+        parsefile->fd = 0;
+    }
+}

 /trunk/uspace/app/ash/input.h
 ,0 → 1,66
+/*  $NetBSD: input.h,v 1.12 2000/05/22 10:18:47 elric Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)input.h 8.2 (Berkeley) 5/4/95
+ */
+/* PEOF (the end of file marker) is defined in syntax.h */
+/*
+ * The input line number.  Input.c just defines this variable, and saves
+ * and restores it when files are pushed and popped.  The user of this
+ * package must set its value.
+ */
+extern int plinno;
+extern int parsenleft;      /* number of characters left in input buffer */
+extern char *parsenextc;    /* next character in input buffer */
+extern int init_editline;   /* 0 == not setup, 1 == OK, -1 == failed */
+char *pfgets (char *, int);
+int pgetc (void);
+int preadbuffer (void);
+void pungetc (void);
+void pushstring (char *, int, void *);
+void popstring (void);
+void setinputfile (const char *, int);
+void setinputfd (int, int);
+void setinputstring (char *, int);
+void popfile (void);
+void popallfiles (void);
+void closescript (void);
+#define pgetc_macro()   (--parsenleft >= 0? *parsenextc++ : preadbuffer())

 /trunk/uspace/app/ash/redir.c
 ,0 → 1,492
+/*  $NetBSD: redir.c,v 1.22 2000/05/22 10:18:47 elric Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: redir.c,v 1.22 2000/05/22 10:18:47 elric Exp $");
+#endif
+#endif /* not lint */
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/param.h>  /* PIPE_BUF */
+#include <signal.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+/*
+ * Code for dealing with input/output redirection.
+ */
+#include "shell.h"
+#include "nodes.h"
+#include "jobs.h"
+#include "expand.h"
+#include "redir.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "options.h"
+#define EMPTY -2        /* marks an unused slot in redirtab */
+#ifndef PIPE_BUF
+# define PIPESIZE 4096      /* amount of buffering in a pipe */
+#else
+# define PIPESIZE PIPE_BUF
+#endif
+MKINIT
+struct redirtab {
+    struct redirtab *next;
+    short renamed[10];
+};
+MKINIT struct redirtab *redirlist;
+/*
+ * We keep track of whether or not fd0 has been redirected.  This is for
+ * background commands, where we want to redirect fd0 to /dev/null only
+ * if it hasn't already been redirected.
+*/
+int fd0_redirected = 0;
+/*
+ * We also keep track of where fd2 goes.
+ */
+int fd2 = 2;
+STATIC int openredirect (union node *);
+STATIC void dupredirect (union node *, int, char[10 ]);
+STATIC int openhere (union node *);
+STATIC int noclobberopen (const char *);
+/*
+ * Process a list of redirection commands.  If the REDIR_PUSH flag is set,
+ * old file descriptors are stashed away so that the redirection can be
+ * undone by calling popredir.  If the REDIR_BACKQ flag is set, then the
+ * standard output, and the standard error if it becomes a duplicate of
+ * stdout, is saved in memory.
+ */
+void
+redirect(redir, flags)
+    union node *redir;
+    int flags;
+    {
+    union node *n;
+    struct redirtab *sv = NULL;
+    int i;
+    int fd;
+    int newfd;
+    int try;
+    char memory[10];    /* file descriptors to write to memory */
+    for (i = 10 ; --i >= 0 ; )
+        memory[i] = 0;
+    memory[1] = flags & REDIR_BACKQ;
+    if (flags & REDIR_PUSH) {
+        sv = ckmalloc(sizeof (struct redirtab));
+        for (i = 0 ; i < 10 ; i++)
+            sv->renamed[i] = EMPTY;
+        sv->next = redirlist;
+        redirlist = sv;
+    }
+    for (n = redir ; n ; n = n->nfile.next) {
+        fd = n->nfile.fd;
+        try = 0;
+        if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
+            n->ndup.dupfd == fd)
+            continue; /* redirect from/to same file descriptor */
+        INTOFF;
+        newfd = openredirect(n);
+        if (((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) ||
+            (fd == fd2)) {
+            if (newfd == fd) {
+                try++;
+            } else if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+                switch (errno) {
+                case EBADF:
+                    if (!try) {
+                        dupredirect(n, newfd, memory);
+                        try++;
+                        break;
+                    }
+                    /* FALLTHROUGH*/
+                default:
+                    if (newfd >= 0) {
+                        close(newfd);
+                    }
+                    INTON;
+                    error("%d: %s", fd, strerror(errno));
+                    /* NOTREACHED */
+                }
+            }
+            if (!try) {
+                close(fd);
+                if (flags & REDIR_PUSH) {
+                    sv->renamed[fd] = i;
+                }
+                if (fd == fd2) {
+                    fd2 = i;
+                }
+            }
+        } else if (fd != newfd) {
+            close(fd);
+        }
+                if (fd == 0)
+                        fd0_redirected++;
+        if (!try)
+            dupredirect(n, newfd, memory);
+        INTON;
+    }
+    if (memory[1])
+        out1 = &memout;
+    if (memory[2])
+        out2 = &memout;
+}
+STATIC int
+openredirect(redir)
+    union node *redir;
+    {
+    char *fname;
+    int f;
+    switch (redir->nfile.type) {
+    case NFROM:
+        fname = redir->nfile.expfname;
+        if ((f = open(fname, O_RDONLY)) < 0)
+            goto eopen;
+        break;
+    case NFROMTO:
+        fname = redir->nfile.expfname;
+        if ((f = open(fname, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
+            goto ecreate;
+        break;
+    case NTO:
+        /* Take care of noclobber mode. */
+        if (Cflag) {
+            fname = redir->nfile.expfname;
+            if ((f = noclobberopen(fname)) < 0)
+                goto ecreate;
+            break;
+        }
+    case NTOOV:
+        fname = redir->nfile.expfname;
+#ifdef O_CREAT
+        if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
+            goto ecreate;
+#else
+        if ((f = creat(fname, 0666)) < 0)
+            goto ecreate;
+#endif
+        break;
+    case NAPPEND:
+        fname = redir->nfile.expfname;
+#ifdef O_APPEND
+        if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
+            goto ecreate;
+#else
+        if ((f = open(fname, O_WRONLY)) < 0
+         && (f = creat(fname, 0666)) < 0)
+            goto ecreate;
+        lseek(f, (off_t)0, 2);
+#endif
+        break;
+    case NTOFD:
+    case NFROMFD:
+        f = -1;
+        break;
+    case NHERE:
+    case NXHERE:
+        f = openhere(redir);
+        break;
+    default:
+        abort();
+    }
+    return f;
+ecreate:
+    error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+eopen:
+    error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
+}
+STATIC void
+dupredirect(redir, f, memory)
+    union node *redir;
+    int f;
+    char memory[10];
+    {
+    int fd = redir->nfile.fd;
+    memory[fd] = 0;
+    if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
+        if (redir->ndup.dupfd >= 0) {   /* if not ">&-" */
+            if (memory[redir->ndup.dupfd])
+                memory[fd] = 1;
+            else
+                copyfd(redir->ndup.dupfd, fd);
+        }
+        return;
+    }
+    if (f != fd) {
+        copyfd(f, fd);
+        close(f);
+    }
+    return;
+}
+/*
+ * Handle here documents.  Normally we fork off a process to write the
+ * data to a pipe.  If the document is short, we can stuff the data in
+ * the pipe without forking.
+ */
+STATIC int
+openhere(redir)
+    union node *redir;
+    {
+    int pip[2];
+    int len = 0;
+    if (pipe(pip) < 0)
+        error("Pipe call failed");
+    if (redir->type == NHERE) {
+        len = strlen(redir->nhere.doc->narg.text);
+        if (len <= PIPESIZE) {
+            xwrite(pip[1], redir->nhere.doc->narg.text, len);
+            goto out;
+        }
+    }
+    if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
+        close(pip[0]);
+        signal(SIGINT, SIG_IGN);
+        signal(SIGQUIT, SIG_IGN);
+        signal(SIGHUP, SIG_IGN);
+#ifdef SIGTSTP
+        signal(SIGTSTP, SIG_IGN);
+#endif
+        signal(SIGPIPE, SIG_DFL);
+        if (redir->type == NHERE)
+            xwrite(pip[1], redir->nhere.doc->narg.text, len);
+        else
+            expandhere(redir->nhere.doc, pip[1]);
+        _exit(0);
+    }
+out:
+    close(pip[1]);
+    return pip[0];
+}
+/*
+ * Undo the effects of the last redirection.
+ */
+void
+popredir() {
+    struct redirtab *rp = redirlist;
+    int i;
+    INTOFF;
+    for (i = 0 ; i < 10 ; i++) {
+        if (rp->renamed[i] != EMPTY) {
+                        if (i == 0)
+                                fd0_redirected--;
+            close(i);
+            if (rp->renamed[i] >= 0) {
+                copyfd(rp->renamed[i], i);
+                close(rp->renamed[i]);
+            }
+            if (rp->renamed[i] == fd2) {
+                fd2 = i;
+            }
+        }
+    }
+    redirlist = rp->next;
+    ckfree(rp);
+    INTON;
+}
+/*
+ * Undo all redirections.  Called on error or interrupt.
+ */
+#ifdef mkinit
+INCLUDE "redir.h"
+RESET {
+    while (redirlist)
+        popredir();
+}
+SHELLPROC {
+    clearredir();
+}
+#endif
+/* Return true if fd 0 has already been redirected at least once.  */
+int
+fd0_redirected_p () {
+        return fd0_redirected != 0;
+}
+/*
+ * Discard all saved file descriptors.
+ */
+void
+clearredir() {
+    struct redirtab *rp;
+    int i;
+    for (rp = redirlist ; rp ; rp = rp->next) {
+        for (i = 0 ; i < 10 ; i++) {
+            if (rp->renamed[i] >= 0) {
+                close(rp->renamed[i]);
+                if (rp->renamed[i] == fd2) {
+                    fd2 = -1;
+                }
+            }
+            rp->renamed[i] = EMPTY;
+        }
+    }
+}
+/*
+ * Copy a file descriptor to be >= to.  Returns -1
+ * if the source file descriptor is closed, EMPTY if there are no unused
+ * file descriptors left.
+ */
+int
+copyfd(from, to)
+    int from;
+    int to;
+{
+    int newfd;
+    newfd = fcntl(from, F_DUPFD, to);
+    if (newfd < 0) {
+        if (errno == EMFILE)
+            return EMPTY;
+        else
+            error("%d: %s", from, strerror(errno));
+    }
+    return newfd;
+}
+/*
+ * Open a file in noclobber mode.
+ * The code was copied from bash.
+ */
+int
+noclobberopen(fname)
+    const char *fname;
+{
+    int r, fd;
+    struct stat finfo, finfo2;
+    /*
+     * If the file exists and is a regular file, return an error
+     * immediately.
+     */
+    r = stat(fname, &finfo);
+    if (r == 0 && S_ISREG(finfo.st_mode)) {
+        errno = EEXIST;
+        return -1;
+    }
+    /*
+     * If the file was not present (r != 0), make sure we open it
+     * exclusively so that if it is created before we open it, our open
+     * will fail.  Make sure that we do not truncate an existing file.
+     * Note that we don't turn on O_EXCL unless the stat failed -- if the
+     * file was not a regular file, we leave O_EXCL off.
+     */
+    if (r != 0)
+        return open(fname, O_WRONLY|O_CREAT|O_EXCL, 0666);
+    fd = open(fname, O_WRONLY|O_CREAT, 0666);
+    /* If the open failed, return the file descriptor right away. */
+    if (fd < 0)
+        return fd;
+    /*
+     * OK, the open succeeded, but the file may have been changed from a
+     * non-regular file to a regular file between the stat and the open.
+     * We are assuming that the O_EXCL open handles the case where FILENAME
+     * did not exist and is symlinked to an existing file between the stat
+     * and open.
+     */
+    /*
+     * If we can open it and fstat the file descriptor, and neither check
+     * revealed that it was a regular file, and the file has not been
+     * replaced, return the file descriptor.
+     */
+     if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode) &&
+         finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
+        return fd;
+    /* The file has been replaced.  badness. */
+    close(fd);
+    errno = EEXIST;
+    return -1;
+}

 /trunk/uspace/app/ash/trap.c
 ,0 → 1,401
+/*  $NetBSD: trap.c,v 1.24 2000/05/22 10:18:47 elric Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)trap.c  8.5 (Berkeley) 6/5/95";
+#else
+__RCSID("$NetBSD: trap.c,v 1.24 2000/05/22 10:18:47 elric Exp $");
+#endif
+#endif /* not lint */
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "shell.h"
+#include "main.h"
+#include "nodes.h"  /* for other headers */
+#include "eval.h"
+#include "jobs.h"
+#include "show.h"
+#include "options.h"
+#include "syntax.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "trap.h"
+#include "mystring.h"
+#include "mail.h"
+#ifdef HETIO
+#include "hetio.h"
+#endif
+/*
+ * Sigmode records the current value of the signal handlers for the various
+ * modes.  A value of zero means that the current handler is not known.
+ * S_HARD_IGN indicates that the signal was ignored on entry to the shell,
+ */
+#define S_DFL 1         /* default signal handling (SIG_DFL) */
+#define S_CATCH 2       /* signal is caught */
+#define S_IGN 3         /* signal is ignored (SIG_IGN) */
+#define S_HARD_IGN 4        /* signal is ignored permenantly */
+#define S_RESET 5       /* temporary - to reset a hard ignored sig */
+extern char nullstr[1];     /* null string */
+char *trap[NSIG+1];     /* trap handler commands */
+MKINIT char sigmode[NSIG];  /* current value of signal */
+char gotsig[NSIG];      /* indicates specified signal received */
+int pendingsigs;            /* indicates some signal received */
+extern char *signal_names[];
+/*
+ * The trap builtin.
+ */
+int
+trapcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char *action;
+    char **ap;
+    int signo;
+    if (argc <= 1) {
+        for (signo = 0 ; signo <= NSIG ; signo++) {
+            if (trap[signo] != NULL)
+                out1fmt("%d: %s\n", signo, trap[signo]);
+        }
+        return 0;
+    }
+    ap = argv + 1;
+    if (argc == 2)
+        action = NULL;
+    else
+        action = *ap++;
+    while (*ap) {
+        if ((signo = decode_signal(*ap)) < 0)
+            error("%s: bad trap", *ap);
+        INTOFF;
+        if (action) {
+            if (action[0] == '-' && action[1] == '\0')
+                action = NULL;
+            else
+                action = savestr(action);
+        }
+        if (trap[signo])
+            ckfree(trap[signo]);
+        trap[signo] = action;
+        if (signo != 0)
+            setsignal(signo);
+        INTON;
+        ap++;
+    }
+    return 0;
+}
+/*
+ * Clear traps on a fork.
+ */
+void
+clear_traps() {
+    char **tp;
+    for (tp = trap ; tp <= &trap[NSIG] ; tp++) {
+        if (*tp && **tp) {  /* trap not NULL or SIG_IGN */
+            INTOFF;
+            ckfree(*tp);
+            *tp = NULL;
+            if (tp != &trap[0])
+                setsignal(tp - trap);
+            INTON;
+        }
+    }
+}
+/*
+ * Set the signal handler for the specified signal.  The routine figures
+ * out what it should be set to.
+ */
+void
+setsignal(signo)
+    int signo;
+{
+    int action;
+    char *t;
+    struct sigaction act;
+    if ((t = trap[signo]) == NULL)
+        action = S_DFL;
+    else if (*t != '\0')
+        action = S_CATCH;
+    else
+        action = S_IGN;
+    if (rootshell && action == S_DFL) {
+        switch (signo) {
+        case SIGINT:
+            if (iflag || minusc || sflag == 0)
+                action = S_CATCH;
+            break;
+        case SIGQUIT:
+#ifdef DEBUG
+            {
+            extern int debug;
+            if (debug)
+                break;
+            }
+#endif
+            /* FALLTHROUGH */
+        case SIGTERM:
+            if (iflag)
+                action = S_IGN;
+            break;
+#if JOBS
+        case SIGTSTP:
+        case SIGTTOU:
+            if (mflag)
+                action = S_IGN;
+            break;
+#endif
+        }
+    }
+    t = &sigmode[signo - 1];
+    if (*t == 0) {
+        /*
+         * current setting unknown
+         */
+        if (sigaction(signo, 0, &act) == -1) {
+            /*
+             * Pretend it worked; maybe we should give a warning
+             * here, but other shells don't. We don't alter
+             * sigmode, so that we retry every time.
+             */
+            return;
+        }
+        if (act.sa_handler == SIG_IGN) {
+            if (mflag && (signo == SIGTSTP ||
+                 signo == SIGTTIN || signo == SIGTTOU)) {
+                *t = S_IGN; /* don't hard ignore these */
+            } else
+                *t = S_HARD_IGN;
+        } else {
+            *t = S_RESET;   /* force to be set */
+        }
+    }
+    if (*t == S_HARD_IGN || *t == action)
+        return;
+    switch (action) {
+    case S_CATCH:
+        act.sa_handler = onsig;
+        break;
+    case S_IGN:
+        act.sa_handler = SIG_IGN;
+        break;
+    default:
+        act.sa_handler = SIG_DFL;
+    }
+    *t = action;
+    act.sa_flags = 0;
+    sigemptyset(&act.sa_mask);
+    sigaction(signo, &act, 0);
+}
+/*
+ * Ignore a signal.
+ */
+void
+ignoresig(signo)
+    int signo;
+{
+    if (sigmode[signo - 1] != S_IGN && sigmode[signo - 1] != S_HARD_IGN) {
+        signal(signo, SIG_IGN);
+    }
+    sigmode[signo - 1] = S_HARD_IGN;
+}
+#ifdef mkinit
+INCLUDE <signal.h>
+INCLUDE "trap.h"
+SHELLPROC {
+    char *sm;
+    clear_traps();
+    for (sm = sigmode ; sm < sigmode + NSIG ; sm++) {
+        if (*sm == S_IGN)
+            *sm = S_HARD_IGN;
+    }
+}
+#endif
+/*
+ * Signal handler.
+ */
+void
+onsig(signo)
+    int signo;
+{
+    signal(signo, onsig);
+    if (signo == SIGINT && trap[SIGINT] == NULL) {
+        onint();
+        return;
+    }
+    gotsig[signo - 1] = 1;
+    pendingsigs++;
+}
+/*
+ * Called to execute a trap.  Perhaps we should avoid entering new trap
+ * handlers while we are executing a trap handler.
+ */
+void
+dotrap() {
+    int i;
+    int savestatus;
+    for (;;) {
+        for (i = 1 ; ; i++) {
+            if (gotsig[i - 1])
+                break;
+            if (i >= NSIG)
+                goto done;
+        }
+        gotsig[i - 1] = 0;
+        savestatus=exitstatus;
+        evalstring(trap[i], 0);
+        exitstatus=savestatus;
+    }
+done:
+    pendingsigs = 0;
+}
+/*
+ * Controls whether the shell is interactive or not.
+ */
+void
+setinteractive(on)
+    int on;
+{
+    static int is_interactive;
+    if (on == is_interactive)
+        return;
+    setsignal(SIGINT);
+    setsignal(SIGQUIT);
+    setsignal(SIGTERM);
+    chkmail(1);
+    is_interactive = on;
+}
+/*
+ * Called to exit the shell.
+ */
+void
+exitshell(status)
+    int status;
+{
+    struct jmploc loc1, loc2;
+    char *p;
+    TRACE(("exitshell(%d) pid=%d\n", status, getpid()));
+#ifdef HETIO
+    hetio_reset_term();
+#endif
+    if (setjmp(loc1.loc)) {
+        goto l1;
+    }
+    if (setjmp(loc2.loc)) {
+        goto l2;
+    }
+    handler = &loc1;
+    if ((p = trap[0]) != NULL && *p != '\0') {
+        trap[0] = NULL;
+        evalstring(p, 0);
+    }
+l1:   handler = &loc2;          /* probably unnecessary */
+    flushall();
+#if JOBS
+    setjobctl(0);
+#endif
+l2:   _exit(status);
+    /* NOTREACHED */
+}
+int decode_signal(const char *string)
+{
+    int signo;
+    if (is_number(string)) return atoi(string);
+    for (signo=0; signo < NSIG; signo++)
+        if (strcasecmp(string, signal_names[signo]) == 0 ||
+            strcasecmp(string, &(signal_names[signo])[3]) == 0)
+            return signo;
+    return -1;
+}

 /trunk/uspace/app/ash/arith.c
 ,0 → 1,1907
+/* A Bison parser, made by GNU Bison 2.3.  */
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+/* Identify Bison output.  */
+#define YYBISON 1
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+/* Pure parsers.  */
+#define YYPURE 0
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ARITH_NUM = 258,
+     ARITH_LPAREN = 259,
+     ARITH_RPAREN = 260,
+     ARITH_OR = 261,
+     ARITH_AND = 262,
+     ARITH_BOR = 263,
+     ARITH_BXOR = 264,
+     ARITH_BAND = 265,
+     ARITH_NE = 266,
+     ARITH_EQ = 267,
+     ARITH_LE = 268,
+     ARITH_GE = 269,
+     ARITH_GT = 270,
+     ARITH_LT = 271,
+     ARITH_RSHIFT = 272,
+     ARITH_LSHIFT = 273,
+     ARITH_SUB = 274,
+     ARITH_ADD = 275,
+     ARITH_REM = 276,
+     ARITH_DIV = 277,
+     ARITH_MUL = 278,
+     ARITH_BNOT = 279,
+     ARITH_NOT = 280,
+     ARITH_UNARYPLUS = 281,
+     ARITH_UNARYMINUS = 282
+   };
+#endif
+/* Tokens.  */
+#define ARITH_NUM 258
+#define ARITH_LPAREN 259
+#define ARITH_RPAREN 260
+#define ARITH_OR 261
+#define ARITH_AND 262
+#define ARITH_BOR 263
+#define ARITH_BXOR 264
+#define ARITH_BAND 265
+#define ARITH_NE 266
+#define ARITH_EQ 267
+#define ARITH_LE 268
+#define ARITH_GE 269
+#define ARITH_GT 270
+#define ARITH_LT 271
+#define ARITH_RSHIFT 272
+#define ARITH_LSHIFT 273
+#define ARITH_SUB 274
+#define ARITH_ADD 275
+#define ARITH_REM 276
+#define ARITH_DIV 277
+#define ARITH_MUL 278
+#define ARITH_BNOT 279
+#define ARITH_NOT 280
+#define ARITH_UNARYPLUS 281
+#define ARITH_UNARYMINUS 282
+/* Copy the first part of user declarations.  */
+#line 1 "arith.y"
+/*  $NetBSD: arith.y,v 1.13 1999/07/09 03:05:49 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: arith.y,v 1.13 1999/07/09 03:05:49 christos Exp $");
+#endif
+#endif /* not lint */
+#include <stdlib.h>
+#include "expand.h"
+#include "shell.h"
+#include "error.h"
+#include "output.h"
+#include "memalloc.h"
+const char *arith_buf, *arith_startbuf;
+void yyerror (const char *);
+int yyparse (void);
+#ifdef TESTARITH
+int main (int , char *[]);
+int error (char *);
+#endif
+int
+arith(s)
+    const char *s;
+{
+    long result;
+    arith_buf = arith_startbuf = s;
+    INTOFF;
+    result = yyparse();
+    arith_lex_reset();  /* reprime lex */
+    INTON;
+    return (result);
+}
+/*
+ *  The exp(1) builtin.
+ */
+int
+expcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    const char *p;
+    char *concat;
+    char **ap;
+    long i;
+    if (argc > 1) {
+        p = argv[1];
+        if (argc > 2) {
+            /*
+             * concatenate arguments
+             */
+            STARTSTACKSTR(concat);
+            ap = argv + 2;
+            for (;;) {
+                while (*p)
+                    STPUTC(*p++, concat);
+                if ((p = *ap++) == NULL)
+                    break;
+                STPUTC(' ', concat);
+            }
+            STPUTC('\0', concat);
+            p = grabstackstr(concat);
+        }
+    } else
+        p = "";
+    i = arith(p);
+    out1fmt("%ld\n", i);
+    return (! i);
+}
+/*************************/
+#ifdef TEST_ARITH
+#include <stdio.h>
+main(argc, argv)
+    char *argv[];
+{
+    printf("%d\n", exp(argv[1]));
+}
+error(s)
+    char *s;
+{
+    fprintf(stderr, "exp: %s\n", s);
+    exit(1);
+}
+#endif
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+/* Copy the second part of user declarations.  */
+/* Line 216 of yacc.c.  */
+#line 298 "y.tab.c"
+#ifdef short
+# undef short
+#endif
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+#if ! defined yyoverflow || YYERROR_VERBOSE
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+         && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+     || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)      \
+      do                    \
+    {                   \
+      YYSIZE_T yyi;             \
+      for (yyi = 0; yyi < (Count); yyi++)   \
+        (To)[yyi] = (From)[yyi];        \
+    }                   \
+      while (YYID (0))
+#  endif
+# endif
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)                    \
+    do                                  \
+      {                                 \
+    YYSIZE_T yynewbytes;                        \
+    YYCOPY (&yyptr->Stack, Stack, yysize);              \
+    Stack = &yyptr->Stack;                      \
+    yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+    yyptr += yynewbytes / sizeof (*yyptr);              \
+      }                                 \
+    while (YYID (0))
+#endif
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  14
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   170
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  28
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  3
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  26
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  52
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   282
+#define YYTRANSLATE(YYX)                        \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+,    26,    27
+};
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+,     0,     3,     5,     9,    13,    17,    21,    25,    29,
+,    37,    41,    45,    49,    53,    57,    61,    65,    69,
+,    77,    81,    84,    87,    90,    93
+};
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+,     0,    -1,    30,    -1,     4,    30,     5,    -1,    30,
+,    30,    -1,    30,     7,    30,    -1,    30,     8,    30,
+      -1,    30,     9,    30,    -1,    30,    10,    30,    -1,    30,
+,    30,    -1,    30,    15,    30,    -1,    30,    14,    30,
+      -1,    30,    16,    30,    -1,    30,    13,    30,    -1,    30,
+,    30,    -1,    30,    18,    30,    -1,    30,    17,    30,
+      -1,    30,    20,    30,    -1,    30,    19,    30,    -1,    30,
+,    30,    -1,    30,    22,    30,    -1,    30,    21,    30,
+      -1,    25,    30,    -1,    24,    30,    -1,    19,    30,    -1,
+,    30,    -1,     3,    -1
+};
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint8 yyrline[] =
+{
+,   153,   153,   159,   160,   161,   162,   163,   164,   165,
+,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+,   181,   186,   187,   188,   189,   190
+};
+#endif
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "ARITH_NUM", "ARITH_LPAREN",
+  "ARITH_RPAREN", "ARITH_OR", "ARITH_AND", "ARITH_BOR", "ARITH_BXOR",
+  "ARITH_BAND", "ARITH_NE", "ARITH_EQ", "ARITH_LE", "ARITH_GE", "ARITH_GT",
+  "ARITH_LT", "ARITH_RSHIFT", "ARITH_LSHIFT", "ARITH_SUB", "ARITH_ADD",
+  "ARITH_REM", "ARITH_DIV", "ARITH_MUL", "ARITH_BNOT", "ARITH_NOT",
+  "ARITH_UNARYPLUS", "ARITH_UNARYMINUS", "$accept", "exp", "expr", 0
+};
+#endif
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+,   276,   277,   278,   279,   280,   281,   282
+};
+# endif
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+,    28,    29,    30,    30,    30,    30,    30,    30,    30,
+,    30,    30,    30,    30,    30,    30,    30,    30,    30,
+,    30,    30,    30,    30,    30,    30
+};
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+,     2,     1,     3,     3,     3,     3,     3,     3,     3,
+,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+,     3,     2,     2,     2,     2,     1
+};
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+,    26,     0,     0,     0,     0,     0,     0,     2,     0,
+,    25,    23,    22,     1,     0,     0,     0,     0,     0,
+,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+,     0,     0,     3,     4,     5,     6,     7,     8,    14,
+,    13,    11,    10,    12,    16,    15,    18,    17,    21,
+,    19
+};
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     7,     8
+};
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -13
+static const yytype_int16 yypact[] =
+{
+,   -13,    28,    28,    28,    28,    28,    12,    67,    49,
+     -13,   -13,   -13,   -13,   -13,    28,    28,    28,    28,    28,
+,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+,    28,    28,   -13,    84,   100,   115,    23,   128,   139,
+,   -12,   -12,   -12,   -12,   144,   144,   147,   147,   -13,
+     -13,   -13
+};
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -13,   -13,    -2
+};
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+,    10,    11,    12,    13,    26,    27,    28,    29,    30,
+,    32,    14,    34,    35,    36,    37,    38,    39,    40,
+,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+,     1,     2,    19,    20,    21,    22,    23,    24,    25,
+,    27,    28,    29,    30,    31,    32,     3,     4,     0,
+,     0,     5,     6,    33,    15,    16,    17,    18,    19,
+,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+,    31,    32,    15,    16,    17,    18,    19,    20,    21,
+,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+,    26,    27,    28,    29,    30,    31,    32,    17,    18,
+,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+,    30,    31,    32,    18,    19,    20,    21,    22,    23,
+,    25,    26,    27,    28,    29,    30,    31,    32,    20,
+,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+,    32,    22,    23,    24,    25,    26,    27,    28,    29,
+,    31,    32,    28,    29,    30,    31,    32,    30,    31,
+};
+static const yytype_int8 yycheck[] =
+{
+,     3,     4,     5,     6,    17,    18,    19,    20,    21,
+,    23,     0,    15,    16,    17,    18,    19,    20,    21,
+,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+,     3,     4,    10,    11,    12,    13,    14,    15,    16,
+,    18,    19,    20,    21,    22,    23,    19,    20,    -1,
+      -1,    -1,    24,    25,     5,     6,     7,     8,     9,    10,
+,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+,    22,    23,     6,     7,     8,     9,    10,    11,    12,
+,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+,    17,    18,    19,    20,    21,    22,    23,     8,     9,
+,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+,    21,    22,    23,     9,    10,    11,    12,    13,    14,
+,    16,    17,    18,    19,    20,    21,    22,    23,    11,
+,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+,    23,    13,    14,    15,    16,    17,    18,    19,    20,
+,    22,    23,    19,    20,    21,    22,    23,    21,    22,
+};
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+,     3,     4,    19,    20,    24,    25,    29,    30,    30,
+,    30,    30,    30,     0,     6,     7,     8,     9,    10,
+,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+,    22,    23,     5,    30,    30,    30,    30,    30,    30,
+,    30,    30,    30,    30,    30,    30,    30,    30,    30,
+,    30
+};
+#define yyerrok     (yyerrstatus = 0)
+#define yyclearin   (yychar = YYEMPTY)
+#define YYEMPTY     (-2)
+#define YYEOF       0
+#define YYACCEPT    goto yyacceptlab
+#define YYABORT     goto yyabortlab
+#define YYERROR     goto yyerrorlab
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYFAIL      goto yyerrlab
+#define YYRECOVERING()  (!!yyerrstatus)
+#define YYBACKUP(Token, Value)                  \
+do                              \
+  if (yychar == YYEMPTY && yylen == 1)              \
+    {                               \
+      yychar = (Token);                     \
+      yylval = (Value);                     \
+      yytoken = YYTRANSLATE (yychar);               \
+      YYPOPSTACK (1);                       \
+      goto yybackup;                        \
+    }                               \
+  else                              \
+    {                               \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                          \
+    }                               \
+while (YYID (0))
+#define YYTERROR    1
+#define YYERRCODE   256
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                \
+    do                                  \
+      if (YYID (N))                                                    \
+    {                               \
+      (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;    \
+      (Current).first_column = YYRHSLOC (Rhs, 1).first_column;  \
+      (Current).last_line    = YYRHSLOC (Rhs, N).last_line;     \
+      (Current).last_column  = YYRHSLOC (Rhs, N).last_column;   \
+    }                               \
+      else                              \
+    {                               \
+      (Current).first_line   = (Current).last_line   =      \
+        YYRHSLOC (Rhs, 0).last_line;                \
+      (Current).first_column = (Current).last_column =      \
+        YYRHSLOC (Rhs, 0).last_column;              \
+    }                               \
+    while (YYID (0))
+#endif
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)          \
+     fprintf (File, "%d.%d-%d.%d",          \
+          (Loc).first_line, (Loc).first_column, \
+          (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+/* YYLEX -- calling `yylex' with the right arguments.  */
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+/* Enable debugging if requested.  */
+#if YYDEBUG
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+# define YYDPRINTF(Args)            \
+do {                        \
+  if (yydebug)                  \
+    YYFPRINTF Args;             \
+} while (YYID (0))
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)            \
+do {                                      \
+  if (yydebug)                                \
+    {                                     \
+      YYFPRINTF (stderr, "%s ", Title);                   \
+      yy_symbol_print (stderr,                        \
+          Type, Value); \
+      YYFPRINTF (stderr, "\n");                       \
+    }                                     \
+} while (YYID (0))
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+    break;
+    }
+}
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+# define YY_STACK_PRINT(Bottom, Top)                \
+do {                                \
+  if (yydebug)                          \
+    yy_stack_print ((Bottom), (Top));               \
+} while (YYID (0))
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+         yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+               &(yyvsp[(yyi + 1) - (yynrhs)])
+                           );
+      fprintf (stderr, "\n");
+    }
+}
+# define YY_REDUCE_PRINT(Rule)      \
+do {                    \
+  if (yydebug)              \
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+#if YYERROR_VERBOSE
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+  return yyd - 1;
+}
+#  endif
+# endif
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+      for (;;)
+    switch (*++yyp)
+      {
+      case '\'':
+      case ',':
+        goto do_not_strip_quotes;
+      case '\\':
+        if (*++yyp != '\\')
+          goto do_not_strip_quotes;
+        /* Fall through.  */
+      default:
+        if (yyres)
+          yyres[yyn] = *yyp;
+        yyn++;
+        break;
+      case '"':
+        if (yyres)
+          yyres[yyn] = '\0';
+        return yyn;
+      }
+    do_not_strip_quotes: ;
+    }
+  if (! yyres)
+    return yystrlen (yystr);
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+     constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+            + sizeof yyexpecting - 1
+            + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+               * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+     YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+      {
+        if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+          {
+        yycount = 1;
+        yysize = yysize0;
+        yyformat[sizeof yyunexpected - 1] = '\0';
+        break;
+          }
+        yyarg[yycount++] = yytname[yyx];
+        yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+        yysize_overflow |= (yysize1 < yysize);
+        yysize = yysize1;
+        yyfmt = yystpcpy (yyfmt, yyprefix);
+        yyprefix = yyor;
+      }
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+      if (yysize_overflow)
+    return YYSIZE_MAXIMUM;
+      if (yyresult)
+    {
+      /* Avoid sprintf, as that infringes on the user's name space.
+         Don't have undefined behavior even if the translation
+         produced a string with the wrong number of "%s"s.  */
+      char *yyp = yyresult;
+      int yyi = 0;
+      while ((*yyp = *yyf) != '\0')
+        {
+          if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyf += 2;
+        }
+          else
+        {
+          yyp++;
+          yyf++;
+        }
+        }
+    }
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  switch (yytype)
+    {
+      default:
+    break;
+    }
+}
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+/* The look-ahead symbol.  */
+int yychar;
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+/*----------.
+| yyparse.  |
+`----------*/
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+#endif
+#endif
+{
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+  YYSIZE_T yystacksize = YYINITDEPTH;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+  YYDPRINTF ((stderr, "Starting parse\n"));
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;     /* Cause a token to be read.  */
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+  goto yysetstate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+ yysetstate:
+  *yyssp = yystate;
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+#ifdef yyoverflow
+      {
+    /* Give user a chance to reallocate the stack.  Use copies of
+       these so that the &'s don't force the real ones into
+       memory.  */
+    YYSTYPE *yyvs1 = yyvs;
+    yytype_int16 *yyss1 = yyss;
+    /* Each stack pointer address is followed by the size of the
+       data in use in that stack, in bytes.  This used to be a
+       conditional around just the two extra args, but that might
+       be undefined if yyoverflow is a macro.  */
+    yyoverflow (YY_("memory exhausted"),
+            &yyss1, yysize * sizeof (*yyssp),
+            &yyvs1, yysize * sizeof (*yyvsp),
+            &yystacksize);
+    yyss = yyss1;
+    yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+    goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+    yystacksize = YYMAXDEPTH;
+      {
+    yytype_int16 *yyss1 = yyss;
+    union yyalloc *yyptr =
+      (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+    if (! yyptr)
+      goto yyexhaustedlab;
+    YYSTACK_RELOCATE (yyss);
+    YYSTACK_RELOCATE (yyvs);
+#  undef YYSTACK_RELOCATE
+    if (yyss1 != yyssa)
+      YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+          (unsigned long int) yystacksize));
+      if (yyss + yystacksize - 1 <= yyssp)
+    YYABORT;
+    }
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  goto yybackup;
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+  /* Not known => get a look-ahead token if don't already have one.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+    goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+  if (yyn == YYFINAL)
+    YYACCEPT;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+  yystate = yyn;
+  *++yyvsp = yylval;
+  goto yynewstate;
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 153 "arith.y"
+    {
+            return ((yyvsp[(1) - (1)]));
+        }
+    break;
+  case 3:
+#line 159 "arith.y"
+    { (yyval) = (yyvsp[(2) - (3)]); }
+    break;
+  case 4:
+#line 160 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) ? (yyvsp[(1) - (3)]) : (yyvsp[(3) - (3)]) ? (yyvsp[(3) - (3)]) : 0; }
+    break;
+  case 5:
+#line 161 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) ? ( (yyvsp[(3) - (3)]) ? (yyvsp[(3) - (3)]) : 0 ) : 0; }
+    break;
+  case 6:
+#line 162 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) | (yyvsp[(3) - (3)]); }
+    break;
+  case 7:
+#line 163 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) ^ (yyvsp[(3) - (3)]); }
+    break;
+  case 8:
+#line 164 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) & (yyvsp[(3) - (3)]); }
+    break;
+  case 9:
+#line 165 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) == (yyvsp[(3) - (3)]); }
+    break;
+  case 10:
+#line 166 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) > (yyvsp[(3) - (3)]); }
+    break;
+  case 11:
+#line 167 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) >= (yyvsp[(3) - (3)]); }
+    break;
+  case 12:
+#line 168 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) < (yyvsp[(3) - (3)]); }
+    break;
+  case 13:
+#line 169 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) <= (yyvsp[(3) - (3)]); }
+    break;
+  case 14:
+#line 170 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) != (yyvsp[(3) - (3)]); }
+    break;
+  case 15:
+#line 171 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) << (yyvsp[(3) - (3)]); }
+    break;
+  case 16:
+#line 172 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) >> (yyvsp[(3) - (3)]); }
+    break;
+  case 17:
+#line 173 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) + (yyvsp[(3) - (3)]); }
+    break;
+  case 18:
+#line 174 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) - (yyvsp[(3) - (3)]); }
+    break;
+  case 19:
+#line 175 "arith.y"
+    { (yyval) = (yyvsp[(1) - (3)]) * (yyvsp[(3) - (3)]); }
+    break;
+  case 20:
+#line 176 "arith.y"
+    {
+            if ((yyvsp[(3) - (3)]) == 0)
+                yyerror("division by zero");
+            (yyval) = (yyvsp[(1) - (3)]) / (yyvsp[(3) - (3)]);
+            }
+    break;
+  case 21:
+#line 181 "arith.y"
+    {
+            if ((yyvsp[(3) - (3)]) == 0)
+                yyerror("division by zero");
+            (yyval) = (yyvsp[(1) - (3)]) % (yyvsp[(3) - (3)]);
+            }
+    break;
+  case 22:
+#line 186 "arith.y"
+    { (yyval) = !((yyvsp[(2) - (2)])); }
+    break;
+  case 23:
+#line 187 "arith.y"
+    { (yyval) = ~((yyvsp[(2) - (2)])); }
+    break;
+  case 24:
+#line 188 "arith.y"
+    { (yyval) = -((yyvsp[(2) - (2)])); }
+    break;
+  case 25:
+#line 189 "arith.y"
+    { (yyval) = (yyvsp[(2) - (2)]); }
+    break;
+/* Line 1267 of yacc.c.  */
+#line 1682 "y.tab.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  *++yyvsp = yyval;
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+  yyn = yyr1[yyn];
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+  goto yynewstate;
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+    YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+    if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+      {
+        YYSIZE_T yyalloc = 2 * yysize;
+        if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+          yyalloc = YYSTACK_ALLOC_MAXIMUM;
+        if (yymsg != yymsgbuf)
+          YYSTACK_FREE (yymsg);
+        yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+        if (yymsg)
+          yymsg_alloc = yyalloc;
+        else
+          {
+        yymsg = yymsgbuf;
+        yymsg_alloc = sizeof yymsgbuf;
+          }
+      }
+    if (0 < yysize && yysize <= yymsg_alloc)
+      {
+        (void) yysyntax_error (yymsg, yystate, yychar);
+        yyerror (yymsg);
+      }
+    else
+      {
+        yyerror (YY_("syntax error"));
+        if (yysize != 0)
+          goto yyexhaustedlab;
+      }
+      }
+#endif
+    }
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+     error, discard it.  */
+      if (yychar <= YYEOF)
+    {
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
+        YYABORT;
+    }
+      else
+    {
+      yydestruct ("Error: discarding",
+              yytoken, &yylval);
+      yychar = YYEMPTY;
+    }
+    }
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;  /* Each real token shifted decrements this.  */
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+    {
+      yyn += YYTERROR;
+      if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+        {
+          yyn = yytable[yyn];
+          if (0 < yyn)
+        break;
+        }
+    }
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+    YYABORT;
+      yydestruct ("Error: popping",
+          yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+  if (yyn == YYFINAL)
+    YYACCEPT;
+  *++yyvsp = yylval;
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  yystate = yyn;
+  goto yynewstate;
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+         yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+          yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+#line 192 "arith.y"
+void
+yyerror(s)
+    const char *s;
+{
+    yyclearin;
+    arith_lex_reset();  /* reprime lex */
+    error("arithmetic expression: %s: \"%s\"", s, arith_startbuf);
+    /* NOTREACHED */
+}

 /trunk/uspace/app/ash/redir.h
 ,0 → 1,53
+/*  $NetBSD: redir.h,v 1.12 2000/05/22 10:18:47 elric Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)redir.h 8.2 (Berkeley) 5/4/95
+ */
+/* flags passed to redirect */
+#define REDIR_PUSH 01       /* save previous values of file descriptors */
+#define REDIR_BACKQ 02      /* save the command output in memory */
+extern int fd2;
+union node;
+void redirect (union node *, int);
+void popredir (void);
+int fd0_redirected_p (void);
+void clearredir (void);
+int copyfd (int, int);

 /trunk/uspace/app/ash/trap.h
 ,0 → 1,51
+/*  $NetBSD: trap.h,v 1.14 2000/05/22 10:18:47 elric Exp $  */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)trap.h  8.3 (Berkeley) 6/5/95
+ */
+extern int pendingsigs;
+int trapcmd (int, char **);
+void clear_traps (void);
+void setsignal (int);
+void ignoresig (int);
+void onsig (int);
+void dotrap (void);
+void setinteractive (int);
+void exitshell (int) __attribute__((noreturn));
+int decode_signal (const char *);

 /trunk/uspace/app/ash/arith.h
 ,0 → 1,107
+/* A Bison parser, made by GNU Bison 2.3.  */
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ARITH_NUM = 258,
+     ARITH_LPAREN = 259,
+     ARITH_RPAREN = 260,
+     ARITH_OR = 261,
+     ARITH_AND = 262,
+     ARITH_BOR = 263,
+     ARITH_BXOR = 264,
+     ARITH_BAND = 265,
+     ARITH_NE = 266,
+     ARITH_EQ = 267,
+     ARITH_LE = 268,
+     ARITH_GE = 269,
+     ARITH_GT = 270,
+     ARITH_LT = 271,
+     ARITH_RSHIFT = 272,
+     ARITH_LSHIFT = 273,
+     ARITH_SUB = 274,
+     ARITH_ADD = 275,
+     ARITH_REM = 276,
+     ARITH_DIV = 277,
+     ARITH_MUL = 278,
+     ARITH_BNOT = 279,
+     ARITH_NOT = 280,
+     ARITH_UNARYPLUS = 281,
+     ARITH_UNARYMINUS = 282
+   };
+#endif
+/* Tokens.  */
+#define ARITH_NUM 258
+#define ARITH_LPAREN 259
+#define ARITH_RPAREN 260
+#define ARITH_OR 261
+#define ARITH_AND 262
+#define ARITH_BOR 263
+#define ARITH_BXOR 264
+#define ARITH_BAND 265
+#define ARITH_NE 266
+#define ARITH_EQ 267
+#define ARITH_LE 268
+#define ARITH_GE 269
+#define ARITH_GT 270
+#define ARITH_LT 271
+#define ARITH_RSHIFT 272
+#define ARITH_LSHIFT 273
+#define ARITH_SUB 274
+#define ARITH_ADD 275
+#define ARITH_REM 276
+#define ARITH_DIV 277
+#define ARITH_MUL 278
+#define ARITH_BNOT 279
+#define ARITH_NOT 280
+#define ARITH_UNARYPLUS 281
+#define ARITH_UNARYMINUS 282
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+extern YYSTYPE yylval;

 /trunk/uspace/app/ash/expand.c
 ,0 → 1,1750
+/*  $NetBSD: expand.c,v 1.49 2000/03/13 22:47:19 soren Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)expand.c    8.5 (Berkeley) 5/15/95";
+#else
+__RCSID("$NetBSD: expand.c,v 1.49 2000/03/13 22:47:19 soren Exp $");
+#endif
+#endif /* not lint */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+#include <fnmatch.h>
+#include <glob.h>
+#endif
+/*
+ * Routines to expand arguments to commands.  We have to deal with
+ * backquotes, shell variables, and file metacharacters.
+ */
+#include "shell.h"
+#include "main.h"
+#include "nodes.h"
+#include "eval.h"
+#include "expand.h"
+#include "syntax.h"
+#include "parser.h"
+#include "jobs.h"
+#include "options.h"
+#include "var.h"
+#include "input.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "mystring.h"
+#include "show.h"
+/*
+ * Structure specifying which parts of the string should be searched
+ * for IFS characters.
+ */
+struct ifsregion {
+    struct ifsregion *next; /* next region in list */
+    int begoff;     /* offset of start of region */
+    int endoff;     /* offset of end of region */
+    int nulonly;        /* search for nul bytes only */
+};
+char *expdest;          /* output of current string */
+struct nodelist *argbackq;  /* list of back quote expressions */
+struct ifsregion ifsfirst;  /* first struct in list of ifs regions */
+struct ifsregion *ifslastp; /* last struct in list */
+struct arglist exparg;      /* holds expanded arg list */
+STATIC void argstr (char *, int);
+STATIC char *exptilde (char *, int);
+STATIC void expbackq (union node *, int, int);
+STATIC int subevalvar (char *, char *, int, int, int, int);
+STATIC char *evalvar (char *, int);
+STATIC int varisset (char *, int);
+STATIC char *strtodest (char *, int, int);
+STATIC void varvalue (char *, int, int);
+STATIC void recordregion (int, int, int);
+STATIC void removerecordregions (int);
+STATIC void ifsbreakup (char *, struct arglist *);
+STATIC void ifsfree (void);
+STATIC void expandmeta (struct strlist *, int);
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+STATIC const char *preglob (const char *);
+STATIC void addglob (const glob_t *);
+#else
+STATIC void expmeta (char *, char *);
+#endif
+STATIC void addfname (char *);
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+STATIC int patmatch (char *, char *, int);
+STATIC int patmatch2 (char *, char *, int);
+STATIC char * _rmescapes (char *, int);
+#else
+STATIC struct strlist *expsort (struct strlist *);
+STATIC struct strlist *msort (struct strlist *, int);
+STATIC int pmatch (char *, char *, int);
+#define patmatch2 patmatch
+#endif
+STATIC char *cvtnum (int, char *);
+/*
+ * Expand shell variables and backquotes inside a here document.
+ */
+void
+expandhere(arg, fd)
+    union node *arg;    /* the document */
+    int fd;         /* where to write the expanded version */
+    {
+    herefd = fd;
+    expandarg(arg, (struct arglist *)NULL, 0);
+    xwrite(fd, stackblock(), expdest - stackblock());
+}
+/*
+ * Perform variable substitution and command substitution on an argument,
+ * placing the resulting list of arguments in arglist.  If EXP_FULL is true,
+ * perform splitting and file name expansion.  When arglist is NULL, perform
+ * here document expansion.
+ */
+void
+expandarg(arg, arglist, flag)
+    union node *arg;
+    struct arglist *arglist;
+    int flag;
+{
+    struct strlist *sp;
+    char *p;
+    argbackq = arg->narg.backquote;
+    STARTSTACKSTR(expdest);
+    ifsfirst.next = NULL;
+    ifslastp = NULL;
+    argstr(arg->narg.text, flag);
+    if (arglist == NULL) {
+        return;         /* here document expanded */
+    }
+    STPUTC('\0', expdest);
+    p = grabstackstr(expdest);
+    exparg.lastp = &exparg.list;
+    /*
+     * TODO - EXP_REDIR
+     */
+    if (flag & EXP_FULL) {
+        ifsbreakup(p, &exparg);
+        *exparg.lastp = NULL;
+        exparg.lastp = &exparg.list;
+        expandmeta(exparg.list, flag);
+    } else {
+        if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
+            rmescapes(p);
+        sp = (struct strlist *)stalloc(sizeof (struct strlist));
+        sp->text = p;
+        *exparg.lastp = sp;
+        exparg.lastp = &sp->next;
+    }
+    ifsfree();
+    *exparg.lastp = NULL;
+    if (exparg.list) {
+        *arglist->lastp = exparg.list;
+        arglist->lastp = exparg.lastp;
+    }
+}
+/*
+ * Perform variable and command substitution.  If EXP_FULL is set, output CTLESC
+ * characters to allow for further processing.  Otherwise treat
+ * $@ like $* since no splitting will be performed.
+ */
+STATIC void
+argstr(p, flag)
+    char *p;
+    int flag;
+{
+    char c;
+    int quotes = flag & (EXP_FULL | EXP_CASE);  /* do CTLESC */
+    int firsteq = 1;
+    if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE)))
+        p = exptilde(p, flag);
+    for (;;) {
+        switch (c = *p++) {
+        case '\0':
+        case CTLENDVAR: /* ??? */
+            goto breakloop;
+        case CTLQUOTEMARK:
+            /* "$@" syntax adherence hack */
+            if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=')
+                break;
+            if ((flag & EXP_FULL) != 0)
+                STPUTC(c, expdest);
+            break;
+        case CTLESC:
+            if (quotes)
+                STPUTC(c, expdest);
+            c = *p++;
+            STPUTC(c, expdest);
+            break;
+        case CTLVAR:
+            p = evalvar(p, flag);
+            break;
+        case CTLBACKQ:
+        case CTLBACKQ|CTLQUOTE:
+            expbackq(argbackq->n, c & CTLQUOTE, flag);
+            argbackq = argbackq->next;
+            break;
+        case CTLENDARI:
+            expari(flag);
+            break;
+        case ':':
+        case '=':
+            /*
+             * sort of a hack - expand tildes in variable
+             * assignments (after the first '=' and after ':'s).
+             */
+            STPUTC(c, expdest);
+            if (flag & EXP_VARTILDE && *p == '~') {
+                if (c == '=') {
+                    if (firsteq)
+                        firsteq = 0;
+                    else
+                        break;
+                }
+                p = exptilde(p, flag);
+            }
+            break;
+        default:
+            STPUTC(c, expdest);
+        }
+    }
+breakloop:;
+    return;
+}
+STATIC char *
+exptilde(p, flag)
+    char *p;
+    int flag;
+{
+    char c, *startp = p;
+    struct passwd *pw;
+    const char *home;
+    int quotes = flag & (EXP_FULL | EXP_CASE);
+    while ((c = *p) != '\0') {
+        switch(c) {
+        case CTLESC:
+            return (startp);
+        case CTLQUOTEMARK:
+            return (startp);
+        case ':':
+            if (flag & EXP_VARTILDE)
+                goto done;
+            break;
+        case '/':
+            goto done;
+        }
+        p++;
+    }
+done:
+    *p = '\0';
+    if (*(startp+1) == '\0') {
+        if ((home = lookupvar("HOME")) == NULL)
+            goto lose;
+    } else {
+        if ((pw = getpwnam(startp+1)) == NULL)
+            goto lose;
+        home = pw->pw_dir;
+    }
+    if (*home == '\0')
+        goto lose;
+    *p = c;
+    while ((c = *home++) != '\0') {
+        if (quotes && SQSYNTAX[(int)c] == CCTL)
+            STPUTC(CTLESC, expdest);
+        STPUTC(c, expdest);
+    }
+    return (p);
+lose:
+    *p = c;
+    return (startp);
+}
+STATIC void
+removerecordregions(endoff)
+    int endoff;
+{
+    if (ifslastp == NULL)
+        return;
+    if (ifsfirst.endoff > endoff) {
+        while (ifsfirst.next != NULL) {
+            struct ifsregion *ifsp;
+            INTOFF;
+            ifsp = ifsfirst.next->next;
+            ckfree(ifsfirst.next);
+            ifsfirst.next = ifsp;
+            INTON;
+        }
+        if (ifsfirst.begoff > endoff)
+            ifslastp = NULL;
+        else {
+            ifslastp = &ifsfirst;
+            ifsfirst.endoff = endoff;
+        }
+        return;
+    }
+    ifslastp = &ifsfirst;
+    while (ifslastp->next && ifslastp->next->begoff < endoff)
+        ifslastp=ifslastp->next;
+    while (ifslastp->next != NULL) {
+        struct ifsregion *ifsp;
+        INTOFF;
+        ifsp = ifslastp->next->next;
+        ckfree(ifslastp->next);
+        ifslastp->next = ifsp;
+        INTON;
+    }
+    if (ifslastp->endoff > endoff)
+        ifslastp->endoff = endoff;
+}
+/*
+ * Expand arithmetic expression.  Backup to start of expression,
+ * evaluate, place result in (backed up) result, adjust string position.
+ */
+void
+expari(flag)
+    int flag;
+{
+    char *p, *start;
+    int result;
+    int begoff;
+    int quotes = flag & (EXP_FULL | EXP_CASE);
+    int quoted;
+    /*  ifsfree(); */
+    /*
+     * This routine is slightly over-complicated for
+     * efficiency.  First we make sure there is
+     * enough space for the result, which may be bigger
+     * than the expression if we add exponentation.  Next we
+     * scan backwards looking for the start of arithmetic.  If the
+     * next previous character is a CTLESC character, then we
+     * have to rescan starting from the beginning since CTLESC
+     * characters have to be processed left to right.
+     */
+    CHECKSTRSPACE(10, expdest);
+    USTPUTC('\0', expdest);
+    start = stackblock();
+    p = expdest - 1;
+    while (*p != CTLARI && p >= start)
+        --p;
+    if (*p != CTLARI)
+        error("missing CTLARI (shouldn't happen)");
+    if (p > start && *(p-1) == CTLESC)
+        for (p = start; *p != CTLARI; p++)
+            if (*p == CTLESC)
+                p++;
+    if (p[1] == '"')
+        quoted=1;
+    else
+        quoted=0;
+    begoff = p - start;
+    removerecordregions(begoff);
+    if (quotes)
+        rmescapes(p+2);
+    result = arith(p+2);
+    fmtstr(p, 12, "%d", result);
+    while (*p++)
+        ;
+    if (quoted == 0)
+        recordregion(begoff, p - 1 - start, 0);
+    result = expdest - p + 1;
+    STADJUST(-result, expdest);
+}
+/*
+ * Expand stuff in backwards quotes.
+ */
+STATIC void
+expbackq(cmd, quoted, flag)
+    union node *cmd;
+    int quoted;
+    int flag;
+{
+    struct backcmd in;
+    int i;
+    char buf[128];
+    char *p;
+    char *dest = expdest;
+    struct ifsregion saveifs, *savelastp;
+    struct nodelist *saveargbackq;
+    char lastc;
+    int startloc = dest - stackblock();
+    char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
+    int saveherefd;
+    int quotes = flag & (EXP_FULL | EXP_CASE);
+    INTOFF;
+    saveifs = ifsfirst;
+    savelastp = ifslastp;
+    saveargbackq = argbackq;
+    saveherefd = herefd;
+    herefd = -1;
+    p = grabstackstr(dest);
+    evalbackcmd(cmd, &in);
+    ungrabstackstr(p, dest);
+    ifsfirst = saveifs;
+    ifslastp = savelastp;
+    argbackq = saveargbackq;
+    herefd = saveherefd;
+    p = in.buf;
+    lastc = '\0';
+    for (;;) {
+        if (--in.nleft < 0) {
+            if (in.fd < 0)
+                break;
+            while ((i = read(in.fd, buf, sizeof buf)) < 0 && errno == EINTR);
+            TRACE(("expbackq: read returns %d\n", i));
+            if (i <= 0)
+                break;
+            p = buf;
+            in.nleft = i - 1;
+        }
+        lastc = *p++;
+        if (lastc != '\0') {
+            if (quotes && syntax[(int)lastc] == CCTL)
+                STPUTC(CTLESC, dest);
+            STPUTC(lastc, dest);
+        }
+    }
+    /* Eat all trailing newlines */
+    for (p--; lastc == '\n'; lastc = *--p)
+        STUNPUTC(dest);
+    if (in.fd >= 0)
+        close(in.fd);
+    if (in.buf)
+        ckfree(in.buf);
+    if (in.jp)
+        exitstatus = waitforjob(in.jp);
+    if (quoted == 0)
+        recordregion(startloc, dest - stackblock(), 0);
+    TRACE(("evalbackq: size=%d: \"%.*s\"\n",
+        (dest - stackblock()) - startloc,
+        (dest - stackblock()) - startloc,
+        stackblock() + startloc));
+    expdest = dest;
+    INTON;
+}
+STATIC int
+subevalvar(p, str, strloc, subtype, startloc, varflags)
+    char *p;
+    char *str;
+    int strloc;
+    int subtype;
+    int startloc;
+    int varflags;
+{
+    char *startp;
+    char *loc = NULL;
+    char *q;
+    int c = 0;
+    int saveherefd = herefd;
+    struct nodelist *saveargbackq = argbackq;
+    int amount;
+    herefd = -1;
+    argstr(p, subtype != VSASSIGN && subtype != VSQUESTION ? EXP_CASE : 0);
+    STACKSTRNUL(expdest);
+    herefd = saveherefd;
+    argbackq = saveargbackq;
+    startp = stackblock() + startloc;
+    if (str == NULL)
+        str = stackblock() + strloc;
+    switch (subtype) {
+    case VSASSIGN:
+        setvar(str, startp, 0);
+        amount = startp - expdest;
+        STADJUST(amount, expdest);
+        varflags &= ~VSNUL;
+        if (c != 0)
+            *loc = c;
+        return 1;
+    case VSQUESTION:
+        if (*p != CTLENDVAR) {
+            outfmt(&errout, "%s\n", startp);
+            error((char *)NULL);
+        }
+        error("%.*s: parameter %snot set", p - str - 1,
+              str, (varflags & VSNUL) ? "null or "
+                          : nullstr);
+        /* NOTREACHED */
+    case VSTRIMLEFT:
+        for (loc = startp; loc < str; loc++) {
+            c = *loc;
+            *loc = '\0';
+            if (patmatch2(str, startp, varflags & VSQUOTE))
+                goto recordleft;
+            *loc = c;
+            if ((varflags & VSQUOTE) && *loc == CTLESC)
+                    loc++;
+        }
+        return 0;
+    case VSTRIMLEFTMAX:
+        for (loc = str - 1; loc >= startp;) {
+            c = *loc;
+            *loc = '\0';
+            if (patmatch2(str, startp, varflags & VSQUOTE))
+                goto recordleft;
+            *loc = c;
+            loc--;
+            if ((varflags & VSQUOTE) && loc > startp &&
+                *(loc - 1) == CTLESC) {
+                for (q = startp; q < loc; q++)
+                    if (*q == CTLESC)
+                        q++;
+                if (q > loc)
+                    loc--;
+            }
+        }
+        return 0;
+    case VSTRIMRIGHT:
+            for (loc = str - 1; loc >= startp;) {
+            if (patmatch2(str, loc, varflags & VSQUOTE))
+                goto recordright;
+            loc--;
+            if ((varflags & VSQUOTE) && loc > startp &&
+                *(loc - 1) == CTLESC) {
+                for (q = startp; q < loc; q++)
+                    if (*q == CTLESC)
+                        q++;
+                if (q > loc)
+                    loc--;
+            }
+        }
+        return 0;
+    case VSTRIMRIGHTMAX:
+        for (loc = startp; loc < str - 1; loc++) {
+            if (patmatch2(str, loc, varflags & VSQUOTE))
+                goto recordright;
+            if ((varflags & VSQUOTE) && *loc == CTLESC)
+                    loc++;
+        }
+        return 0;
+    default:
+        abort();
+    }
+recordleft:
+    *loc = c;
+    amount = ((str - 1) - (loc - startp)) - expdest;
+    STADJUST(amount, expdest);
+    while (loc != str - 1)
+        *startp++ = *loc++;
+    return 1;
+recordright:
+    amount = loc - expdest;
+    STADJUST(amount, expdest);
+    STPUTC('\0', expdest);
+    STADJUST(-1, expdest);
+    return 1;
+}
+/*
+ * Expand a variable, and return a pointer to the next character in the
+ * input string.
+ */
+STATIC char *
+evalvar(p, flag)
+    char *p;
+    int flag;
+{
+    int subtype;
+    int varflags;
+    char *var;
+    char *val;
+    int patloc;
+    int c;
+    int set;
+    int special;
+    int startloc;
+    int varlen;
+    int easy;
+    int quotes = flag & (EXP_FULL | EXP_CASE);
+    varflags = *p++;
+    subtype = varflags & VSTYPE;
+    var = p;
+    special = 0;
+    if (! is_name(*p))
+        special = 1;
+    p = strchr(p, '=') + 1;
+again: /* jump here after setting a variable with ${var=text} */
+    if (special) {
+        set = varisset(var, varflags & VSNUL);
+        val = NULL;
+    } else {
+        val = lookupvar(var);
+        if (val == NULL || ((varflags & VSNUL) && val[0] == '\0')) {
+            val = NULL;
+            set = 0;
+        } else
+            set = 1;
+    }
+    varlen = 0;
+    startloc = expdest - stackblock();
+    if (set && subtype != VSPLUS) {
+        /* insert the value of the variable */
+        if (special) {
+            varvalue(var, varflags & VSQUOTE, flag & EXP_FULL);
+            if (subtype == VSLENGTH) {
+                varlen = expdest - stackblock() - startloc;
+                STADJUST(-varlen, expdest);
+            }
+        } else {
+            char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX
+                                  : BASESYNTAX;
+            if (subtype == VSLENGTH) {
+                for (;*val; val++)
+                    varlen++;
+            }
+            else {
+                while (*val) {
+                    if (quotes && syntax[(int)*val] == CCTL)
+                        STPUTC(CTLESC, expdest);
+                    STPUTC(*val++, expdest);
+                }
+            }
+        }
+    }
+    if (subtype == VSPLUS)
+        set = ! set;
+    easy = ((varflags & VSQUOTE) == 0 ||
+        (*var == '@' && shellparam.nparam != 1));
+    switch (subtype) {
+    case VSLENGTH:
+        expdest = cvtnum(varlen, expdest);
+        goto record;
+    case VSNORMAL:
+        if (!easy)
+            break;
+record:
+        recordregion(startloc, expdest - stackblock(),
+                 varflags & VSQUOTE);
+        break;
+    case VSPLUS:
+    case VSMINUS:
+        if (!set) {
+                argstr(p, flag);
+            break;
+        }
+        if (easy)
+            goto record;
+        break;
+    case VSTRIMLEFT:
+    case VSTRIMLEFTMAX:
+    case VSTRIMRIGHT:
+    case VSTRIMRIGHTMAX:
+        if (!set)
+            break;
+        /*
+         * Terminate the string and start recording the pattern
+         * right after it
+         */
+        STPUTC('\0', expdest);
+        patloc = expdest - stackblock();
+        if (subevalvar(p, NULL, patloc, subtype,
+                   startloc, varflags) == 0) {
+            int amount = (expdest - stackblock() - patloc) + 1;
+            STADJUST(-amount, expdest);
+        }
+        /* Remove any recorded regions beyond start of variable */
+        removerecordregions(startloc);
+        goto record;
+    case VSASSIGN:
+    case VSQUESTION:
+        if (!set) {
+            if (subevalvar(p, var, 0, subtype, startloc,
+                       varflags)) {
+                varflags &= ~VSNUL;
+                /*
+                 * Remove any recorded regions beyond
+                 * start of variable
+                 */
+                removerecordregions(startloc);
+                goto again;
+            }
+            break;
+        }
+        if (easy)
+            goto record;
+        break;
+    default:
+        abort();
+    }
+    if (subtype != VSNORMAL) {  /* skip to end of alternative */
+        int nesting = 1;
+        for (;;) {
+            if ((c = *p++) == CTLESC)
+                p++;
+            else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) {
+                if (set)
+                    argbackq = argbackq->next;
+            } else if (c == CTLVAR) {
+                if ((*p++ & VSTYPE) != VSNORMAL)
+                    nesting++;
+            } else if (c == CTLENDVAR) {
+                if (--nesting == 0)
+                    break;
+            }
+        }
+    }
+    return p;
+}
+/*
+ * Test whether a specialized variable is set.
+ */
+STATIC int
+varisset(name, nulok)
+    char *name;
+    int nulok;
+{
+    if (*name == '!')
+        return backgndpid != -1;
+    else if (*name == '@' || *name == '*') {
+        if (*shellparam.p == NULL)
+            return 0;
+        if (nulok) {
+            char **av;
+            for (av = shellparam.p; *av; av++)
+                if (**av != '\0')
+                    return 1;
+            return 0;
+        }
+    } else if (is_digit(*name)) {
+        char *ap;
+        int num = atoi(name);
+        if (num > shellparam.nparam)
+            return 0;
+        if (num == 0)
+            ap = arg0;
+        else
+            ap = shellparam.p[num - 1];
+        if (nulok && (ap == NULL || *ap == '\0'))
+            return 0;
+    }
+    return 1;
+}
+/*
+ * Put a string on the stack.
+ */
+STATIC char *
+strtodest(p, quoted, allow_split)
+    char *p;
+    int quoted;
+    int allow_split;
+{
+    char const *syntax;
+    if (allow_split) {
+        syntax = quoted ? DQSYNTAX : BASESYNTAX;
+        while (*p) {
+            if (syntax[(int) *p] == CCTL)
+                STPUTC(CTLESC, expdest);
+            STPUTC(*p++, expdest);
+        }
+    } else
+        while (*p)
+            STPUTC(*p++, expdest);
+    return p;
+}
+/*
+ * Add the value of a specialized variable to the stack string.
+ */
+STATIC void
+varvalue(name, quoted, allow_split)
+    char *name;
+    int quoted;
+    int allow_split;
+{
+    int num;
+    char *p;
+    int i;
+    extern int oexitstatus;
+    char sep;
+    char **ap;
+    switch (*name) {
+    case '$':
+        num = rootpid;
+        goto numvar;
+    case '?':
+        num = oexitstatus;
+        goto numvar;
+    case '#':
+        num = shellparam.nparam;
+        goto numvar;
+    case '!':
+        num = backgndpid;
+numvar:
+        expdest = cvtnum(num, expdest);
+        break;
+    case '-':
+        for (i = 0 ; i < NOPTS ; i++) {
+            if (optlist[i].val)
+                STPUTC(optlist[i].letter, expdest);
+        }
+        break;
+    case '@':
+        if (allow_split && quoted) {
+            for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+                p = strtodest(p, quoted, allow_split);
+                if (*ap)
+                    STPUTC('\0', expdest);
+            }
+            break;
+        }
+        /* fall through */
+    case '*':
+        if (ifsset() != 0)
+            sep = ifsval()[0];
+        else
+            sep = ' ';
+        for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+            p = strtodest(p, quoted, allow_split);
+            if (*ap && sep)
+                STPUTC(sep, expdest);
+        }
+        break;
+    case '0':
+        p = strtodest(arg0, quoted, allow_split);
+        break;
+    default:
+        if (is_digit(*name)) {
+            num = atoi(name);
+            if (num > 0 && num <= shellparam.nparam) {
+                p = strtodest(shellparam.p[num - 1], quoted,
+                          allow_split);
+            }
+        }
+        break;
+    }
+}
+/*
+ * Record the fact that we have to scan this region of the
+ * string for IFS characters.
+ */
+STATIC void
+recordregion(start, end, nulonly)
+    int start;
+    int end;
+    int nulonly;
+{
+    struct ifsregion *ifsp;
+    if (ifslastp == NULL) {
+        ifsp = &ifsfirst;
+    } else {
+        ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion));
+        ifslastp->next = ifsp;
+    }
+    ifslastp = ifsp;
+    ifslastp->next = NULL;
+    ifslastp->begoff = start;
+    ifslastp->endoff = end;
+    ifslastp->nulonly = nulonly;
+}
+/*
+ * Break the argument string into pieces based upon IFS and add the
+ * strings to the argument list.  The regions of the string to be
+ * searched for IFS characters have been stored by recordregion.
+ */
+STATIC void
+ifsbreakup(string, arglist)
+    char *string;
+    struct arglist *arglist;
+    {
+    struct ifsregion *ifsp;
+    struct strlist *sp;
+    char *start;
+    char *p;
+    char *q;
+    const char *ifs;
+    int ifsspc;
+    int nulonly;
+    start = string;
+    ifsspc = 0;
+    nulonly = 0;
+    if (ifslastp != NULL) {
+        ifsp = &ifsfirst;
+        do {
+            p = string + ifsp->begoff;
+            nulonly = ifsp->nulonly;
+            ifs = nulonly ? nullstr :
+                ( ifsset() ? ifsval() : " \t\n" );
+            ifsspc = 0;
+            while (p < string + ifsp->endoff) {
+                q = p;
+                if (*p == CTLESC)
+                    p++;
+                if (strchr(ifs, *p)) {
+                    if (!nulonly)
+                        ifsspc = (strchr(" \t\n", *p) != NULL);
+                    /* Ignore IFS whitespace at start */
+                    if (q == start && ifsspc) {
+                        p++;
+                        start = p;
+                        continue;
+                    }
+                    *q = '\0';
+                    sp = (struct strlist *)stalloc(sizeof *sp);
+                    sp->text = start;
+                    *arglist->lastp = sp;
+                    arglist->lastp = &sp->next;
+                    p++;
+                    if (!nulonly) {
+                        for (;;) {
+                            if (p >= string + ifsp->endoff) {
+                                break;
+                            }
+                            q = p;
+                            if (*p == CTLESC)
+                                p++;
+                            if (strchr(ifs, *p) == NULL ) {
+                                p = q;
+                                break;
+                            } else if (strchr(" \t\n",*p) == NULL) {
+                                if (ifsspc) {
+                                    p++;
+                                    ifsspc = 0;
+                                } else {
+                                    p = q;
+                                    break;
+                                }
+                            } else
+                                p++;
+                        }
+                    }
+                    start = p;
+                } else
+                    p++;
+            }
+        } while ((ifsp = ifsp->next) != NULL);
+        if (*start || (!ifsspc && start > string &&
+            (nulonly || 1))) {
+            sp = (struct strlist *)stalloc(sizeof *sp);
+            sp->text = start;
+            *arglist->lastp = sp;
+            arglist->lastp = &sp->next;
+        }
+    } else {
+        sp = (struct strlist *)stalloc(sizeof *sp);
+        sp->text = start;
+        *arglist->lastp = sp;
+        arglist->lastp = &sp->next;
+    }
+}
+STATIC void
+ifsfree()
+{
+    while (ifsfirst.next != NULL) {
+        struct ifsregion *ifsp;
+        INTOFF;
+        ifsp = ifsfirst.next->next;
+        ckfree(ifsfirst.next);
+        ifsfirst.next = ifsp;
+        INTON;
+    }
+    ifslastp = NULL;
+    ifsfirst.next = NULL;
+}
+/*
+ * Expand shell metacharacters.  At this point, the only control characters
+ * should be escapes.  The results are stored in the list exparg.
+ */
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+STATIC void
+expandmeta(str, flag)
+    struct strlist *str;
+    int flag;
+{
+    const char *p;
+    glob_t pglob;
+    /* TODO - EXP_REDIR */
+    while (str) {
+        if (fflag)
+            goto nometa;
+        p = preglob(str->text);
+        INTOFF;
+        switch (glob(p, GLOB_NOMAGIC, 0, &pglob)) {
+        case 0:
+            if (!(pglob.gl_flags & GLOB_MAGCHAR))
+                goto nometa2;
+            addglob(&pglob);
+            globfree(&pglob);
+            INTON;
+            break;
+        case GLOB_NOMATCH:
+nometa2:
+            globfree(&pglob);
+            INTON;
+nometa:
+            *exparg.lastp = str;
+            rmescapes(str->text);
+            exparg.lastp = &str->next;
+            break;
+        default:    /* GLOB_NOSPACE */
+            error("Out of space");
+        }
+        str = str->next;
+    }
+}
+/*
+ * Prepare the string for glob(3).
+ */
+STATIC const char *
+preglob(str)
+    const char *str;
+{
+    const char *p;
+    char *q, *r;
+    size_t len;
+    p = str;
+    while (*p != CTLQUOTEMARK && *p != CTLESC) {
+        if (*p++ == '\0')
+            return str;
+    }
+    len = p - str;
+    q = r = stalloc(strlen(str) + 1);
+    if (len > 0) {
+        memcpy(q, str, len);
+        q += len;
+    }
+    do {
+        if (*p == CTLQUOTEMARK)
+            continue;
+        if (*p == CTLESC) {
+            if (*++p != '/')
+                *q++ = '\\';
+        }
+        *q++ = *p;
+    } while (*++p);
+    *q = '\0';
+    return r;
+}
+/*
+ * Add the result of glob(3) to the list.
+ */
+STATIC void
+addglob(pglob)
+    const glob_t *pglob;
+{
+    char **p = pglob->gl_pathv;
+    do {
+        addfname(*p);
+    } while (*++p);
+}
+#else
+char *expdir;
+STATIC void
+expandmeta(str, flag)
+    struct strlist *str;
+    int flag;
+{
+    char *p;
+    struct strlist **savelastp;
+    struct strlist *sp;
+    char c;
+    /* TODO - EXP_REDIR */
+    while (str) {
+        if (fflag)
+            goto nometa;
+        p = str->text;
+        for (;;) {          /* fast check for meta chars */
+            if ((c = *p++) == '\0')
+                goto nometa;
+            if (c == '*' || c == '?' || c == '[' || c == '!')
+                break;
+        }
+        savelastp = exparg.lastp;
+        INTOFF;
+        if (expdir == NULL) {
+            int i = strlen(str->text);
+            expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
+        }
+        expmeta(expdir, str->text);
+        ckfree(expdir);
+        expdir = NULL;
+        INTON;
+        if (exparg.lastp == savelastp) {
+            /*
+             * no matches
+             */
+nometa:
+            *exparg.lastp = str;
+            rmescapes(str->text);
+            exparg.lastp = &str->next;
+        } else {
+            *exparg.lastp = NULL;
+            *savelastp = sp = expsort(*savelastp);
+            while (sp->next != NULL)
+                sp = sp->next;
+            exparg.lastp = &sp->next;
+        }
+        str = str->next;
+    }
+}
+/*
+ * Do metacharacter (i.e. *, ?, [...]) expansion.
+ */
+STATIC void
+expmeta(enddir, name)
+    char *enddir;
+    char *name;
+    {
+    char *p;
+    const char *cp;
+    char *q;
+    char *start;
+    char *endname;
+    int metaflag;
+    struct stat statb;
+    DIR *dirp;
+    struct dirent *dp;
+    int atend;
+    int matchdot;
+    metaflag = 0;
+    start = name;
+    for (p = name ; ; p++) {
+        if (*p == '*' || *p == '?')
+            metaflag = 1;
+        else if (*p == '[') {
+            q = p + 1;
+            if (*q == '!')
+                q++;
+            for (;;) {
+                while (*q == CTLQUOTEMARK)
+                    q++;
+                if (*q == CTLESC)
+                    q++;
+                if (*q == '/' || *q == '\0')
+                    break;
+                if (*++q == ']') {
+                    metaflag = 1;
+                    break;
+                }
+            }
+        } else if (*p == '!' && p[1] == '!' && (p == name || p[-1] == '/')) {
+            metaflag = 1;
+        } else if (*p == '\0')
+            break;
+        else if (*p == CTLQUOTEMARK)
+            continue;
+        else if (*p == CTLESC)
+            p++;
+        if (*p == '/') {
+            if (metaflag)
+                break;
+            start = p + 1;
+        }
+    }
+    if (metaflag == 0) {    /* we've reached the end of the file name */
+        if (enddir != expdir)
+            metaflag++;
+        for (p = name ; ; p++) {
+            if (*p == CTLQUOTEMARK)
+                continue;
+            if (*p == CTLESC)
+                p++;
+            *enddir++ = *p;
+            if (*p == '\0')
+                break;
+        }
+        if (metaflag == 0 || stat(expdir, &statb) >= 0)
+            addfname(expdir);
+        return;
+    }
+    endname = p;
+    if (start != name) {
+        p = name;
+        while (p < start) {
+            while (*p == CTLQUOTEMARK)
+                p++;
+            if (*p == CTLESC)
+                p++;
+            *enddir++ = *p++;
+        }
+    }
+    if (enddir == expdir) {
+        cp = ".";
+    } else if (enddir == expdir + 1 && *expdir == '/') {
+        cp = "/";
+    } else {
+        cp = expdir;
+        enddir[-1] = '\0';
+    }
+    if ((dirp = opendir(cp)) == NULL)
+        return;
+    if (enddir != expdir)
+        enddir[-1] = '/';
+    if (*endname == 0) {
+        atend = 1;
+    } else {
+        atend = 0;
+        *endname++ = '\0';
+    }
+    matchdot = 0;
+    p = start;
+    while (*p == CTLQUOTEMARK)
+        p++;
+    if (*p == CTLESC)
+        p++;
+    if (*p == '.')
+        matchdot++;
+    while (! int_pending() && (dp = readdir(dirp)) != NULL) {
+        if (dp->d_name[0] == '.' && ! matchdot)
+            continue;
+        if (patmatch(start, dp->d_name, 0)) {
+            if (atend) {
+                scopy(dp->d_name, enddir);
+                addfname(expdir);
+            } else {
+                for (p = enddir, cp = dp->d_name;
+                     (*p++ = *cp++) != '\0';)
+                    continue;
+                p[-1] = '/';
+                expmeta(p, endname);
+            }
+        }
+    }
+    closedir(dirp);
+    if (! atend)
+        endname[-1] = '/';
+}
+#endif
+/*
+ * Add a file name to the list.
+ */
+STATIC void
+addfname(name)
+    char *name;
+    {
+    char *p;
+    struct strlist *sp;
+    p = stalloc(strlen(name) + 1);
+    scopy(name, p);
+    sp = (struct strlist *)stalloc(sizeof *sp);
+    sp->text = p;
+    *exparg.lastp = sp;
+    exparg.lastp = &sp->next;
+}
+#if !(defined(__GLIBC__) && !defined(GLOB_BROKEN))
+/*
+ * Sort the results of file name expansion.  It calculates the number of
+ * strings to sort and then calls msort (short for merge sort) to do the
+ * work.
+ */
+STATIC struct strlist *
+expsort(str)
+    struct strlist *str;
+    {
+    int len;
+    struct strlist *sp;
+    len = 0;
+    for (sp = str ; sp ; sp = sp->next)
+        len++;
+    return msort(str, len);
+}
+STATIC struct strlist *
+msort(list, len)
+    struct strlist *list;
+    int len;
+{
+    struct strlist *p, *q = NULL;
+    struct strlist **lpp;
+    int half;
+    int n;
+    if (len <= 1)
+        return list;
+    half = len >> 1;
+    p = list;
+    for (n = half ; --n >= 0 ; ) {
+        q = p;
+        p = p->next;
+    }
+    q->next = NULL;         /* terminate first half of list */
+    q = msort(list, half);      /* sort first half of list */
+    p = msort(p, len - half);       /* sort second half */
+    lpp = &list;
+    for (;;) {
+        if (strcmp(p->text, q->text) < 0) {
+            *lpp = p;
+            lpp = &p->next;
+            if ((p = *lpp) == NULL) {
+                *lpp = q;
+                break;
+            }
+        } else {
+            *lpp = q;
+            lpp = &q->next;
+            if ((q = *lpp) == NULL) {
+                *lpp = p;
+                break;
+            }
+        }
+    }
+    return list;
+}
+#endif
+/*
+ * Returns true if the pattern matches the string.
+ */
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+STATIC int
+patmatch(pattern, string, squoted)
+    char *pattern;
+    char *string;
+    int squoted;    /* string might have quote chars */
+    {
+    const char *p;
+    char *q;
+    p = preglob(pattern);
+    q = squoted ? _rmescapes(string, 1) : string;
+    return !fnmatch(p, q, 0);
+}
+STATIC int
+patmatch2(pattern, string, squoted)
+    char *pattern;
+    char *string;
+    int squoted;    /* string might have quote chars */
+    {
+    char *p;
+    int res;
+    sstrnleft--;
+    p = grabstackstr(expdest);
+    res = patmatch(pattern, string, squoted);
+    ungrabstackstr(p, expdest);
+    return res;
+}
+#else
+int
+patmatch(pattern, string, squoted)
+    char *pattern;
+    char *string;
+    int squoted;    /* string might have quote chars */
+    {
+#ifdef notdef
+    if (pattern[0] == '!' && pattern[1] == '!')
+        return 1 - pmatch(pattern + 2, string);
+    else
+#endif
+        return pmatch(pattern, string, squoted);
+}
+STATIC int
+pmatch(pattern, string, squoted)
+    char *pattern;
+    char *string;
+    int squoted;
+    {
+    char *p, *q;
+    char c;
+    p = pattern;
+    q = string;
+    for (;;) {
+        switch (c = *p++) {
+        case '\0':
+            goto breakloop;
+        case CTLESC:
+            if (squoted && *q == CTLESC)
+                q++;
+            if (*q++ != *p++)
+                return 0;
+            break;
+        case CTLQUOTEMARK:
+            continue;
+        case '?':
+            if (squoted && *q == CTLESC)
+                q++;
+            if (*q++ == '\0')
+                return 0;
+            break;
+        case '*':
+            c = *p;
+            while (c == CTLQUOTEMARK || c == '*')
+                c = *++p;
+            if (c != CTLESC &&  c != CTLQUOTEMARK &&
+                c != '?' && c != '*' && c != '[') {
+                while (*q != c) {
+                    if (squoted && *q == CTLESC &&
+                        q[1] == c)
+                        break;
+                    if (*q == '\0')
+                        return 0;
+                    if (squoted && *q == CTLESC)
+                        q++;
+                    q++;
+                }
+            }
+            do {
+                if (pmatch(p, q, squoted))
+                    return 1;
+                if (squoted && *q == CTLESC)
+                    q++;
+            } while (*q++ != '\0');
+            return 0;
+        case '[': {
+            char *endp;
+            int invert, found;
+            char chr;
+            endp = p;
+            if (*endp == '!')
+                endp++;
+            for (;;) {
+                while (*endp == CTLQUOTEMARK)
+                    endp++;
+                if (*endp == '\0')
+                    goto dft;       /* no matching ] */
+                if (*endp == CTLESC)
+                    endp++;
+                if (*++endp == ']')
+                    break;
+            }
+            invert = 0;
+            if (*p == '!') {
+                invert++;
+                p++;
+            }
+            found = 0;
+            chr = *q++;
+            if (squoted && chr == CTLESC)
+                chr = *q++;
+            if (chr == '\0')
+                return 0;
+            c = *p++;
+            do {
+                if (c == CTLQUOTEMARK)
+                    continue;
+                if (c == CTLESC)
+                    c = *p++;
+                if (*p == '-' && p[1] != ']') {
+                    p++;
+                    while (*p == CTLQUOTEMARK)
+                        p++;
+                    if (*p == CTLESC)
+                        p++;
+                    if (chr >= c && chr <= *p)
+                        found = 1;
+                    p++;
+                } else {
+                    if (chr == c)
+                        found = 1;
+                }
+            } while ((c = *p++) != ']');
+            if (found == invert)
+                return 0;
+            break;
+        }
+dft:            default:
+            if (squoted && *q == CTLESC)
+                q++;
+            if (*q++ != c)
+                return 0;
+            break;
+        }
+    }
+breakloop:
+    if (*q != '\0')
+        return 0;
+    return 1;
+}
+#endif
+/*
+ * Remove any CTLESC characters from a string.
+ */
+#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
+void
+rmescapes(str)
+    char *str;
+{
+    _rmescapes(str, 0);
+}
+STATIC char *
+_rmescapes(str, flag)
+    char *str;
+    int flag;
+{
+    char *p, *q, *r;
+    p = str;
+    while (*p != CTLESC && *p != CTLQUOTEMARK) {
+        if (*p++ == '\0')
+            return str;
+    }
+    q = p;
+    r = str;
+    if (flag) {
+        size_t len = p - str;
+        q = r = stalloc(strlen(p) + len + 1);
+        if (len > 0) {
+            memcpy(q, str, len);
+            q += len;
+        }
+    }
+    while (*p) {
+        if (*p == CTLQUOTEMARK) {
+            p++;
+            continue;
+        }
+        if (*p == CTLESC)
+            p++;
+        *q++ = *p++;
+    }
+    *q = '\0';
+    return r;
+}
+#else
+void
+rmescapes(str)
+    char *str;
+{
+    char *p, *q;
+    p = str;
+    while (*p != CTLESC && *p != CTLQUOTEMARK) {
+        if (*p++ == '\0')
+            return;
+    }
+    q = p;
+    while (*p) {
+        if (*p == CTLQUOTEMARK) {
+            p++;
+            continue;
+        }
+        if (*p == CTLESC)
+            p++;
+        *q++ = *p++;
+    }
+    *q = '\0';
+}
+#endif
+/*
+ * See if a pattern matches in a case statement.
+ */
+int
+casematch(pattern, val)
+    union node *pattern;
+    char *val;
+    {
+    struct stackmark smark;
+    int result;
+    char *p;
+    setstackmark(&smark);
+    argbackq = pattern->narg.backquote;
+    STARTSTACKSTR(expdest);
+    ifslastp = NULL;
+    argstr(pattern->narg.text, EXP_TILDE | EXP_CASE);
+    STPUTC('\0', expdest);
+    p = grabstackstr(expdest);
+    result = patmatch(p, val, 0);
+    popstackmark(&smark);
+    return result;
+}
+/*
+ * Our own itoa().
+ */
+STATIC char *
+cvtnum(num, buf)
+    int num;
+    char *buf;
+    {
+    char temp[32];
+    int neg = num < 0;
+    char *p = temp + 31;
+    temp[31] = '\0';
+    do {
+        *--p = num % 10 + '0';
+    } while ((num /= 10) != 0);
+    if (neg)
+        *--p = '-';
+    while (*p)
+        STPUTC(*p++, buf);
+    return buf;
+}

 /trunk/uspace/app/ash/mail.c
 ,0 → 1,125
+/*  $NetBSD: mail.c,v 1.14 2000/07/03 03:26:19 matt Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)mail.c  8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: mail.c,v 1.14 2000/07/03 03:26:19 matt Exp $");
+#endif
+#endif /* not lint */
+/*
+ * Routines to check for mail.  (Perhaps make part of main.c?)
+ */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include "shell.h"
+#include "exec.h"   /* defines padvance() */
+#include "var.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "mail.h"
+#define MAXMBOXES 10
+STATIC int nmboxes;         /* number of mailboxes */
+STATIC time_t mailtime[MAXMBOXES];  /* times of mailboxes */
+/*
+ * Print appropriate message(s) if mail has arrived.  If the argument is
+ * nozero, then the value of MAIL has changed, so we just update the
+ * values.
+ */
+void
+chkmail(silent)
+    int silent;
+{
+    int i;
+    const char *mpath;
+    char *p;
+    char *q;
+    struct stackmark smark;
+    struct stat statb;
+    if (silent)
+        nmboxes = 10;
+    if (nmboxes == 0)
+        return;
+    setstackmark(&smark);
+    mpath = mpathset()? mpathval() : mailval();
+    for (i = 0 ; i < nmboxes ; i++) {
+        p = padvance(&mpath, nullstr);
+        if (p == NULL)
+            break;
+        if (*p == '\0')
+            continue;
+        for (q = p ; *q ; q++);
+        if (q[-1] != '/')
+            abort();
+        q[-1] = '\0';           /* delete trailing '/' */
+#ifdef notdef /* this is what the System V shell claims to do (it lies) */
+        if (stat(p, &statb) < 0)
+            statb.st_mtime = 0;
+        if (statb.st_mtime > mailtime[i] && ! silent) {
+            out2str(pathopt? pathopt : "you have mail");
+            out2c('\n');
+        }
+        mailtime[i] = statb.st_mtime;
+#else /* this is what it should do */
+        if (stat(p, &statb) < 0)
+            statb.st_size = 0;
+        if (statb.st_size > mailtime[i] && ! silent) {
+            out2str(pathopt? pathopt : "you have mail");
+            out2c('\n');
+        }
+        mailtime[i] = statb.st_size;
+#endif
+    }
+    nmboxes = i;
+    popstackmark(&smark);
+}

 /trunk/uspace/app/ash/miscbltin.c
 ,0 → 1,422
+/*  $NetBSD: miscbltin.c,v 1.29 2001/01/04 15:39:51 lukem Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: miscbltin.c,v 1.29 2001/01/04 15:39:51 lukem Exp $");
+#endif
+#endif /* not lint */
+/*
+ * Miscelaneous builtins.
+ */
+#include <sys/types.h>      /* quad_t */
+#include <sys/param.h>      /* BSD4_4 */
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include "shell.h"
+#include "options.h"
+#include "var.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
+#include "miscbltin.h"
+#include "mystring.h"
+#undef rflag
+#ifdef __GLIBC__
+mode_t getmode(const void *, mode_t);
+void *setmode(const char *);
+#if !defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
+typedef enum __rlimit_resource rlim_t;
+#endif
+#endif
+extern char **argptr;       /* argument list for builtin command */
+/*
+ * The read builtin.  The -e option causes backslashes to escape the
+ * following character.
+ *
+ * This uses unbuffered input, which may be avoidable in some cases.
+ */
+int
+readcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char **ap;
+    int backslash;
+    char c;
+    int rflag;
+    char *prompt;
+    char *ifs;
+    char *p;
+    int startword;
+    int status;
+    int i;
+    rflag = 0;
+    prompt = NULL;
+    while ((i = nextopt("p:r")) != '\0') {
+        if (i == 'p')
+            prompt = optarg;
+        else
+            rflag = 1;
+    }
+    if (prompt && isatty(0)) {
+        out2str(prompt);
+        flushall();
+    }
+    if (*(ap = argptr) == NULL)
+        error("arg count");
+    if ((ifs = bltinlookup("IFS", 1)) == NULL)
+        ifs = nullstr;
+    status = 0;
+    startword = 1;
+    backslash = 0;
+    STARTSTACKSTR(p);
+    for (;;) {
+        if (read(0, &c, 1) != 1) {
+            status = 1;
+            break;
+        }
+        if (c == '\0')
+            continue;
+        if (backslash) {
+            backslash = 0;
+            if (c != '\n')
+                STPUTC(c, p);
+            continue;
+        }
+        if (!rflag && c == '\\') {
+            backslash++;
+            continue;
+        }
+        if (c == '\n')
+            break;
+        if (startword && *ifs == ' ' && strchr(ifs, c)) {
+            continue;
+        }
+        startword = 0;
+        if (backslash && c == '\\') {
+            if (read(0, &c, 1) != 1) {
+                status = 1;
+                break;
+            }
+            STPUTC(c, p);
+        } else if (ap[1] != NULL && strchr(ifs, c) != NULL) {
+            STACKSTRNUL(p);
+            setvar(*ap, stackblock(), 0);
+            ap++;
+            startword = 1;
+            STARTSTACKSTR(p);
+        } else {
+            STPUTC(c, p);
+        }
+    }
+    STACKSTRNUL(p);
+    /* Remove trailing blanks */
+    while (stackblock() <= --p && strchr(ifs, *p) != NULL)
+        *p = '\0';
+    setvar(*ap, stackblock(), 0);
+    while (*++ap != NULL)
+        setvar(*ap, nullstr, 0);
+    return status;
+}
+int
+umaskcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char *ap;
+    int mask;
+    int i;
+    int symbolic_mode = 0;
+    while ((i = nextopt("S")) != '\0') {
+        symbolic_mode = 1;
+    }
+    INTOFF;
+    mask = umask(0);
+    umask(mask);
+    INTON;
+    if ((ap = *argptr) == NULL) {
+        if (symbolic_mode) {
+            char u[4], g[4], o[4];
+            i = 0;
+            if ((mask & S_IRUSR) == 0)
+                u[i++] = 'r';
+            if ((mask & S_IWUSR) == 0)
+                u[i++] = 'w';
+            if ((mask & S_IXUSR) == 0)
+                u[i++] = 'x';
+            u[i] = '\0';
+            i = 0;
+            if ((mask & S_IRGRP) == 0)
+                g[i++] = 'r';
+            if ((mask & S_IWGRP) == 0)
+                g[i++] = 'w';
+            if ((mask & S_IXGRP) == 0)
+                g[i++] = 'x';
+            g[i] = '\0';
+            i = 0;
+            if ((mask & S_IROTH) == 0)
+                o[i++] = 'r';
+            if ((mask & S_IWOTH) == 0)
+                o[i++] = 'w';
+            if ((mask & S_IXOTH) == 0)
+                o[i++] = 'x';
+            o[i] = '\0';
+            out1fmt("u=%s,g=%s,o=%s\n", u, g, o);
+        } else {
+            out1fmt("%.4o\n", mask);
+        }
+    } else {
+        if (isdigit((unsigned char)*ap)) {
+            mask = 0;
+            do {
+                if (*ap >= '8' || *ap < '0')
+                    error("Illegal number: %s", argv[1]);
+                mask = (mask << 3) + (*ap - '0');
+            } while (*++ap != '\0');
+            umask(mask);
+        } else {
+            void *set;
+            INTOFF;
+            if ((set = setmode(ap)) != 0) {
+                mask = getmode(set, ~mask & 0777);
+                ckfree(set);
+            }
+            INTON;
+            if (!set)
+                error("Illegal mode: %s", ap);
+            umask(~mask & 0777);
+        }
+    }
+    return 0;
+}
+/*
+ * ulimit builtin
+ *
+ * This code, originally by Doug Gwyn, Doug Kingston, Eric Gisin, and
+ * Michael Rendell was ripped from pdksh 5.0.8 and hacked for use with
+ * ash by J.T. Conklin.
+ *
+ * Public domain.
+ */
+struct limits {
+    const char *name;
+    int cmd;
+    int factor; /* multiply by to get rlim_{cur,max} values */
+    char    option;
+};
+static const struct limits limits[] = {
+#ifdef RLIMIT_CPU
+    { "time(seconds)",      RLIMIT_CPU,    1, 't' },
+#endif
+#ifdef RLIMIT_FSIZE
+    { "file(blocks)",       RLIMIT_FSIZE,    512, 'f' },
+#endif
+#ifdef RLIMIT_DATA
+    { "data(kbytes)",       RLIMIT_DATA,    1024, 'd' },
+#endif
+#ifdef RLIMIT_STACK
+    { "stack(kbytes)",      RLIMIT_STACK,   1024, 's' },
+#endif
+#ifdef  RLIMIT_CORE
+    { "coredump(blocks)",       RLIMIT_CORE,     512, 'c' },
+#endif
+#ifdef RLIMIT_RSS
+    { "memory(kbytes)",     RLIMIT_RSS, 1024, 'm' },
+#endif
+#ifdef RLIMIT_MEMLOCK
+    { "locked memory(kbytes)",  RLIMIT_MEMLOCK, 1024, 'l' },
+#endif
+#ifdef RLIMIT_NPROC
+    { "process(processes)",     RLIMIT_NPROC,      1, 'p' },
+#endif
+#ifdef RLIMIT_NOFILE
+    { "nofiles(descriptors)",   RLIMIT_NOFILE,     1, 'n' },
+#endif
+#ifdef RLIMIT_VMEM
+    { "vmemory(kbytes)",        RLIMIT_VMEM,    1024, 'v' },
+#endif
+#ifdef RLIMIT_SWAP
+    { "swap(kbytes)",       RLIMIT_SWAP,    1024, 'w' },
+#endif
+    { (char *) 0,           0,         0,  '\0' }
+};
+int
+ulimitcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int c;
+    rlim_t val = 0;
+    enum { SOFT = 0x1, HARD = 0x2 }
+            how = SOFT | HARD;
+    const struct limits *l;
+    int     set, all = 0;
+    int     optc, what;
+    struct rlimit   limit;
+    what = 'f';
+    while ((optc = nextopt("HSatfdsmcnpl")) != '\0')
+        switch (optc) {
+        case 'H':
+            how = HARD;
+            break;
+        case 'S':
+            how = SOFT;
+            break;
+        case 'a':
+            all = 1;
+            break;
+        default:
+            what = optc;
+        }
+    for (l = limits; l->name && l->option != what; l++)
+        ;
+    if (!l->name)
+        error("internal error (%c)", what);
+    set = *argptr ? 1 : 0;
+    if (set) {
+        char *p = *argptr;
+        if (all || argptr[1])
+            error("too many arguments");
+        if (strcmp(p, "unlimited") == 0)
+            val = RLIM_INFINITY;
+        else {
+            val = (rlim_t) 0;
+            while ((c = *p++) >= '0' && c <= '9')
+            {
+                val = (val * 10) + (long)(c - '0');
+                if (val < (rlim_t) 0)
+                    break;
+            }
+            if (c)
+                error("bad number");
+            val *= l->factor;
+        }
+    }
+    if (all) {
+        for (l = limits; l->name; l++) {
+            getrlimit(l->cmd, &limit);
+            if (how & SOFT)
+                val = limit.rlim_cur;
+            else if (how & HARD)
+                val = limit.rlim_max;
+            out1fmt("%-20s ", l->name);
+            if (val == RLIM_INFINITY)
+                out1fmt("unlimited\n");
+            else
+            {
+                val /= l->factor;
+#ifdef BSD4_4
+                out1fmt("%lld\n", (long long) val);
+#else
+                out1fmt("%ld\n", (long) val);
+#endif
+            }
+        }
+        return 0;
+    }
+    getrlimit(l->cmd, &limit);
+    if (set) {
+        if (how & HARD)
+            limit.rlim_max = val;
+        if (how & SOFT)
+            limit.rlim_cur = val;
+        if (setrlimit(l->cmd, &limit) < 0)
+            error("error setting limit (%s)", strerror(errno));
+    } else {
+        if (how & SOFT)
+            val = limit.rlim_cur;
+        else if (how & HARD)
+            val = limit.rlim_max;
+        if (val == RLIM_INFINITY)
+            out1fmt("unlimited\n");
+        else
+        {
+            val /= l->factor;
+#ifdef BSD4_4
+            out1fmt("%lld\n", (long long) val);
+#else
+            out1fmt("%ld\n", (long) val);
+#endif
+        }
+    }
+    return 0;
+}

 /trunk/uspace/app/ash/main.c
 ,0 → 1,432
+/*  $NetBSD: main.c,v 1.39 2000/11/01 19:56:01 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
+    The Regents of the University of California.  All rights reserved.\n");
+#endif /* not lint */
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)main.c  8.7 (Berkeley) 7/19/95";
+#else
+__RCSID("$NetBSD: main.c,v 1.39 2000/11/01 19:56:01 christos Exp $");
+#endif
+#endif /* not lint */
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include "shell.h"
+#include "main.h"
+#include "mail.h"
+#include "options.h"
+#include "output.h"
+#include "parser.h"
+#include "nodes.h"
+#include "expand.h"
+#include "eval.h"
+#include "jobs.h"
+#include "input.h"
+#include "trap.h"
+#include "var.h"
+#include "show.h"
+#include "memalloc.h"
+#include "error.h"
+#include "init.h"
+#include "mystring.h"
+#include "exec.h"
+#include "cd.h"
+#ifdef HETIO
+#include "hetio.h"
+#endif
+#define PROFILE 0
+int rootpid;
+int rootshell;
+STATIC union node *curcmd;
+STATIC union node *prevcmd;
+#if PROFILE
+short profile_buf[16384];
+extern int etext();
+#endif
+STATIC void read_profile (const char *);
+STATIC char *find_dot_file (char *);
+int main (int, char **);
+/*
+ * Main routine.  We initialize things, parse the arguments, execute
+ * profiles if we're a login shell, and then call cmdloop to execute
+ * commands.  The setjmp call sets up the location to jump to when an
+ * exception occurs.  When an exception occurs the variable "state"
+ * is used to figure out how far we had gotten.
+ */
+int
+main(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct jmploc jmploc;
+    struct stackmark smark;
+    volatile int state;
+    char *shinit;
+    int priviliged;
+    priviliged = getuid() != geteuid() || getgid() != getegid();
+#if PROFILE
+    monitor(4, etext, profile_buf, sizeof profile_buf, 50);
+#endif
+#if defined(linux) || defined(__GNU__)
+    signal(SIGCHLD, SIG_DFL);
+#endif
+    state = 0;
+    if (setjmp(jmploc.loc)) {
+        /*
+         * When a shell procedure is executed, we raise the
+         * exception EXSHELLPROC to clean up before executing
+         * the shell procedure.
+         */
+        switch (exception) {
+        case EXSHELLPROC:
+            rootpid = getpid();
+            rootshell = 1;
+            minusc = NULL;
+            state = 3;
+            break;
+        case EXEXEC:
+            exitstatus = exerrno;
+            break;
+        case EXERROR:
+            exitstatus = 2;
+            break;
+        default:
+            break;
+        }
+        if (exception != EXSHELLPROC) {
+            if (state == 0 || iflag == 0 || ! rootshell)
+                exitshell(exitstatus);
+        }
+        reset();
+        if (exception == EXINT
+#if ATTY
+         && (! attyset() || equal(termval(), "emacs"))
+#endif
+         ) {
+            out2c('\n');
+            flushout(&errout);
+        }
+        popstackmark(&smark);
+        FORCEINTON;             /* enable interrupts */
+        if (state == 1)
+            goto state1;
+        else if (state == 2)
+            goto state2;
+        else if (state == 3)
+            goto state3;
+        else
+            goto state4;
+    }
+    handler = &jmploc;
+#ifdef DEBUG
+    opentrace();
+    trputs("Shell args:  ");  trargs(argv);
+#endif
+    rootpid = getpid();
+    rootshell = 1;
+    init();
+    setstackmark(&smark);
+    procargs(argc, argv);
+    if (argv[0] && argv[0][0] == '-') {
+        state = 1;
+        read_profile("/etc/profile");
+state1:
+        state = 2;
+        if (priviliged == 0)
+            read_profile(".profile");
+        else
+            read_profile("/etc/suid_profile");
+    }
+state2:
+    state = 3;
+    if (iflag && !priviliged) {
+        if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
+            state = 3;
+            read_profile(shinit);
+        }
+    }
+state3:
+    state = 4;
+    if (sflag == 0 || minusc) {
+        static int sigs[] =  {
+            SIGINT, SIGQUIT, SIGHUP,
+#ifdef SIGTSTP
+            SIGTSTP,
+#endif
+            SIGPIPE
+        };
+#define SIGSSIZE (sizeof(sigs)/sizeof(sigs[0]))
+        int i;
+        for (i = 0; i < SIGSSIZE; i++)
+            setsignal(sigs[i]);
+    }
+    if (minusc)
+        evalstring(minusc, 0);
+    if (sflag || minusc == NULL) {
+state4: /* XXX ??? - why isn't this before the "if" statement */
+        cmdloop(1);
+    }
+#if PROFILE
+    monitor(0);
+#endif
+    exitshell(exitstatus);
+    /* NOTREACHED */
+}
+/*
+ * Read and execute commands.  "Top" is nonzero for the top level command
+ * loop; it turns on prompting if the shell is interactive.
+ */
+void
+cmdloop(top)
+    int top;
+{
+    union node *n;
+    struct stackmark smark;
+    int inter;
+    int numeof = 0;
+    TRACE(("cmdloop(%d) called\n", top));
+    setstackmark(&smark);
+#ifdef HETIO
+    if(iflag && top)
+        hetio_init();
+#endif
+    for (;;) {
+        if (pendingsigs)
+            dotrap();
+        inter = 0;
+        if (iflag && top) {
+            inter++;
+            showjobs(1);
+            chkmail(0);
+            flushout(&output);
+        }
+        n = parsecmd(inter);
+        /* showtree(n); DEBUG */
+        if (n == NEOF) {
+            if (!top || numeof >= 50)
+                break;
+            if (!stoppedjobs()) {
+                if (!Iflag)
+                    break;
+                out2str("\nUse \"exit\" to leave shell.\n");
+            }
+            numeof++;
+        } else if (n != NULL && nflag == 0) {
+            job_warning = (job_warning == 2) ? 1 : 0;
+            numeof = 0;
+            evaltree(n, 0);
+        }
+        popstackmark(&smark);
+        setstackmark(&smark);
+        if (evalskip == SKIPFILE) {
+            evalskip = 0;
+            break;
+        }
+    }
+    popstackmark(&smark);
+}
+/*
+ * Read /etc/profile or .profile.  Return on error.
+ */
+STATIC void
+read_profile(name)
+    const char *name;
+{
+    int fd;
+    int xflag_set = 0;
+    int vflag_set = 0;
+    INTOFF;
+    if ((fd = open(name, O_RDONLY)) >= 0)
+        setinputfd(fd, 1);
+    INTON;
+    if (fd < 0)
+        return;
+    /* -q turns off -x and -v just when executing init files */
+    if (qflag)  {
+        if (xflag)
+            xflag = 0, xflag_set = 1;
+        if (vflag)
+            vflag = 0, vflag_set = 1;
+    }
+    cmdloop(0);
+    if (qflag)  {
+        if (xflag_set)
+            xflag = 1;
+        if (vflag_set)
+            vflag = 1;
+    }
+    popfile();
+}
+/*
+ * Read a file containing shell functions.
+ */
+void
+readcmdfile(name)
+    char *name;
+{
+    int fd;
+    INTOFF;
+    if ((fd = open(name, O_RDONLY)) >= 0)
+        setinputfd(fd, 1);
+    else
+        error("Can't open %s", name);
+    INTON;
+    cmdloop(0);
+    popfile();
+}
+/*
+ * Take commands from a file.  To be compatable we should do a path
+ * search for the file, which is necessary to find sub-commands.
+ */
+STATIC char *
+find_dot_file(basename)
+    char *basename;
+{
+    char *fullname;
+    const char *path = pathval();
+    struct stat statb;
+    /* don't try this for absolute or relative paths */
+    if (strchr(basename, '/'))
+        return basename;
+    while ((fullname = padvance(&path, basename)) != NULL) {
+        if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
+            /*
+             * Don't bother freeing here, since it will
+             * be freed by the caller.
+             */
+            return fullname;
+        }
+        stunalloc(fullname);
+    }
+    /* not found in the PATH */
+    error("%s: not found", basename);
+    /* NOTREACHED */
+}
+int
+dotcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct strlist *sp;
+    exitstatus = 0;
+    for (sp = cmdenviron; sp ; sp = sp->next)
+        setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED);
+    if (argc >= 2) {        /* That's what SVR2 does */
+        char *fullname;
+        struct stackmark smark;
+        setstackmark(&smark);
+        fullname = find_dot_file(argv[1]);
+        setinputfile(fullname, 1);
+        commandname = fullname;
+        cmdloop(0);
+        popfile();
+        popstackmark(&smark);
+    }
+    return exitstatus;
+}
+int
+exitcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    extern int oexitstatus;
+    if (stoppedjobs())
+        return 0;
+    if (argc > 1)
+        exitstatus = number(argv[1]);
+    else
+        exitstatus = oexitstatus;
+    exitshell(exitstatus);
+    /* NOTREACHED */
+}

 /trunk/uspace/app/ash/expand.h
 ,0 → 1,77
+/*  $NetBSD: expand.h,v 1.12 1999/07/09 03:05:50 christos Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)expand.h    8.2 (Berkeley) 5/4/95
+ */
+struct strlist {
+    struct strlist *next;
+    char *text;
+};
+struct arglist {
+    struct strlist *list;
+    struct strlist **lastp;
+};
+/*
+ * expandarg() flags
+ */
+#define EXP_FULL    0x1 /* perform word splitting & file globbing */
+#define EXP_TILDE   0x2 /* do normal tilde expansion */
+#define EXP_VARTILDE    0x4 /* expand tildes in an assignment */
+#define EXP_REDIR   0x8 /* file glob for a redirection (1 match only) */
+#define EXP_CASE    0x10    /* keeps quotes around for CASE pattern */
+#define EXP_RECORD  0x20    /* need to record arguments for ifs breakup */
+union node;
+void expandhere (union node *, int);
+void expandarg (union node *, struct arglist *, int);
+void expari (int);
+#if !(defined(__GLIBC__) && !defined(GLOB_BROKEN))
+int patmatch (char *, char *, int);
+#endif
+void rmescapes (char *);
+int casematch (union node *, char *);
+/* From arith.y */
+int arith (const char *);
+int expcmd (int , char **);
+void arith_lex_reset (void);
+int yylex (void);

 /trunk/uspace/app/ash/mail.h
 ,0 → 1,41
+/*  $NetBSD: mail.h,v 1.8 1995/05/11 21:29:23 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)mail.h  8.2 (Berkeley) 5/4/95
+ */
+void chkmail (int);

 /trunk/uspace/app/ash/eval.c
 ,0 → 1,1159
+/*  $NetBSD: eval.c,v 1.56 2000/05/22 10:18:46 elric Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)eval.c  8.9 (Berkeley) 6/8/95";
+#else
+__RCSID("$NetBSD: eval.c,v 1.56 2000/05/22 10:18:46 elric Exp $");
+#endif
+#endif /* not lint */
+#include <sys/types.h>
+#include <signal.h>
+#include <malloc.h>
+#include <unistd.h>
+/*
+ * Evaluate a command.
+ */
+#include "shell.h"
+#include "nodes.h"
+#include "syntax.h"
+#include "expand.h"
+#include "parser.h"
+#include "jobs.h"
+#include "eval.h"
+#include "builtins.h"
+#include "options.h"
+#include "exec.h"
+#include "redir.h"
+#include "input.h"
+#include "output.h"
+#include "trap.h"
+#include "var.h"
+#include "memalloc.h"
+#include "error.h"
+#include "show.h"
+#include "mystring.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#endif
+/* flags in argument to evaltree */
+#define EV_EXIT 01      /* exit after evaluating tree */
+#define EV_TESTED 02        /* exit status is checked; ignore -e flag */
+#define EV_BACKCMD 04       /* command executing within back quotes */
+MKINIT int evalskip;        /* set if we are skipping commands */
+STATIC int skipcount;       /* number of levels to skip */
+MKINIT int loopnest;        /* current loop nesting level */
+int funcnest;           /* depth of function calls */
+char *commandname;
+struct strlist *cmdenviron;
+int exitstatus;         /* exit status of last command */
+int oexitstatus;        /* saved exit status */
+STATIC void evalloop (union node *, int);
+STATIC void evalfor (union node *, int);
+STATIC void evalcase (union node *, int);
+STATIC void evalsubshell (union node *, int);
+STATIC void expredir (union node *);
+STATIC void evalpipe (union node *);
+STATIC void evalcommand (union node *, int, struct backcmd *);
+STATIC void prehash (union node *);
+STATIC int is_assignment_builtin (const char *);
+STATIC const char *get_standard_path (void);
+/*
+ * Called to reset things after an exception.
+ */
+#ifdef mkinit
+INCLUDE "eval.h"
+RESET {
+    evalskip = 0;
+    loopnest = 0;
+    funcnest = 0;
+}
+SHELLPROC {
+    exitstatus = 0;
+}
+#endif
+/*
+ * The eval commmand.
+ */
+int
+evalcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+        char *p;
+        char *concat;
+        char **ap;
+        if (argc > 1) {
+                p = argv[1];
+                if (argc > 2) {
+                        STARTSTACKSTR(concat);
+                        ap = argv + 2;
+                        for (;;) {
+                                while (*p)
+                                        STPUTC(*p++, concat);
+                                if ((p = *ap++) == NULL)
+                                        break;
+                                STPUTC(' ', concat);
+                        }
+                        STPUTC('\0', concat);
+                        p = grabstackstr(concat);
+                }
+                evalstring(p, EV_TESTED);
+        }
+        return exitstatus;
+}
+/*
+ * Execute a command or commands contained in a string.
+ */
+void
+evalstring(s, flag)
+    char *s;
+    int flag;
+    {
+    union node *n;
+    struct stackmark smark;
+    setstackmark(&smark);
+    setinputstring(s, 1);
+    while ((n = parsecmd(0)) != NEOF) {
+        evaltree(n, flag);
+        popstackmark(&smark);
+    }
+    popfile();
+    popstackmark(&smark);
+}
+/*
+ * Evaluate a parse tree.  The value is left in the global variable
+ * exitstatus.
+ */
+void
+evaltree(n, flags)
+    union node *n;
+    int flags;
+{
+    if (n == NULL) {
+        TRACE(("evaltree(NULL) called\n"));
+        exitstatus = 0;
+        goto out;
+    }
+#ifndef SMALL
+    displayhist = 1;    /* show history substitutions done with fc */
+#endif
+    TRACE(("evaltree(0x%lx: %d) called\n", (long)n, n->type));
+    switch (n->type) {
+    case NSEMI:
+        evaltree(n->nbinary.ch1, flags & EV_TESTED);
+        if (evalskip)
+            goto out;
+        evaltree(n->nbinary.ch2, flags);
+        break;
+    case NAND:
+        evaltree(n->nbinary.ch1, EV_TESTED);
+        if (evalskip || exitstatus != 0) {
+            /* don't bomb out on "set -e; false && true" */
+            flags |= EV_TESTED;
+            goto out;
+        }
+        evaltree(n->nbinary.ch2, flags | EV_TESTED);
+        break;
+    case NOR:
+        evaltree(n->nbinary.ch1, EV_TESTED);
+        if (evalskip || exitstatus == 0)
+            goto out;
+        evaltree(n->nbinary.ch2, flags | EV_TESTED);
+        break;
+    case NREDIR:
+        expredir(n->nredir.redirect);
+        redirect(n->nredir.redirect, REDIR_PUSH);
+        evaltree(n->nredir.n, flags);
+        popredir();
+        break;
+    case NSUBSHELL:
+        evalsubshell(n, flags);
+        break;
+    case NBACKGND:
+        evalsubshell(n, flags);
+        break;
+    case NIF: {
+        evaltree(n->nif.test, EV_TESTED);
+        if (evalskip)
+            goto out;
+        if (exitstatus == 0)
+            evaltree(n->nif.ifpart, flags);
+        else if (n->nif.elsepart)
+            evaltree(n->nif.elsepart, flags);
+        else
+            exitstatus = 0;
+        break;
+    }
+    case NWHILE:
+    case NUNTIL:
+        evalloop(n, flags);
+        break;
+    case NFOR:
+        evalfor(n, flags);
+        break;
+    case NCASE:
+        evalcase(n, flags);
+        break;
+    case NDEFUN:
+        if (is_special_builtin(n->narg.text)) {
+            outfmt(out2, "%s is a special built-in\n", n->narg.text);
+            exitstatus = 1;
+            break;
+        }
+        defun(n->narg.text, n->narg.next);
+        exitstatus = 0;
+        break;
+    case NNOT:
+        evaltree(n->nnot.com, EV_TESTED);
+        exitstatus = !exitstatus;
+        break;
+    case NPIPE:
+        evalpipe(n);
+        break;
+    case NCMD:
+        evalcommand(n, flags, (struct backcmd *)NULL);
+        break;
+    default:
+        out1fmt("Node type = %d\n", n->type);
+        flushout(&output);
+        break;
+    }
+out:
+    if (pendingsigs)
+        dotrap();
+    if ((flags & EV_EXIT) || (eflag && exitstatus && !(flags & EV_TESTED)))
+        exitshell(exitstatus);
+}
+STATIC void
+evalloop(n, flags)
+    union node *n;
+    int flags;
+{
+    int status;
+    loopnest++;
+    status = 0;
+    for (;;) {
+        evaltree(n->nbinary.ch1, EV_TESTED);
+        if (evalskip) {
+skipping:     if (evalskip == SKIPCONT && --skipcount <= 0) {
+                evalskip = 0;
+                continue;
+            }
+            if (evalskip == SKIPBREAK && --skipcount <= 0)
+                evalskip = 0;
+            break;
+        }
+        if (n->type == NWHILE) {
+            if (exitstatus != 0)
+                break;
+        } else {
+            if (exitstatus == 0)
+                break;
+        }
+        evaltree(n->nbinary.ch2, flags & EV_TESTED);
+        status = exitstatus;
+        if (evalskip)
+            goto skipping;
+    }
+    loopnest--;
+    exitstatus = status;
+}
+STATIC void
+evalfor(n, flags)
+    union node *n;
+    int flags;
+{
+    struct arglist arglist;
+    union node *argp;
+    struct strlist *sp;
+    struct stackmark smark;
+    setstackmark(&smark);
+    arglist.lastp = &arglist.list;
+    for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
+        oexitstatus = exitstatus;
+        expandarg(argp, &arglist, EXP_FULL | EXP_TILDE | EXP_RECORD);
+        if (evalskip)
+            goto out;
+    }
+    *arglist.lastp = NULL;
+    exitstatus = 0;
+    loopnest++;
+    for (sp = arglist.list ; sp ; sp = sp->next) {
+        setvar(n->nfor.var, sp->text, 0);
+        evaltree(n->nfor.body, flags & EV_TESTED);
+        if (evalskip) {
+            if (evalskip == SKIPCONT && --skipcount <= 0) {
+                evalskip = 0;
+                continue;
+            }
+            if (evalskip == SKIPBREAK && --skipcount <= 0)
+                evalskip = 0;
+            break;
+        }
+    }
+    loopnest--;
+out:
+    popstackmark(&smark);
+}
+STATIC void
+evalcase(n, flags)
+    union node *n;
+    int flags;
+{
+    union node *cp;
+    union node *patp;
+    struct arglist arglist;
+    struct stackmark smark;
+    setstackmark(&smark);
+    arglist.lastp = &arglist.list;
+    oexitstatus = exitstatus;
+    expandarg(n->ncase.expr, &arglist, EXP_TILDE);
+    for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
+        for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
+            if (casematch(patp, arglist.list->text)) {
+                if (evalskip == 0) {
+                    evaltree(cp->nclist.body, flags);
+                }
+                goto out;
+            }
+        }
+    }
+out:
+    popstackmark(&smark);
+}
+/*
+ * Kick off a subshell to evaluate a tree.
+ */
+STATIC void
+evalsubshell(n, flags)
+    union node *n;
+    int flags;
+{
+    struct job *jp;
+    int backgnd = (n->type == NBACKGND);
+    expredir(n->nredir.redirect);
+    jp = makejob(n, 1);
+    if (forkshell(jp, n, backgnd) == 0) {
+        if (backgnd)
+            flags &=~ EV_TESTED;
+        redirect(n->nredir.redirect, 0);
+        evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */
+    }
+    if (! backgnd) {
+        INTOFF;
+        exitstatus = waitforjob(jp);
+        INTON;
+    }
+}
+/*
+ * Compute the names of the files in a redirection list.
+ */
+STATIC void
+expredir(n)
+    union node *n;
+{
+    union node *redir;
+    for (redir = n ; redir ; redir = redir->nfile.next) {
+        struct arglist fn;
+        fn.lastp = &fn.list;
+        oexitstatus = exitstatus;
+        switch (redir->type) {
+        case NFROMTO:
+        case NFROM:
+        case NTO:
+        case NAPPEND:
+        case NTOOV:
+            expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
+            redir->nfile.expfname = fn.list->text;
+            break;
+        case NFROMFD:
+        case NTOFD:
+            if (redir->ndup.vname) {
+                expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
+                fixredir(redir, fn.list->text, 1);
+            }
+            break;
+        }
+    }
+}
+/*
+ * Evaluate a pipeline.  All the processes in the pipeline are children
+ * of the process creating the pipeline.  (This differs from some versions
+ * of the shell, which make the last process in a pipeline the parent
+ * of all the rest.)
+ */
+STATIC void
+evalpipe(n)
+    union node *n;
+{
+    struct job *jp;
+    struct nodelist *lp;
+    int pipelen;
+    int prevfd;
+    int pip[2];
+    TRACE(("evalpipe(0x%lx) called\n", (long)n));
+    pipelen = 0;
+    for (lp = n->npipe.cmdlist ; lp ; lp = lp->next)
+        pipelen++;
+    INTOFF;
+    jp = makejob(n, pipelen);
+    prevfd = -1;
+    for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) {
+        prehash(lp->n);
+        pip[1] = -1;
+        if (lp->next) {
+            if (pipe(pip) < 0) {
+                close(prevfd);
+                error("Pipe call failed");
+            }
+        }
+        if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) {
+            INTON;
+            if (prevfd > 0) {
+                close(0);
+                copyfd(prevfd, 0);
+                close(prevfd);
+                if (pip[0] == 0) {
+                    pip[0] = -1;
+                }
+            }
+            if (pip[1] >= 0) {
+                if (pip[0] >= 0) {
+                    close(pip[0]);
+                }
+                if (pip[1] != 1) {
+                    close(1);
+                    copyfd(pip[1], 1);
+                    close(pip[1]);
+                }
+            }
+            evaltree(lp->n, EV_EXIT);
+        }
+        if (prevfd >= 0)
+            close(prevfd);
+        prevfd = pip[0];
+        close(pip[1]);
+    }
+    INTON;
+    if (n->npipe.backgnd == 0) {
+        INTOFF;
+        exitstatus = waitforjob(jp);
+        TRACE(("evalpipe:  job done exit status %d\n", exitstatus));
+        INTON;
+    }
+}
+/*
+ * Execute a command inside back quotes.  If it's a builtin command, we
+ * want to save its output in a block obtained from malloc.  Otherwise
+ * we fork off a subprocess and get the output of the command via a pipe.
+ * Should be called with interrupts off.
+ */
+void
+evalbackcmd(n, result)
+    union node *n;
+    struct backcmd *result;
+{
+    int pip[2];
+    struct job *jp;
+    struct stackmark smark;     /* unnecessary */
+    setstackmark(&smark);
+    result->fd = -1;
+    result->buf = NULL;
+    result->nleft = 0;
+    result->jp = NULL;
+    if (n == NULL) {
+        exitstatus = 0;
+        goto out;
+    }
+#ifdef notyet
+    /*
+     * For now we disable executing builtins in the same
+     * context as the shell, because we are not keeping
+     * enough state to recover from changes that are
+     * supposed only to affect subshells. eg. echo "`cd /`"
+     */
+    if (n->type == NCMD) {
+        exitstatus = oexitstatus;
+        evalcommand(n, EV_BACKCMD, result);
+    } else
+#endif
+    {
+        exitstatus = 0;
+        if (pipe(pip) < 0)
+            error("Pipe call failed");
+        jp = makejob(n, 1);
+        if (forkshell(jp, n, FORK_NOJOB) == 0) {
+            FORCEINTON;
+            close(pip[0]);
+            if (pip[1] != 1) {
+                close(1);
+                copyfd(pip[1], 1);
+                close(pip[1]);
+            }
+            eflag = 0;
+            evaltree(n, EV_EXIT);
+        }
+        close(pip[1]);
+        result->fd = pip[0];
+        result->jp = jp;
+    }
+out:
+    popstackmark(&smark);
+    TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
+        result->fd, result->buf, result->nleft, result->jp));
+}
+/*
+ * Execute a simple command.
+ */
+STATIC void
+evalcommand(cmd, flags, backcmd)
+    union node *cmd;
+    int flags;
+    struct backcmd *backcmd;
+{
+    struct stackmark smark;
+    union node *argp;
+    struct arglist arglist;
+    struct arglist varlist;
+    char **argv;
+    int argc;
+    char **envp;
+    int varflag;
+    int pseudovarflag;
+    struct strlist *sp;
+    int mode;
+    int pip[2];
+    struct cmdentry cmdentry;
+    struct job *jp;
+    struct jmploc jmploc;
+    struct jmploc *volatile savehandler;
+    char *volatile savecmdname;
+    volatile struct shparam saveparam;
+    struct localvar *volatile savelocalvars;
+    volatile int e;
+    char *lastarg;
+    int not_special;
+    const char *path;
+    const char *standard_path;
+#if __GNUC__
+    /* Avoid longjmp clobbering */
+    (void) &argv;
+    (void) &argc;
+    (void) &lastarg;
+    (void) &flags;
+    (void) &not_special;
+    (void) &standard_path;
+#endif
+    /* First expand the arguments. */
+    TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+    setstackmark(&smark);
+    arglist.lastp = &arglist.list;
+    varlist.lastp = &varlist.list;
+    arglist.list = 0;
+    varflag = 1;
+    pseudovarflag = 0;
+    oexitstatus = exitstatus;
+    exitstatus = 0;
+    not_special = 0;
+    path = pathval();
+    standard_path = NULL;
+    for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) {
+        char *p = argp->narg.text;
+        if ((varflag || pseudovarflag) && is_name(*p)) {
+            do {
+                p++;
+            } while (is_in_name(*p));
+            if (*p == '=') {
+                if (varflag)
+                    expandarg(argp, &varlist, EXP_VARTILDE);
+                else
+                    expandarg(argp, &arglist, EXP_VARTILDE);
+                continue;
+            }
+        }
+        expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
+        if (varflag && arglist.list && is_assignment_builtin(arglist.list->text))
+            pseudovarflag = 1;
+        varflag = 0;
+    }
+    *arglist.lastp = NULL;
+    *varlist.lastp = NULL;
+    expredir(cmd->ncmd.redirect);
+    argc = 0;
+    for (sp = arglist.list ; sp ; sp = sp->next)
+        argc++;
+    argv = stalloc(sizeof (char *) * (argc + 1));
+    for (sp = arglist.list ; sp ; sp = sp->next) {
+        TRACE(("evalcommand arg: %s\n", sp->text));
+        *argv++ = sp->text;
+    }
+    *argv = NULL;
+    lastarg = NULL;
+    if (iflag && funcnest == 0 && argc > 0)
+        lastarg = argv[-1];
+    argv -= argc;
+    /* Print the command if xflag is set. */
+    if (xflag) {
+        outc('+', &errout);
+        for (sp = varlist.list ; sp ; sp = sp->next) {
+            outc(' ', &errout);
+            out2str(sp->text);
+        }
+        for (sp = arglist.list ; sp ; sp = sp->next) {
+            outc(' ', &errout);
+            out2str(sp->text);
+        }
+        outc('\n', &errout);
+        flushout(&errout);
+    }
+    /* Now locate the command. */
+    if (argc == 0) {
+        cmdentry.cmdtype = CMDBUILTIN;
+        cmdentry.u.index = BLTINCMD;
+    } else {
+        static const char PATH[] = "PATH=";
+        const char *oldpath = NULL;
+        int findflag = DO_ERR;
+        /*
+         * Modify the command lookup path, if a PATH= assignment
+         * is present
+         */
+        for (sp = varlist.list ; sp ; sp = sp->next)
+            if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) {
+                path = sp->text + sizeof(PATH) - 1;
+                findflag |= DO_BRUTE;
+            }
+        for(;;) {
+            find_command(argv[0], &cmdentry, findflag, path);
+            if (oldpath) {
+                path = oldpath;
+                oldpath = NULL;
+            }
+            if (cmdentry.cmdtype == CMDUNKNOWN) {   /* command not found */
+                exitstatus = 127;
+                flushout(&errout);
+                goto out;
+            }
+            /* implement the bltin builtin here */
+            if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
+                not_special = 1;
+                for(;;) {
+                    argv++;
+                    if (--argc == 0)
+                        break;
+                    if ((cmdentry.u.index = find_builtin(*argv)) < 0) {
+                        outfmt(&errout, "%s: not found\n", *argv);
+                        exitstatus = 127;
+                        flushout(&errout);
+                        goto out;
+                    }
+                    if (cmdentry.u.index != BLTINCMD)
+                        break;
+                }
+            }
+            if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == COMMANDCMD) {
+                not_special = 1;
+                argv++;
+                if (--argc == 0) {
+                    exitstatus = 0;
+                    goto out;
+                }
+                if (*argv[0] == '-') {
+                    if (!equal(argv[0], "-p")) {
+                        argv--;
+                        argc++;
+                        break;
+                    }
+                    argv++;
+                    if (--argc == 0) {
+                        exitstatus = 0;
+                        goto out;
+                    }
+                    if (!standard_path) {
+                        standard_path = get_standard_path();
+                    }
+                    oldpath = path;
+                    path = standard_path;
+                    findflag |= DO_BRUTE;
+                }
+                findflag |= DO_NOFUN;
+                continue;
+            }
+            break;
+        }
+    }
+    /* Fork off a child process if necessary. */
+    if (cmd->ncmd.backgnd
+     || (cmdentry.cmdtype == CMDNORMAL && (flags & EV_EXIT) == 0)
+     || ((flags & EV_BACKCMD) != 0
+        && (cmdentry.cmdtype != CMDBUILTIN
+         || cmdentry.u.index == DOTCMD
+         || cmdentry.u.index == EVALCMD))) {
+        jp = makejob(cmd, 1);
+        mode = cmd->ncmd.backgnd;
+        if (flags & EV_BACKCMD) {
+            mode = FORK_NOJOB;
+            if (pipe(pip) < 0)
+                error("Pipe call failed");
+        }
+        if (forkshell(jp, cmd, mode) != 0)
+            goto parent;    /* at end of routine */
+        if (flags & EV_BACKCMD) {
+            FORCEINTON;
+            close(pip[0]);
+            if (pip[1] != 1) {
+                close(1);
+                copyfd(pip[1], 1);
+                close(pip[1]);
+            }
+        }
+        flags |= EV_EXIT;
+    }
+    /* This is the child process if a fork occurred. */
+    /* Execute the command. */
+    if (cmdentry.cmdtype == CMDFUNCTION) {
+#ifdef DEBUG
+        trputs("Shell function:  ");  trargs(argv);
+#endif
+        exitstatus = oexitstatus;
+        redirect(cmd->ncmd.redirect, REDIR_PUSH);
+        saveparam = shellparam;
+        shellparam.malloc = 0;
+        shellparam.nparam = argc - 1;
+        shellparam.p = argv + 1;
+        INTOFF;
+        savelocalvars = localvars;
+        localvars = NULL;
+        INTON;
+        if (setjmp(jmploc.loc)) {
+            if (exception == EXSHELLPROC) {
+                freeparam((volatile struct shparam *)
+                    &saveparam);
+            } else {
+                saveparam.optind = shellparam.optind;
+                saveparam.optoff = shellparam.optoff;
+                freeparam(&shellparam);
+                shellparam = saveparam;
+            }
+            poplocalvars();
+            localvars = savelocalvars;
+            handler = savehandler;
+            longjmp(handler->loc, 1);
+        }
+        savehandler = handler;
+        handler = &jmploc;
+        for (sp = varlist.list ; sp ; sp = sp->next)
+            mklocal(sp->text);
+        funcnest++;
+        evaltree(cmdentry.u.func, flags & EV_TESTED);
+        funcnest--;
+        INTOFF;
+        poplocalvars();
+        localvars = savelocalvars;
+        saveparam.optind = shellparam.optind;
+        saveparam.optoff = shellparam.optoff;
+        freeparam(&shellparam);
+        shellparam = saveparam;
+        handler = savehandler;
+        popredir();
+        INTON;
+        if (evalskip == SKIPFUNC) {
+            evalskip = 0;
+            skipcount = 0;
+        }
+        if (flags & EV_EXIT)
+            exitshell(exitstatus);
+    } else if (cmdentry.cmdtype == CMDBUILTIN) {
+#ifdef DEBUG
+        trputs("builtin command:  ");  trargs(argv);
+#endif
+        mode = (cmdentry.u.index == EXECCMD)? 0 : REDIR_PUSH;
+        if (flags == EV_BACKCMD) {
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+            openmemout();
+#else
+            memout.nleft = 0;
+            memout.nextc = memout.buf;
+            memout.bufsize = 64;
+#endif
+            mode |= REDIR_BACKQ;
+        }
+        redirect(cmd->ncmd.redirect, mode);
+        savecmdname = commandname;
+        cmdenviron = varlist.list;
+        e = -1;
+        if (setjmp(jmploc.loc)) {
+            e = exception;
+            exitstatus = (e == EXINT)? SIGINT+128 : 2;
+            goto cmddone;
+        }
+        savehandler = handler;
+        handler = &jmploc;
+        commandname = argv[0];
+        argptr = argv + 1;
+        optptr = NULL;          /* initialize nextopt */
+        exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
+        flushall();
+cmddone:
+        out1 = &output;
+        out2 = &errout;
+        freestdout();
+        if (!not_special && is_special_builtin(commandname))
+            listsetvar(cmdenviron);
+        cmdenviron = NULL;
+        if (e != EXSHELLPROC) {
+            commandname = savecmdname;
+            if (flags & EV_EXIT)
+                exitshell(exitstatus);
+        }
+        handler = savehandler;
+        if (e != -1) {
+            if ((e != EXERROR && e != EXEXEC)
+               || cmdentry.u.index == BLTINCMD
+               || cmdentry.u.index == DOTCMD
+               || cmdentry.u.index == EVALCMD
+#ifndef SMALL
+               || cmdentry.u.index == HISTCMD
+#endif
+               || cmdentry.u.index == EXECCMD)
+                exraise(e);
+            FORCEINTON;
+        }
+        if (cmdentry.u.index != EXECCMD)
+            popredir();
+        if (flags == EV_BACKCMD) {
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+            closememout();
+#endif
+            backcmd->buf = memout.buf;
+#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+            backcmd->nleft = memout.bufsize;
+#else
+            backcmd->nleft = memout.nextc - memout.buf;
+#endif
+            memout.buf = NULL;
+        }
+        cmdenviron = NULL;
+    } else {
+#ifdef DEBUG
+        trputs("normal command:  ");  trargs(argv);
+#endif
+        clearredir();
+        redirect(cmd->ncmd.redirect, 0);
+        for (sp = varlist.list ; sp ; sp = sp->next)
+            setvareq(sp->text, VEXPORT|VSTACK);
+        envp = environment();
+        shellexec(argv, envp, path, cmdentry.u.index);
+    }
+    goto out;
+parent: /* parent process gets here (if we forked) */
+    if (mode == 0) {    /* argument to fork */
+        INTOFF;
+        exitstatus = waitforjob(jp);
+        INTON;
+    } else if (mode == 2) {
+        backcmd->fd = pip[0];
+        close(pip[1]);
+        backcmd->jp = jp;
+    }
+out:
+    if (lastarg)
+        setvar("_", lastarg, 0);
+    popstackmark(&smark);
+    if (eflag && exitstatus && !(flags & EV_TESTED))
+        exitshell(exitstatus);
+}
+/*
+ * Search for a command.  This is called before we fork so that the
+ * location of the command will be available in the parent as well as
+ * the child.  The check for "goodname" is an overly conservative
+ * check that the name will not be subject to expansion.
+ */
+STATIC void
+prehash(n)
+    union node *n;
+{
+    struct cmdentry entry;
+    if (n->type == NCMD && n->ncmd.args)
+        if (goodname(n->ncmd.args->narg.text))
+            find_command(n->ncmd.args->narg.text, &entry, 0,
+                     pathval());
+}
+/*
+ * Builtin commands.  Builtin commands whose functions are closely
+ * tied to evaluation are implemented here.
+ */
+/*
+ * No command given, or a bltin command with no arguments.  Set the
+ * specified variables.
+ */
+int
+bltincmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    listsetvar(cmdenviron);
+    /*
+     * Preserve exitstatus of a previous possible redirection
+     * as POSIX mandates
+     */
+    return exitstatus;
+}
+/*
+ * Handle break and continue commands.  Break, continue, and return are
+ * all handled by setting the evalskip flag.  The evaluation routines
+ * above all check this flag, and if it is set they start skipping
+ * commands rather than executing them.  The variable skipcount is
+ * the number of loops to break/continue, or the number of function
+ * levels to return.  (The latter is always 1.)  It should probably
+ * be an error to break out of more loops than exist, but it isn't
+ * in the standard shell so we don't make it one here.
+ */
+int
+breakcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int n = argc > 1 ? number(argv[1]) : 1;
+    if (n > loopnest)
+        n = loopnest;
+    if (n > 0) {
+        evalskip = (**argv == 'c')? SKIPCONT : SKIPBREAK;
+        skipcount = n;
+    }
+    return 0;
+}
+/*
+ * The return command.
+ */
+int
+returncmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int ret = argc > 1 ? number(argv[1]) : oexitstatus;
+    if (funcnest) {
+        evalskip = SKIPFUNC;
+        skipcount = 1;
+        return ret;
+    }
+    else {
+        /* Do what ksh does; skip the rest of the file */
+        evalskip = SKIPFILE;
+        skipcount = 1;
+        return ret;
+    }
+}
+int
+falsecmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    return 1;
+}
+int
+truecmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    return 0;
+}
+int
+execcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    if (argc > 1) {
+        struct strlist *sp;
+        iflag = 0;      /* exit on error */
+        mflag = 0;
+        optschanged();
+        for (sp = cmdenviron; sp ; sp = sp->next)
+            setvareq(sp->text, VEXPORT|VSTACK);
+        shellexec(argv + 1, environment(), pathval(), 0);
+    }
+    return 0;
+}
+STATIC int
+is_assignment_builtin (command)
+    const char *command;
+{
+    static const char *assignment_builtins[] = {
+        "alias", "declare", "export", "local", "readonly", "typeset",
+        (char *)NULL
+    };
+    int i;
+    for (i = 0; assignment_builtins[i]; i++)
+        if (strcmp(command, assignment_builtins[i]) == 0) return 1;
+    return 0;
+}
+int
+is_special_builtin(name)
+    const char *name;
+{
+    static const char *special_builtins[] = {
+        "break", ":", ".", "continue", "eval", "exec", "exit",
+        "export", "readonly", "return", "set", "shift", "times",
+        "trap", "unset", (char *)NULL
+    };
+    int i;
+    if (!name) return 0;
+    for (i = 0; special_builtins[i]; i++)
+        if (equal(name, special_builtins[i])) return 1;
+    return 0;
+}
+STATIC const char *
+get_standard_path()
+{
+    char *p;
+    size_t len;
+    len = confstr(_CS_PATH, NULL, 0);
+    p = stalloc(len + 2);
+    *p = '\0';
+    confstr(_CS_PATH, p, len);
+    return p;
+}

 /trunk/uspace/app/ash/var.c
 ,0 → 1,777
+/*  $NetBSD: var.c,v 1.26 2000/12/20 00:15:10 cgd Exp $ */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)var.c   8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: var.c,v 1.26 2000/12/20 00:15:10 cgd Exp $");
+#endif
+#endif /* not lint */
+#include <unistd.h>
+#include <stdlib.h>
+#include <paths.h>
+/*
+ * Shell variables.
+ */
+#include "shell.h"
+#include "output.h"
+#include "expand.h"
+#include "nodes.h"  /* for other headers */
+#include "eval.h"   /* defines cmdenviron */
+#include "exec.h"
+#include "syntax.h"
+#include "options.h"
+#include "mail.h"
+#include "var.h"
+#include "memalloc.h"
+#include "error.h"
+#include "mystring.h"
+#include "parser.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#endif
+#define VTABSIZE 39
+struct varinit {
+    struct var *var;
+    int flags;
+    const char *text;
+    void (*func) (const char *);
+};
+#if ATTY
+struct var vatty;
+#endif
+#ifndef SMALL
+struct var vhistsize;
+struct var vterm;
+#endif
+struct var vifs;
+struct var vmail;
+struct var vmpath;
+struct var vpath;
+struct var vps1;
+struct var vps2;
+struct var vvers;
+struct var voptind;
+const struct varinit varinit[] = {
+#if ATTY
+    { &vatty,   VSTRFIXED|VTEXTFIXED|VUNSET,    "ATTY=",
+      NULL },
+#endif
+#ifndef SMALL
+    { &vhistsize,   VSTRFIXED|VTEXTFIXED|VUNSET,    "HISTSIZE=",
+      sethistsize },
+#endif
+    { &vifs,    VSTRFIXED|VTEXTFIXED,       "IFS= \t\n",
+      NULL },
+    { &vmail,   VSTRFIXED|VTEXTFIXED|VUNSET,    "MAIL=",
+      NULL },
+    { &vmpath,  VSTRFIXED|VTEXTFIXED|VUNSET,    "MAILPATH=",
+      NULL },
+    { &vpath,   VSTRFIXED|VTEXTFIXED,       "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+      changepath },
+    /*
+     * vps1 depends on uid
+     */
+    { &vps2,    VSTRFIXED|VTEXTFIXED,       "PS2=> ",
+      NULL },
+#ifndef SMALL
+    { &vterm,   VSTRFIXED|VTEXTFIXED|VUNSET,    "TERM=",
+      setterm },
+#endif
+    { &voptind, VSTRFIXED|VTEXTFIXED,       "OPTIND=1",
+      getoptsreset },
+    { NULL, 0,              NULL,
+      NULL }
+};
+struct var *vartab[VTABSIZE];
+STATIC struct var **hashvar (const char *);
+STATIC int varequal (const char *, const char *);
+/*
+ * Initialize the varable symbol tables and import the environment
+ * Setting PWD added by herbert
+ */
+#ifdef mkinit
+INCLUDE "cd.h"
+INCLUDE "var.h"
+INIT {
+    char **envp;
+    extern char **environ;
+    extern char *curdir;
+    initvar();
+    for (envp = environ ; *envp ; envp++) {
+        if (strchr(*envp, '=')) {
+            setvareq(*envp, VEXPORT|VTEXTFIXED);
+        }
+    }
+    getpwd();
+    setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
+}
+#endif
+/*
+ * This routine initializes the builtin variables.  It is called when the
+ * shell is initialized and again when a shell procedure is spawned.
+ */
+void
+initvar() {
+    const struct varinit *ip;
+    struct var *vp;
+    struct var **vpp;
+    char ppid[30];
+    for (ip = varinit ; (vp = ip->var) != NULL ; ip++) {
+        if ((vp->flags & VEXPORT) == 0) {
+            vpp = hashvar(ip->text);
+            vp->next = *vpp;
+            *vpp = vp;
+            vp->text = strdup(ip->text);
+            vp->flags = ip->flags;
+            vp->func = ip->func;
+        }
+    }
+    /*
+     * PS1 depends on uid
+     */
+    if ((vps1.flags & VEXPORT) == 0) {
+        vpp = hashvar("PS1=");
+        vps1.next = *vpp;
+        *vpp = &vps1;
+        vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
+        vps1.flags = VSTRFIXED|VTEXTFIXED;
+    }
+    snprintf(ppid, 29, "%ld", (long)getppid());
+    setvar("PPID", ppid, VREADONLY|VNOFUNC);
+}
+/*
+ * Safe version of setvar, returns 1 on success 0 on failure.
+ */
+int
+setvarsafe(name, val, flags)
+    const char *name, *val;
+    int flags;
+{
+    struct jmploc jmploc;
+    struct jmploc *volatile savehandler = handler;
+    int err = 0;
+#ifdef __GNUC__
+    (void) &err;
+#endif
+    if (setjmp(jmploc.loc))
+        err = 1;
+    else {
+        handler = &jmploc;
+        setvar(name, val, flags);
+    }
+    handler = savehandler;
+    return err;
+}
+/*
+ * Set the value of a variable.  The flags argument is ored with the
+ * flags of the variable.  If val is NULL, the variable is unset.
+ */
+void
+setvar(name, val, flags)
+    const char *name, *val;
+    int flags;
+{
+    const char *p;
+    const char *q;
+    char *d;
+    int len;
+    int namelen;
+    char *nameeq;
+    int isbad;
+    isbad = 0;
+    p = name;
+    if (! is_name(*p))
+        isbad = 1;
+    p++;
+    for (;;) {
+        if (! is_in_name(*p)) {
+            if (*p == '\0' || *p == '=')
+                break;
+            isbad = 1;
+        }
+        p++;
+    }
+    namelen = p - name;
+    if (isbad)
+        error("%.*s: bad variable name", namelen, name);
+    len = namelen + 2;      /* 2 is space for '=' and '\0' */
+    if (val == NULL) {
+        flags |= VUNSET;
+    } else {
+        len += strlen(val);
+    }
+    d = nameeq = ckmalloc(len);
+    q = name;
+    while (--namelen >= 0)
+        *d++ = *q++;
+    *d++ = '=';
+    *d = '\0';
+    if (val)
+        scopy(val, d);
+    setvareq(nameeq, flags);
+}
+/*
+ * Same as setvar except that the variable and value are passed in
+ * the first argument as name=value.  Since the first argument will
+ * be actually stored in the table, it should not be a string that
+ * will go away.
+ */
+void
+setvareq(s, flags)
+    char *s;
+    int flags;
+{
+    struct var *vp, **vpp;
+    vpp = hashvar(s);
+    flags |= (VEXPORT & (((unsigned) (1 - aflag)) - 1));
+    for (vp = *vpp ; vp ; vp = vp->next) {
+        if (varequal(s, vp->text)) {
+            if (vp->flags & VREADONLY) {
+                size_t len = strchr(s, '=') - s;
+                error("%.*s: is read only", len, s);
+            }
+            INTOFF;
+            if (vp->func && (flags & VNOFUNC) == 0)
+                (*vp->func)(strchr(s, '=') + 1);
+            if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
+                ckfree(vp->text);
+            vp->flags &= ~(VTEXTFIXED|VSTACK|VUNSET);
+            vp->flags |= flags;
+            vp->text = s;
+            /*
+             * We could roll this to a function, to handle it as
+             * a regular variable function callback, but why bother?
+             */
+            if (iflag &&
+                (vp == &vmpath || (vp == &vmail && ! mpathset())))
+                chkmail(1);
+            INTON;
+            return;
+        }
+    }
+    /* not found */
+    vp = ckmalloc(sizeof (*vp));
+    vp->flags = flags;
+    vp->text = s;
+    vp->next = *vpp;
+    vp->func = NULL;
+    *vpp = vp;
+}
+/*
+ * Process a linked list of variable assignments.
+ */
+void
+listsetvar(list)
+    struct strlist *list;
+    {
+    struct strlist *lp;
+    INTOFF;
+    for (lp = list ; lp ; lp = lp->next) {
+        setvareq(savestr(lp->text), 0);
+    }
+    INTON;
+}
+/*
+ * Find the value of a variable.  Returns NULL if not set.
+ */
+char *
+lookupvar(name)
+    const char *name;
+    {
+    struct var *v;
+    for (v = *hashvar(name) ; v ; v = v->next) {
+        if (varequal(v->text, name)) {
+            if (v->flags & VUNSET)
+                return NULL;
+            return strchr(v->text, '=') + 1;
+        }
+    }
+    return NULL;
+}
+/*
+ * Search the environment of a builtin command.  If the second argument
+ * is nonzero, return the value of a variable even if it hasn't been
+ * exported.
+ */
+char *
+bltinlookup(name, doall)
+    const char *name;
+    int doall;
+{
+    struct strlist *sp;
+    struct var *v;
+    for (sp = cmdenviron ; sp ; sp = sp->next) {
+        if (varequal(sp->text, name))
+            return strchr(sp->text, '=') + 1;
+    }
+    for (v = *hashvar(name) ; v ; v = v->next) {
+        if (varequal(v->text, name)) {
+            if ((v->flags & VUNSET)
+             || (!doall && (v->flags & VEXPORT) == 0))
+                return NULL;
+            return strchr(v->text, '=') + 1;
+        }
+    }
+    return NULL;
+}
+/*
+ * Generate a list of exported variables.  This routine is used to construct
+ * the third argument to execve when executing a program.
+ */
+char **
+environment() {
+    int nenv;
+    struct var **vpp;
+    struct var *vp;
+    char **env;
+    char **ep;
+    nenv = 0;
+    for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+        for (vp = *vpp ; vp ; vp = vp->next)
+            if (vp->flags & VEXPORT)
+                nenv++;
+    }
+    ep = env = stalloc((nenv + 1) * sizeof *env);
+    for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+        for (vp = *vpp ; vp ; vp = vp->next)
+            if (vp->flags & VEXPORT)
+                *ep++ = vp->text;
+    }
+    *ep = NULL;
+    return env;
+}
+/*
+ * Called when a shell procedure is invoked to clear out nonexported
+ * variables.  It is also necessary to reallocate variables of with
+ * VSTACK set since these are currently allocated on the stack.
+ */
+#ifdef mkinit
+MKINIT void shprocvar (void);
+SHELLPROC {
+    shprocvar();
+}
+#endif
+void
+shprocvar() {
+    struct var **vpp;
+    struct var *vp, **prev;
+    for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+        for (prev = vpp ; (vp = *prev) != NULL ; ) {
+            if ((vp->flags & VEXPORT) == 0) {
+                *prev = vp->next;
+                if ((vp->flags & VTEXTFIXED) == 0)
+                    ckfree(vp->text);
+                if ((vp->flags & VSTRFIXED) == 0)
+                    ckfree(vp);
+            } else {
+                if (vp->flags & VSTACK) {
+                    vp->text = savestr(vp->text);
+                    vp->flags &=~ VSTACK;
+                }
+                prev = &vp->next;
+            }
+        }
+    }
+    initvar();
+}
+/*
+ * Command to list all variables which are set.  Currently this command
+ * is invoked from the set command when the set command is called without
+ * any variables.
+ */
+int
+showvarscmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct var **vpp;
+    struct var *vp;
+    for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+        for (vp = *vpp ; vp ; vp = vp->next) {
+            if ((vp->flags & VUNSET) == 0)
+                out1fmt("%s\n", vp->text);
+        }
+    }
+    return 0;
+}
+/*
+ * The export and readonly commands.
+ */
+int
+exportcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    struct var **vpp;
+    struct var *vp;
+    char *name;
+    const char *p;
+    int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
+    int pflag;
+    listsetvar(cmdenviron);
+    pflag = (nextopt("p") == 'p');
+    if (argc > 1 && !pflag) {
+        while ((name = *argptr++) != NULL) {
+            if ((p = strchr(name, '=')) != NULL) {
+                p++;
+            } else {
+                vpp = hashvar(name);
+                for (vp = *vpp ; vp ; vp = vp->next) {
+                    if (varequal(vp->text, name)) {
+                        vp->flags |= flag;
+                        goto found;
+                    }
+                }
+            }
+            setvar(name, p, flag);
+found:;
+        }
+    } else {
+        for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+            for (vp = *vpp ; vp ; vp = vp->next) {
+                if ((vp->flags & flag) == 0)
+                    continue;
+                if (pflag) {
+                    out1fmt("%s %s\n", argv[0], vp->text);
+                } else {
+                    for (p = vp->text ; *p != '=' ; p++)
+                        out1c(*p);
+                    out1c('\n');
+                }
+            }
+        }
+    }
+    return 0;
+}
+/*
+ * The "local" command.
+ */
+int
+localcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char *name;
+    if (! in_function())
+        error("Not in a function");
+    while ((name = *argptr++) != NULL) {
+        mklocal(name);
+    }
+    return 0;
+}
+/*
+ * Make a variable a local variable.  When a variable is made local, it's
+ * value and flags are saved in a localvar structure.  The saved values
+ * will be restored when the shell function returns.  We handle the name
+ * "-" as a special case.
+ */
+void
+mklocal(name)
+    char *name;
+    {
+    struct localvar *lvp;
+    struct var **vpp;
+    struct var *vp;
+    INTOFF;
+    lvp = ckmalloc(sizeof (struct localvar));
+    if (name[0] == '-' && name[1] == '\0') {
+        char *p;
+        p = ckmalloc(sizeof optlist);
+        lvp->text = memcpy(p, optlist, sizeof optlist);
+        vp = NULL;
+    } else {
+        vpp = hashvar(name);
+        for (vp = *vpp ; vp && ! varequal(vp->text, name) ; vp = vp->next);
+        if (vp == NULL) {
+            if (strchr(name, '='))
+                setvareq(savestr(name), VSTRFIXED);
+            else
+                setvar(name, NULL, VSTRFIXED);
+            vp = *vpp;  /* the new variable */
+            lvp->text = NULL;
+            lvp->flags = VUNSET;
+        } else {
+            lvp->text = vp->text;
+            lvp->flags = vp->flags;
+            vp->flags |= VSTRFIXED|VTEXTFIXED;
+            if (strchr(name, '='))
+                setvareq(savestr(name), 0);
+        }
+    }
+    lvp->vp = vp;
+    lvp->next = localvars;
+    localvars = lvp;
+    INTON;
+}
+/*
+ * Called after a function returns.
+ */
+void
+poplocalvars() {
+    struct localvar *lvp;
+    struct var *vp;
+    while ((lvp = localvars) != NULL) {
+        localvars = lvp->next;
+        vp = lvp->vp;
+        if (vp == NULL) {   /* $- saved */
+            memcpy(optlist, lvp->text, sizeof optlist);
+            ckfree(lvp->text);
+        } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
+            (void)unsetvar(vp->text);
+        } else {
+            if ((vp->flags & VTEXTFIXED) == 0)
+                ckfree(vp->text);
+            vp->flags = lvp->flags;
+            vp->text = lvp->text;
+        }
+        ckfree(lvp);
+    }
+}
+int
+setvarcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    if (argc <= 2)
+        return unsetcmd(argc, argv);
+    else if (argc == 3)
+        setvar(argv[1], argv[2], 0);
+    else
+        error("List assignment not implemented");
+    return 0;
+}
+/*
+ * The unset builtin command.  We unset the function before we unset the
+ * variable to allow a function to be unset when there is a readonly variable
+ * with the same name.
+ */
+int
+unsetcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char **ap;
+    int i;
+    int flg_func = 0;
+    int flg_var = 0;
+    int ret = 0;
+    while ((i = nextopt("vf")) != '\0') {
+        if (i == 'f')
+            flg_func = 1;
+        else
+            flg_var = 1;
+    }
+    if (flg_func == 0 && flg_var == 0)
+        flg_var = 1;
+    for (ap = argptr; *ap ; ap++) {
+        if (flg_func)
+            ret |= unsetfunc(*ap);
+        if (flg_var)
+            ret |= unsetvar(*ap);
+    }
+    return ret;
+}
+/*
+ * Unset the specified variable.
+ */
+int
+unsetvar(s)
+    const char *s;
+    {
+    struct var **vpp;
+    struct var *vp;
+    vpp = hashvar(s);
+    for (vp = *vpp ; vp ; vpp = &vp->next, vp = *vpp) {
+        if (varequal(vp->text, s)) {
+            if (vp->flags & VREADONLY)
+                return (1);
+            INTOFF;
+            if (*(strchr(vp->text, '=') + 1) != '\0')
+                setvar(s, nullstr, 0);
+            vp->flags &= ~VEXPORT;
+            vp->flags |= VUNSET;
+            if ((vp->flags & VSTRFIXED) == 0) {
+                if ((vp->flags & VTEXTFIXED) == 0)
+                    ckfree(vp->text);
+                *vpp = vp->next;
+                ckfree(vp);
+            }
+            INTON;
+            return (0);
+        }
+    }
+    return (1);
+}
+/*
+ * Find the appropriate entry in the hash table from the name.
+ */
+STATIC struct var **
+hashvar(p)
+    const char *p;
+    {
+    unsigned int hashval;
+    hashval = ((unsigned char) *p) << 4;
+    while (*p && *p != '=')
+        hashval += (unsigned char) *p++;
+    return &vartab[hashval % VTABSIZE];
+}
+/*
+ * Returns true if the two strings specify the same varable.  The first
+ * variable name is terminated by '='; the second may be terminated by
+ * either '=' or '\0'.
+ */
+STATIC int
+varequal(p, q)
+    const char *p, *q;
+    {
+    while (*p == *q++) {
+        if (*p++ == '=')
+            return 1;
+    }
+    if (*p == '=' && *(q - 1) == '\0')
+        return 1;
+    return 0;
+}

 /trunk/uspace/app/ash/miscbltin.h
 ,0 → 1,34
+/*  $NetBSD: miscbltin.h,v 1.1 1997/07/04 21:02:10 christos Exp $   */
+/*
+ * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by Christos Zoulas.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+int readcmd (int, char **);
+int umaskcmd (int, char **);
+int ulimitcmd (int, char **);

 /trunk/uspace/app/ash/main.h
 ,0 → 1,48
+/*  $NetBSD: main.h,v 1.8 1995/05/11 21:29:27 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)main.h  8.2 (Berkeley) 5/4/95
+ */
+extern int rootpid; /* pid of main shell */
+extern int rootshell;   /* true if we aren't a child of the main shell */
+void readcmdfile (char *);
+void cmdloop (int);
+int dotcmd (int, char **);
+int exitcmd (int, char **);

 /trunk/uspace/app/ash/options.c
 ,0 → 1,551
+/*  $NetBSD: options.c,v 1.29 1999/07/09 03:05:50 christos Exp $    */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)options.c   8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: options.c,v 1.29 1999/07/09 03:05:50 christos Exp $");
+#endif
+#endif /* not lint */
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "shell.h"
+#define DEFINE_OPTIONS
+#include "options.h"
+#undef DEFINE_OPTIONS
+#include "nodes.h"  /* for other header files */
+#include "eval.h"
+#include "jobs.h"
+#include "input.h"
+#include "output.h"
+#include "trap.h"
+#include "var.h"
+#include "memalloc.h"
+#include "error.h"
+#include "mystring.h"
+#ifndef SMALL
+#include "myhistedit.h"
+#endif
+char *arg0;         /* value of $0 */
+struct shparam shellparam;  /* current positional parameters */
+char **argptr;          /* argument list for builtin commands */
+char *optarg;           /* set by nextopt (like getopt) */
+char *optptr;           /* used by nextopt */
+char *minusc;           /* argument to -c option */
+STATIC void options (int);
+STATIC void minus_o (char *, int);
+STATIC void setoption (int, int);
+STATIC int getopts (char *, char *, char **, int *, int *);
+/*
+ * Process the shell command line arguments.
+ */
+void
+procargs(argc, argv)
+    int argc;
+    char **argv;
+{
+    int i;
+    argptr = argv;
+    if (argc > 0)
+        argptr++;
+    for (i = 0; i < NOPTS; i++)
+        optlist[i].val = 2;
+    options(1);
+    if (*argptr == NULL && minusc == NULL)
+        sflag = 1;
+    if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1))
+        iflag = 1;
+    if (mflag == 2)
+        mflag = iflag;
+    for (i = 0; i < NOPTS; i++)
+        if (optlist[i].val == 2)
+            optlist[i].val = 0;
+    arg0 = argv[0];
+    if (sflag == 0 && minusc == NULL) {
+        commandname = arg0 = *argptr++;
+        setinputfile(commandname, 0);
+    }
+    /* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
+    if (argptr && minusc && *argptr)
+            arg0 = *argptr++;
+    shellparam.p = argptr;
+    shellparam.optind = 1;
+    shellparam.optoff = -1;
+    /* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
+    while (*argptr) {
+        shellparam.nparam++;
+        argptr++;
+    }
+    optschanged();
+}
+void
+optschanged()
+{
+    setinteractive(iflag);
+#ifndef SMALL
+    histedit();
+#endif
+    setjobctl(mflag);
+}
+/*
+ * Process shell options.  The global variable argptr contains a pointer
+ * to the argument list; we advance it past the options.
+ */
+STATIC void
+options(cmdline)
+    int cmdline;
+{
+    char *p;
+    int val;
+    int c;
+    if (cmdline)
+        minusc = NULL;
+    while ((p = *argptr) != NULL) {
+        argptr++;
+        if ((c = *p++) == '-') {
+            val = 1;
+                        if (p[0] == '\0' || (p[0] == '-' && p[1] == '\0')) {
+                                if (!cmdline) {
+                                        /* "-" means turn off -x and -v */
+                                        if (p[0] == '\0')
+                                                xflag = vflag = 0;
+                                        /* "--" means reset params */
+                                        else if (*argptr == NULL)
+                        setparam(argptr);
+                                }
+                break;    /* "-" or  "--" terminates options */
+            }
+        } else if (c == '+') {
+            val = 0;
+        } else {
+            argptr--;
+            break;
+        }
+        while ((c = *p++) != '\0') {
+            if (c == 'c' && cmdline) {
+                char *q;
+#ifdef NOHACK   /* removing this code allows sh -ce 'foo' for compat */
+                if (*p == '\0')
+#endif
+                    q = *argptr++;
+                if (q == NULL || minusc != NULL)
+                    error("Bad -c option");
+                minusc = q;
+#ifdef NOHACK
+                break;
+#endif
+            } else if (c == 'o') {
+                minus_o(*argptr, val);
+                if (*argptr)
+                    argptr++;
+            } else {
+                setoption(c, val);
+            }
+        }
+    }
+}
+STATIC void
+minus_o(name, val)
+    char *name;
+    int val;
+{
+    int i;
+    if (name == NULL) {
+        out1str("Current option settings\n");
+        for (i = 0; i < NOPTS; i++)
+            out1fmt("%-16s%s\n", optlist[i].name,
+                optlist[i].val ? "on" : "off");
+    } else {
+        for (i = 0; i < NOPTS; i++)
+            if (equal(name, optlist[i].name)) {
+                setoption(optlist[i].letter, val);
+                return;
+            }
+        error("Illegal option -o %s", name);
+    }
+}
+STATIC void
+setoption(flag, val)
+    char flag;
+    int val;
+    {
+    int i;
+    for (i = 0; i < NOPTS; i++)
+        if (optlist[i].letter == flag) {
+            optlist[i].val = val;
+            if (val) {
+                /* #%$ hack for ksh semantics */
+                if (flag == 'V')
+                    Eflag = 0;
+                else if (flag == 'E')
+                    Vflag = 0;
+            }
+            return;
+        }
+    error("Illegal option -%c", flag);
+    /* NOTREACHED */
+}
+#ifdef mkinit
+INCLUDE "options.h"
+SHELLPROC {
+    int i;
+    for (i = 0; i < NOPTS; i++)
+        optlist[i].val = 0;
+    optschanged();
+}
+#endif
+/*
+ * Set the shell parameters.
+ */
+void
+setparam(argv)
+    char **argv;
+    {
+    char **newparam;
+    char **ap;
+    int nparam;
+    for (nparam = 0 ; argv[nparam] ; nparam++);
+    ap = newparam = ckmalloc((nparam + 1) * sizeof *ap);
+    while (*argv) {
+        *ap++ = savestr(*argv++);
+    }
+    *ap = NULL;
+    freeparam(&shellparam);
+    shellparam.malloc = 1;
+    shellparam.nparam = nparam;
+    shellparam.p = newparam;
+    shellparam.optind = 1;
+    shellparam.optoff = -1;
+}
+/*
+ * Free the list of positional parameters.
+ */
+void
+freeparam(param)
+    volatile struct shparam *param;
+    {
+    char **ap;
+    if (param->malloc) {
+        for (ap = param->p ; *ap ; ap++)
+            ckfree(*ap);
+        ckfree(param->p);
+    }
+}
+/*
+ * The shift builtin command.
+ */
+int
+shiftcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    int n;
+    char **ap1, **ap2;
+    n = 1;
+    if (argc > 1)
+        n = number(argv[1]);
+    if (n > shellparam.nparam)
+        error("can't shift that many");
+    INTOFF;
+    shellparam.nparam -= n;
+    for (ap1 = shellparam.p ; --n >= 0 ; ap1++) {
+        if (shellparam.malloc)
+            ckfree(*ap1);
+    }
+    ap2 = shellparam.p;
+    while ((*ap2++ = *ap1++) != NULL);
+    shellparam.optind = 1;
+    shellparam.optoff = -1;
+    INTON;
+    return 0;
+}
+/*
+ * The set command builtin.
+ */
+int
+setcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    if (argc == 1)
+        return showvarscmd(argc, argv);
+    INTOFF;
+    options(0);
+    optschanged();
+    if (*argptr != NULL) {
+        setparam(argptr);
+    }
+    INTON;
+    return 0;
+}
+void
+getoptsreset(value)
+    const char *value;
+{
+    shellparam.optind = number(value);
+    shellparam.optoff = -1;
+}
+/*
+ * The getopts builtin.  Shellparam.optnext points to the next argument
+ * to be processed.  Shellparam.optptr points to the next character to
+ * be processed in the current argument.  If shellparam.optnext is NULL,
+ * then it's the first time getopts has been called.
+ */
+int
+getoptscmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    char **optbase;
+    if (argc < 3)
+        error("Usage: getopts optstring var [arg]");
+    else if (argc == 3) {
+        optbase = shellparam.p;
+        if (shellparam.optind > shellparam.nparam + 1) {
+            shellparam.optind = 1;
+            shellparam.optoff = -1;
+        }
+    }
+    else {
+        optbase = &argv[3];
+        if (shellparam.optind > argc - 2) {
+            shellparam.optind = 1;
+            shellparam.optoff = -1;
+        }
+    }
+    return getopts(argv[1], argv[2], optbase, &shellparam.optind,
+               &shellparam.optoff);
+}
+STATIC int
+getopts(optstr, optvar, optfirst, optind, optoff)
+    char *optstr;
+    char *optvar;
+    char **optfirst;
+    int *optind;
+    int *optoff;
+{
+    char *p, *q;
+    char c = '?';
+    int done = 0;
+    int err = 0;
+    char s[10];
+    char **optnext = optfirst + *optind - 1;
+    if (*optind <= 1 || *optoff < 0 || !(*(optnext - 1)) ||
+        strlen(*(optnext - 1)) < *optoff)
+        p = NULL;
+    else
+        p = *(optnext - 1) + *optoff;
+    if (p == NULL || *p == '\0') {
+        /* Current word is done, advance */
+        if (optnext == NULL)
+            return 1;
+        p = *optnext;
+        if (p == NULL || *p != '-' || *++p == '\0') {
+atend:
+            *optind = optnext - optfirst + 1;
+            p = NULL;
+            done = 1;
+            goto out;
+        }
+        optnext++;
+        if (p[0] == '-' && p[1] == '\0')    /* check for "--" */
+            goto atend;
+    }
+    c = *p++;
+    for (q = optstr; *q != c; ) {
+        if (*q == '\0') {
+            if (optstr[0] == ':') {
+                s[0] = c;
+                s[1] = '\0';
+                err |= setvarsafe("OPTARG", s, 0);
+            }
+            else {
+                outfmt(&errout, "Illegal option -%c\n", c);
+                (void) unsetvar("OPTARG");
+            }
+            c = '?';
+            goto bad;
+        }
+        if (*++q == ':')
+            q++;
+    }
+    if (*++q == ':') {
+        if (*p == '\0' && (p = *optnext) == NULL) {
+            if (optstr[0] == ':') {
+                s[0] = c;
+                s[1] = '\0';
+                err |= setvarsafe("OPTARG", s, 0);
+                c = ':';
+            }
+            else {
+                outfmt(&errout, "No arg for -%c option\n", c);
+                (void) unsetvar("OPTARG");
+                c = '?';
+            }
+            goto bad;
+        }
+        if (p == *optnext)
+            optnext++;
+        setvarsafe("OPTARG", p, 0);
+        p = NULL;
+    }
+    else
+        setvarsafe("OPTARG", "", 0);
+    *optind = optnext - optfirst + 1;
+    goto out;
+bad:
+    *optind = 1;
+    p = NULL;
+out:
+    *optoff = p ? p - *(optnext - 1) : -1;
+    fmtstr(s, sizeof(s), "%d", *optind);
+    err |= setvarsafe("OPTIND", s, VNOFUNC);
+    s[0] = c;
+    s[1] = '\0';
+    err |= setvarsafe(optvar, s, 0);
+    if (err) {
+        *optind = 1;
+        *optoff = -1;
+        flushall();
+        exraise(EXERROR);
+    }
+    return done;
+}
+/*
+ * XXX - should get rid of.  have all builtins use getopt(3).  the
+ * library getopt must have the BSD extension static variable "optreset"
+ * otherwise it can't be used within the shell safely.
+ *
+ * Standard option processing (a la getopt) for builtin routines.  The
+ * only argument that is passed to nextopt is the option string; the
+ * other arguments are unnecessary.  It return the character, or '\0' on
+ * end of input.
+ */
+int
+nextopt(optstring)
+    const char *optstring;
+    {
+    char *p;
+    const char *q;
+    char c;
+    if ((p = optptr) == NULL || *p == '\0') {
+        p = *argptr;
+        if (p == NULL || *p != '-' || *++p == '\0')
+            return '\0';
+        argptr++;
+        if (p[0] == '-' && p[1] == '\0')    /* check for "--" */
+            return '\0';
+    }
+    c = *p++;
+    for (q = optstring ; *q != c ; ) {
+        if (*q == '\0')
+            error("Illegal option -%c", c);
+        if (*++q == ':')
+            q++;
+    }
+    if (*++q == ':') {
+        if (*p == '\0' && (p = *argptr++) == NULL)
+            error("No arg for -%c option", c);
+        optarg = p;
+        p = NULL;
+    }
+    optptr = p;
+    return c;
+}

 /trunk/uspace/app/ash/eval.h
 ,0 → 1,75
+/*  $NetBSD: eval.h,v 1.10 2000/01/27 23:39:40 christos Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)eval.h  8.2 (Berkeley) 5/4/95
+ */
+extern char *commandname;   /* currently executing command */
+extern int exitstatus;      /* exit status of last command */
+extern struct strlist *cmdenviron;  /* environment for builtin command */
+struct backcmd {        /* result of evalbackcmd */
+    int fd;         /* file descriptor to read from */
+    char *buf;      /* buffer */
+    int nleft;      /* number of chars in buffer */
+    struct job *jp;     /* job structure for command */
+};
+int evalcmd (int, char **);
+void evalstring (char *, int);
+union node; /* BLETCH for ansi C */
+void evaltree (union node *, int);
+void evalbackcmd (union node *, struct backcmd *);
+int bltincmd (int, char **);
+int breakcmd (int, char **);
+int returncmd (int, char **);
+int falsecmd (int, char **);
+int truecmd (int, char **);
+int execcmd (int, char **);
+int is_special_builtin (const char *);
+/* in_function returns nonzero if we are currently evaluating a function */
+#define in_function()   funcnest
+extern int funcnest;
+extern int evalskip;
+/* reasons for skipping commands (see comment on breakcmd routine) */
+#define SKIPBREAK   1
+#define SKIPCONT    2
+#define SKIPFUNC    3
+#define SKIPFILE    4

 /trunk/uspace/app/ash/arith.y
 ,0 → 1,202
+%{
+/*  $NetBSD: arith.y,v 1.13 1999/07/09 03:05:49 christos Exp $  */
+/*-
+ * Copyright (c) 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: arith.y,v 1.13 1999/07/09 03:05:49 christos Exp $");
+#endif
+#endif /* not lint */
+#include <stdlib.h>
+#include "expand.h"
+#include "shell.h"
+#include "error.h"
+#include "output.h"
+#include "memalloc.h"
+const char *arith_buf, *arith_startbuf;
+void yyerror (const char *);
+int yyparse (void);
+#ifdef TESTARITH
+int main (int , char *[]);
+int error (char *);
+#endif
+int
+arith(s)
+    const char *s;
+{
+    long result;
+    arith_buf = arith_startbuf = s;
+    INTOFF;
+    result = yyparse();
+    arith_lex_reset();  /* reprime lex */
+    INTON;
+    return (result);
+}
+/*
+ *  The exp(1) builtin.
+ */
+int
+expcmd(argc, argv)
+    int argc;
+    char **argv;
+{
+    const char *p;
+    char *concat;
+    char **ap;
+    long i;
+    if (argc > 1) {
+        p = argv[1];
+        if (argc > 2) {
+            /*
+             * concatenate arguments
+             */
+            STARTSTACKSTR(concat);
+            ap = argv + 2;
+            for (;;) {
+                while (*p)
+                    STPUTC(*p++, concat);
+                if ((p = *ap++) == NULL)
+                    break;
+                STPUTC(' ', concat);
+            }
+            STPUTC('\0', concat);
+            p = grabstackstr(concat);
+        }
+    } else
+        p = "";
+    i = arith(p);
+    out1fmt("%ld\n", i);
+    return (! i);
+}
+/*************************/
+#ifdef TEST_ARITH
+#include <stdio.h>
+main(argc, argv)
+    char *argv[];
+{
+    printf("%d\n", exp(argv[1]));
+}
+error(s)
+    char *s;
+{
+    fprintf(stderr, "exp: %s\n", s);
+    exit(1);
+}
+#endif
+%}
+%token ARITH_NUM ARITH_LPAREN ARITH_RPAREN
+%left ARITH_OR
+%left ARITH_AND
+%left ARITH_BOR
+%left ARITH_BXOR
+%left ARITH_BAND
+%left ARITH_EQ ARITH_NE
+%left ARITH_LT ARITH_GT ARITH_GE ARITH_LE
+%left ARITH_LSHIFT ARITH_RSHIFT
+%left ARITH_ADD ARITH_SUB
+%left ARITH_MUL ARITH_DIV ARITH_REM
+%left ARITH_UNARYMINUS ARITH_UNARYPLUS ARITH_NOT ARITH_BNOT
+%%
+exp:    expr {
+            return ($1);
+        }
+    ;
+expr:   ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; }
+    | expr ARITH_OR expr    { $$ = $1 ? $1 : $3 ? $3 : 0; }
+    | expr ARITH_AND expr   { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; }
+    | expr ARITH_BOR expr   { $$ = $1 | $3; }
+    | expr ARITH_BXOR expr  { $$ = $1 ^ $3; }
+    | expr ARITH_BAND expr  { $$ = $1 & $3; }
+    | expr ARITH_EQ expr    { $$ = $1 == $3; }
+    | expr ARITH_GT expr    { $$ = $1 > $3; }
+    | expr ARITH_GE expr    { $$ = $1 >= $3; }
+    | expr ARITH_LT expr    { $$ = $1 < $3; }
+    | expr ARITH_LE expr    { $$ = $1 <= $3; }
+    | expr ARITH_NE expr    { $$ = $1 != $3; }
+    | expr ARITH_LSHIFT expr { $$ = $1 << $3; }
+    | expr ARITH_RSHIFT expr { $$ = $1 >> $3; }
+    | expr ARITH_ADD expr   { $$ = $1 + $3; }
+    | expr ARITH_SUB expr   { $$ = $1 - $3; }
+    | expr ARITH_MUL expr   { $$ = $1 * $3; }
+    | expr ARITH_DIV expr   {
+            if ($3 == 0)
+                yyerror("division by zero");
+            $$ = $1 / $3;
+            }
+    | expr ARITH_REM expr   {
+            if ($3 == 0)
+                yyerror("division by zero");
+            $$ = $1 % $3;
+            }
+    | ARITH_NOT expr    { $$ = !($2); }
+    | ARITH_BNOT expr   { $$ = ~($2); }
+    | ARITH_SUB expr %prec ARITH_UNARYMINUS { $$ = -($2); }
+    | ARITH_ADD expr %prec ARITH_UNARYPLUS { $$ = $2; }
+    | ARITH_NUM
+    ;
+%%
+void
+yyerror(s)
+    const char *s;
+{
+    yyclearin;
+    arith_lex_reset();  /* reprime lex */
+    error("arithmetic expression: %s: \"%s\"", s, arith_startbuf);
+    /* NOTREACHED */
+}

 /trunk/uspace/app/ash/var.h
 ,0 → 1,131
+/*  $NetBSD: var.h,v 1.18 2000/05/22 10:18:47 elric Exp $   */
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kenneth Almquist.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)var.h   8.2 (Berkeley) 5/4/95
+ */
+/*
+ * Shell variables.
+ */
+/* flags */
+#define VEXPORT     0x01    /* variable is exported */
+#define VREADONLY   0x02    /* variable cannot be modified */
+#define VSTRFIXED   0x04    /* variable struct is staticly allocated */
+#define VTEXTFIXED  0x08    /* text is staticly allocated */
+#define VSTACK      0x10    /* text is allocated on the stack */
+#define VUNSET      0x20    /* the variable is not set */
+#define VNOFUNC     0x40    /* don't call the callback function */
+struct var {
+    struct var *next;       /* next entry in hash list */
+    int flags;          /* flags are defined above */
+    char *text;         /* name=value */
+    void (*func) (const char *);
+                    /* function to be called when  */
+                    /* the variable gets set/unset */
+};
+struct localvar {
+    struct localvar *next;      /* next local variable in list */
+    struct var *vp;         /* the variable that was made local */
+    int flags;          /* saved flags */
+    char *text;         /* saved text */
+};
+struct localvar *localvars;
+#if ATTY
+extern struct var vatty;
+#endif
+extern struct var vifs;
+extern struct var vmail;
+extern struct var vmpath;
+extern struct var vpath;
+extern struct var vps1;
+extern struct var vps2;
+#ifndef SMALL
+extern struct var vterm;
+extern struct var vtermcap;
+extern struct var vhistsize;
+#endif
+/*
+ * The following macros access the values of the above variables.
+ * They have to skip over the name.  They return the null string
+ * for unset variables.
+ */
+#define ifsval()    (vifs.text + 4)
+#define ifsset()    ((vifs.flags & VUNSET) == 0)
+#define mailval()   (vmail.text + 5)
+#define mpathval()  (vmpath.text + 9)
+#define pathval()   (vpath.text + 5)
+#define ps1val()    (vps1.text + 4)
+#define ps2val()    (vps2.text + 4)
+#define optindval() (voptind.text + 7)
+#ifndef SMALL
+#define histsizeval()   (vhistsize.text + 9)
+#define termval()   (vterm.text + 5)
+#endif
+#if ATTY
+#define attyset()   ((vatty.flags & VUNSET) == 0)
+#endif
+#define mpathset()  ((vmpath.flags & VUNSET) == 0)
+void initvar (void);
+void setvar (const char *, const char *, int);
+void setvareq (char *, int);
+struct strlist;
+void listsetvar (struct strlist *);
+char *lookupvar (const char *);
+char *bltinlookup (const char *, int);
+char **environment (void);
+void shprocvar (void);
+int showvarscmd (int, char **);
+int exportcmd (int, char **);
+int localcmd (int, char **);
+void mklocal (char *);
+void poplocalvars (void);
+int setvarcmd (int, char **);
+int unsetcmd (int, char **);
+int unsetvar (const char *);
+int setvarsafe (const char *, const char *, int);

 /trunk/uspace/app/tester/vfs/vfs1.c
 ,122 → 30,66
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vfs/vfs.h>
+#include <vfs.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <devmap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "../tester.h"
-#define FS_TYPE      "tmpfs"
-#define MOUNT_POINT  "/tmp"
-#define OPTIONS      ""
-#define FLAGS        0
+char text[] = "O xein', angellein Lakedaimoniois hoti teide "
+    "keimetha tois keinon rhemasi peithomenoi.";
-#define TEST_DIRECTORY  MOUNT_POINT "/testdir"
-#define TEST_FILE       TEST_DIRECTORY "/testfile"
-#define TEST_FILE2      TEST_DIRECTORY "/nextfile"
+char *test_vfs1(bool quiet)
+{
+    if (mount("tmpfs", "/", "nulldev0") != EOK)
+        return "mount() failed.\n";
+    if (!quiet)
+        printf("mounted tmpfs on /.\n");
-#define MAX_DEVICE_NAME  32
-#define BUF_SIZE         16
+    if (mkdir("/mydir", 0) != 0)
+        return "mkdir() failed.\n";
+    if (!quiet)
+        printf("created directory /mydir\n");
+    int fd0 = open("/mydir/myfile", O_CREAT);
+    if (fd0 < 0)
+        return "open() failed.\n";
+    if (!quiet)
+        printf("created file /mydir/myfile, fd=%d\n", fd0);
-static char text[] = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
+    ssize_t cnt;
+    size_t size = sizeof(text);
+    cnt = write(fd0, text, size);
+    if (cnt < 0)
+        return "write() failed.\n";
+    if (!quiet)
+        printf("written %d bytes, fd=%d\n", cnt, fd0);
+    if (lseek(fd0, 0, SEEK_SET) != 0)
+        return "lseek() failed.\n";
+    if (!quiet)
+        printf("sought to position 0, fd=%d\n", fd0);
-static char *read_root(void)
-{
-    TPRINTF("Opening the root directory...");
-    DIR *dirp = opendir("/");
-    if (!dirp) {
-        TPRINTF("\n");
-        return "opendir() failed";
-    } else
-        TPRINTF("OK\n");
+    char buf[10];
+    cnt = read(fd0, buf, sizeof(buf));
+    if (cnt < 0)
+        return "read() failed.\n";
+    if (!quiet)
+        printf("read %d bytes: \"%.*s\", fd=%d\n", cnt, cnt, buf, fd0);
+    DIR *dirp;
     struct dirent *dp;
+    dirp = opendir("/");
+    if (!dirp)
+        return "opendir() failed.";
     while ((dp = readdir(dirp)))
-        TPRINTF(" node \"%s\"\n", dp->d_name);
+        printf("discovered node %s in /\n", dp->d_name);
     closedir(dirp);
     return NULL;
 }
-char *test_vfs1(void)
-{
-    if (mkdir(MOUNT_POINT, 0) != 0)
-        return "mkdir() failed";
-    TPRINTF("Created directory %s\n", MOUNT_POINT);
-    char null[MAX_DEVICE_NAME];
-    int null_id = devmap_null_create();
-    if (null_id == -1)
-        return "Unable to create null device";
-    snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
-    int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
-    switch (rc) {
-    case EOK:
-        TPRINTF("Mounted /dev/%s as %s on %s\n", null, FS_TYPE, MOUNT_POINT);
-        break;
-    case EBUSY:
-        TPRINTF("(INFO) Filesystem already mounted on %s\n", MOUNT_POINT);
-        break;
-    default:
-        TPRINTF("(ERR) IPC returned errno %d (is tmpfs loaded?)\n", rc);
-        return "mount() failed";
-    }
-    if (mkdir(TEST_DIRECTORY, 0) != 0)
-        return "mkdir() failed";
-    TPRINTF("Created directory %s\n", TEST_DIRECTORY);
-    int fd0 = open(TEST_FILE, O_CREAT);
-    if (fd0 < 0)
-        return "open() failed";
-    TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);
-    size_t size = sizeof(text);
-    ssize_t cnt = write(fd0, text, size);
-    if (cnt < 0)
-        return "write() failed";
-    TPRINTF("Written %d bytes\n", cnt);
-    if (lseek(fd0, 0, SEEK_SET) != 0)
-        return "lseek() failed";
-    TPRINTF("Sought to position 0\n");
-    char buf[BUF_SIZE];
-    while ((cnt = read(fd0, buf, BUF_SIZE))) {
-        if (cnt < 0)
-            return "read() failed";
-        TPRINTF("Read %d bytes: \".*s\"\n", cnt, cnt, buf);
-    }
-    close(fd0);
-    char *rv = read_root();
-    if (rv != NULL)
-        return rv;
-    if (rename(TEST_FILE, TEST_FILE2))
-        return "rename() failed";
-    TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2);
-    if (unlink(TEST_FILE2))
-        return "unlink() failed";
-    TPRINTF("Unlinked %s\n", TEST_FILE2);
-    if (rmdir(TEST_DIRECTORY))
-        return "rmdir() failed";
-    TPRINTF("Removed directory %s\n", TEST_DIRECTORY);
-    rv = read_root();
-    if (rv != NULL)
-        return rv;
-    return NULL;
-}

 /trunk/uspace/app/tester/devmap/devmap1.c
 ,0 → 1,324
+/*
+ * Copyright (c) 2007 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <async.h>
+#include <errno.h>
+#include <../../../srv/devmap/devmap.h>
+#include "../tester.h"
+#include <time.h>
+#define TEST_DEVICE1 "TestDevice1"
+#define TEST_DEVICE2 "TestDevice2"
+/** Handle requests from clients
+ *
+ */
+static void driver_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    ipc_callid_t callid;
+    ipc_call_t call;
+    int retval;
+    printf("connected: method=%u arg1=%u, arg2=%u arg3=%u.\n",
+        IPC_GET_METHOD(*icall), IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall),
+        IPC_GET_ARG3(*icall));
+    printf("driver_client_connection.\n");
+    ipc_answer_0(iid, EOK);
+    /* Ignore parameters, the connection is already opened */
+    while (1) {
+        callid = async_get_call(&call);
+        retval = EOK;
+        printf("method=%u arg1=%u, arg2=%u arg3=%u.\n",
+            IPC_GET_METHOD(call), IPC_GET_ARG1(call),
+            IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+        switch (IPC_GET_METHOD(call)) {
+        case IPC_M_PHONE_HUNGUP:
+            /* TODO: Handle hangup */
+            return;
+        default:
+            printf("Unknown device method %u.\n",
+                IPC_GET_METHOD(call));
+            retval = ENOENT;
+        }
+        ipc_answer_0(callid, retval);
+    }
+    return;
+}
+static int device_client_fibril(void *arg)
+{
+    int handle;
+    int device_phone;
+    handle = (int)arg;
+    device_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+        DEVMAP_CONNECT_TO_DEVICE, handle);
+    if (device_phone < 0) {
+        printf("Failed to connect to devmap as client (handle = %u).\n",
+            handle);
+        return -1;
+    }
+/*
+ *  device_phone = (int) IPC_GET_ARG5(answer);
+ */
+    printf("Connected to device.\n");
+    ipc_call_sync_1_0(device_phone, 1024, 1025);
+/*
+ * ipc_hangup(device_phone);
+ */
+    ipc_hangup(device_phone);
+    return EOK;
+}
+/** Communication test with device.
+ * @param handle handle to tested instance.
+ */
+static int device_client(int handle)
+{
+/*  fid_t fid;
+    ipc_call_t call;
+    ipc_callid_t callid;
+    fid = fibril_create(device_client_fibril, (void *)handle);
+    fibril_add_ready(fid);
+*/
+    return EOK;
+}
+/**
+ *
+ */
+static int driver_register(char *name)
+{
+    ipcarg_t retval;
+    aid_t req;
+    ipc_call_t answer;
+    int phone;
+    ipcarg_t callback_phonehash;
+    phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+    while (phone < 0) {
+        usleep(100000);
+        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+            DEVMAP_DRIVER, 0);
+    }
+    req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
+    retval = ipc_data_write_start(phone, (char *)name, strlen(name) + 1);
+    if (retval != EOK) {
+        async_wait_for(req, NULL);
+        return -1;
+    }
+    async_set_client_connection(driver_client_connection);
+    ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
+/*
+    if (NULL == async_new_connection(callback_phonehash, 0, NULL,
+            driver_client_connection)) {
+        printf("Failed to create new fibril.\n");
+        async_wait_for(req, NULL);
+        return -1;
+    }
+*/
+    async_wait_for(req, &retval);
+    printf("Driver '%s' registered.\n", name);
+    return phone;
+}
+static int device_get_handle(int driver_phone, char *name, int *handle)
+{
+    ipcarg_t retval;
+    aid_t req;
+    ipc_call_t answer;
+    req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
+        &answer);
+    retval = ipc_data_write_start(driver_phone, name, strlen(name) + 1);
+    if (retval != EOK) {
+        printf("Failed to send device name '%s'.\n", name);
+        async_wait_for(req, NULL);
+        return retval;
+    }
+    async_wait_for(req, &retval);
+    if (NULL != handle) {
+        *handle = -1;
+    }
+    if (EOK == retval) {
+        if (NULL != handle) {
+            *handle = (int) IPC_GET_ARG1(answer);
+        }
+        printf("Device '%s' has handle %u.\n", name,
+            (int) IPC_GET_ARG1(answer));
+    } else {
+        printf("Failed to get handle for device '%s'.\n", name);
+    }
+    return retval;
+}
+/** Register new device.
+ * @param driver_phone
+ * @param name Device name.
+ * @param handle Output variable. Handle to the created instance of device.
+ */
+static int device_register(int driver_phone, char *name, int *handle)
+{
+    ipcarg_t retval;
+    aid_t req;
+    ipc_call_t answer;
+    req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
+    retval = ipc_data_write_start(driver_phone, (char *)name,
+        strlen(name) + 1);
+    if (retval != EOK) {
+        printf("Failed to send device name '%s'.\n", name);
+        async_wait_for(req, NULL);
+        return retval;
+    }
+    async_wait_for(req, &retval);
+    if (NULL != handle) {
+        *handle = -1;
+    }
+    if (EOK == retval) {
+        if (NULL != handle) {
+            *handle = (int) IPC_GET_ARG1(answer);
+        }
+        printf("Device registered with handle %u.\n",
+            (int) IPC_GET_ARG1(answer));
+    }
+    return retval;
+}
+/** Test DevMap from the driver's point of view.
+ *
+ *
+ */
+char * test_devmap1(bool quiet)
+{
+    int driver_phone;
+    int dev1_handle;
+    int dev2_handle;
+    int dev3_handle;
+    int handle;
+    /* Register new driver */
+    driver_phone = driver_register("TestDriver");
+    if (driver_phone < 0) {
+        return "Error: Cannot register driver.\n";
+    }
+    /* Register new device dev1*/
+    if (EOK != device_register(driver_phone, TEST_DEVICE1, &dev1_handle)) {
+        ipc_hangup(driver_phone);
+        return "Error: cannot register device.\n";
+    }
+    /* Get handle for dev2 (Should fail unless device is already
+     * registered by someone else)
+     */
+    if (EOK == device_get_handle(driver_phone, TEST_DEVICE2, &handle)) {
+        ipc_hangup(driver_phone);
+        return "Error: got handle for dev2 before it was registered.\n";
+    }
+    /* Register new device dev2*/
+    if (EOK != device_register(driver_phone, TEST_DEVICE2, &dev2_handle)) {
+        ipc_hangup(driver_phone);
+        return "Error: cannot register device dev2.\n";
+    }
+    /* Register again device dev1 */
+    if (EOK == device_register(driver_phone, TEST_DEVICE1, &dev3_handle)) {
+        return "Error: dev1 registered twice.\n";
+    }
+    /* Get handle for dev1*/
+    if (EOK != device_get_handle(driver_phone, TEST_DEVICE1, &handle)) {
+        ipc_hangup(driver_phone);
+        return "Error: cannot get handle for 'DEVMAP_DEVICE1'.\n";
+    }
+    if (handle != dev1_handle) {
+        ipc_hangup(driver_phone);
+        return "Error: cannot get handle for 'DEVMAP_DEVICE1'.\n";
+    }
+    if (EOK != device_client(dev1_handle)) {
+        ipc_hangup(driver_phone);
+        return "Error: failed client test for 'DEVMAP_DEVICE1'.\n";
+    }
+    /* TODO: */
+    ipc_hangup(driver_phone);
+    return NULL;
+}
+char *test_devmap2(bool quiet)
+{
+    /*TODO: Full automatic test */
+    return NULL;
+}
+char *test_devmap3(bool quiet)
+{
+    /* TODO: allow user to call test functions in random order */
+    return NULL;
+}

/trunk/uspace/app/tester/devmap/devmap1.def
0,0 → 1,6
{
"devmap1",
"DevMap test",
&test_devmap1,
true
},

 /trunk/uspace/app/tester/tester.c
 ,10 → 27,10
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup tester User space tester
- * @brief User space testing infrastructure.
+/** @addtogroup tester User space Tester
+ * @brief   User space testing infrastructure.
  * @{
- */
+ */
 /**
  * @file
  */
 ,110 → 37,86
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
 #include "tester.h"
-bool test_quiet;
-int test_argc;
-char **test_argv;
+int myservice = 0;
+int phones[MAX_PHONES];
+int connections[MAX_CONNECTIONS];
+ipc_callid_t callids[MAX_CONNECTIONS];
 test_t tests[] = {
 #include "thread/thread1.def"
 #include "print/print1.def"
-#include "print/print2.def"
-#include "print/print3.def"
-#include "print/print4.def"
-#include "console/console1.def"
-#include "stdio/stdio1.def"
-#include "stdio/stdio2.def"
 #include "fault/fault1.def"
 #include "fault/fault2.def"
-#include "vfs/vfs1.def"
-#include "ipc/ping_pong.def"
 #include "ipc/register.def"
 #include "ipc/connect.def"
-#include "loop/loop1.def"
-#include "mm/malloc1.def"
-    {NULL, NULL, NULL, false}
+#include "ipc/send_async.def"
+#include "ipc/send_sync.def"
+#include "ipc/answer.def"
+#include "ipc/hangup.def"
+#include "devmap/devmap1.def"
+#include "vfs/vfs1.def"
+    {NULL, NULL, NULL}
 };
 static bool run_test(test_t *test)
 {
+    printf("%s\t\t%s\n", test->name, test->desc);
     /* Execute the test */
-    char *ret = test->entry();
+    char * ret = test->entry(false);
     if (ret == NULL) {
-        printf("\nTest passed\n");
+        printf("Test passed\n\n");
         return true;
     }
-    printf("\n%s\n", ret);
+    printf("%s\n\n", ret);
     return false;
 }
 static void run_safe_tests(void)
 {
-    test_t *test;
-    unsigned int i = 0;
-    unsigned int n = 0;
-    printf("\n*** Running all safe tests ***\n\n");
-    for (test = tests; test->name != NULL; test++) {
-        if (test->safe) {
-            printf("%s (%s)\n", test->name, test->desc);
-            if (run_test(test))
-                i++;
-            else
-                n++;
-        }
-    }
-    printf("\nCompleted, %u tests run, %u passed.\n", i + n, i);
 }
 static void list_tests(void)
 {
-    size_t len = 0;
     test_t *test;
-    for (test = tests; test->name != NULL; test++) {
-        if (str_length(test->name) > len)
-            len = str_length(test->name);
-    }
+    char c = 'a';
-    for (test = tests; test->name != NULL; test++)
-        printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+    for (test = tests; test->name != NULL; test++, c++)
+        printf("%c\t%s\t\t%s%s\n", c, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-    printf("%-*s Run all safe tests\n", len, "*");
+    printf("*\t\t\tRun all safe tests\n");
 }
-int main(int argc, char *argv[])
+int main(void)
 {
-    if (argc < 2) {
-        printf("Usage:\n\n");
-        printf("%s <test> [args ...]\n\n", argv[0]);
+    while (1) {
+        char c;
+        test_t *test;
         list_tests();
-        return 0;
+        printf("> ");
+        c = getchar();
+        printf("%c\n", c);
+        if ((c >= 'a') && (c <= 'z')) {
+            for (test = tests; test->name != NULL; test++, c--)
+                if (c == 'a')
+                    break;
+            if (c > 'a')
+                printf("Unknown test\n\n");
+            else
+                run_test(test);
+        } else if (c == '*')
+            run_safe_tests();
+        else
+            printf("Invalid test\n\n");
     }
-    test_quiet = false;
-    test_argc = argc - 2;
-    test_argv = argv + 2;
-    if (str_cmp(argv[1], "*") == 0) {
-        run_safe_tests();
-        return 0;
-    }
-    test_t *test;
-    for (test = tests; test->name != NULL; test++) {
-        if (str_cmp(argv[1], test->name) == 0) {
-            return (run_test(test) ? 0 : -1);
-        }
-    }
-    printf("Unknown test \"%s\"\n", argv[1]);
-    return -2;
 }
 /** @}

 /trunk/uspace/app/tester/tester.h
 ,45 → 39,36
 #include <bool.h>
 #include <ipc/ipc.h>
-#define IPC_TEST_SERVICE  10240
-#define IPC_TEST_METHOD   2000
+#define IPC_TEST_START  10000
+#define MAX_PHONES      20
+#define MAX_CONNECTIONS 50
-extern bool test_quiet;
-extern int test_argc;
-extern char **test_argv;
+extern int myservice;
+extern int phones[MAX_PHONES];
+extern int connections[MAX_CONNECTIONS];
+extern ipc_callid_t callids[MAX_CONNECTIONS];
-#define TPRINTF(format, ...) \
-    { \
-        if (!test_quiet) { \
-            fprintf(stderr, format, ##__VA_ARGS__); \
-        } \
-    }
+typedef char * (* test_entry_t)(bool);
-typedef char *(*test_entry_t)(void);
 typedef struct {
-    char *name;
-    char *desc;
+    char * name;
+    char * desc;
     test_entry_t entry;
     bool safe;
 } test_t;
-extern char *test_thread1(void);
-extern char *test_print1(void);
-extern char *test_print2(void);
-extern char *test_print3(void);
-extern char *test_print4(void);
-extern char *test_console1(void);
-extern char *test_stdio1(void);
-extern char *test_stdio2(void);
-extern char *test_fault1(void);
-extern char *test_fault2(void);
-extern char *test_vfs1(void);
-extern char *test_ping_pong(void);
-extern char *test_register(void);
-extern char *test_connect(void);
-extern char *test_loop1(void);
-extern char *test_malloc1(void);
+extern char * test_thread1(bool quiet);
+extern char * test_print1(bool quiet);
+extern char * test_fault1(bool quiet);
+extern char * test_fault2(bool quiet);
+extern char * test_register(bool quiet);
+extern char * test_connect(bool quiet);
+extern char * test_send_async(bool quiet);
+extern char * test_send_sync(bool quiet);
+extern char * test_answer(bool quiet);
+extern char * test_hangup(bool quiet);
+extern char * test_devmap1(bool quiet);
+extern char * test_vfs1(bool quiet);
 extern test_t tests[];

 /trunk/uspace/app/tester/Makefile
 ,7 → 31,6
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include
 ,43 → 44,37
 SOURCES = tester.c \
     thread/thread1.c \
     print/print1.c \
-    print/print2.c \
-    print/print3.c \
-    print/print4.c \
-    console/console1.c \
-    stdio/stdio1.c \
-    stdio/stdio2.c \
     fault/fault1.c \
     fault/fault2.c \
-    vfs/vfs1.c \
-    ipc/ping_pong.c \
     ipc/register.c \
     ipc/connect.c \
-    loop/loop1.c \
-    mm/malloc1.c
+    ipc/send_async.c \
+    ipc/send_sync.c \
+    ipc/answer.c \
+    ipc/hangup.c \
+    devmap/devmap1.c \
+    vfs/vfs1.c
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/app/tester/ipc/register.c
 ,58 → 32,58
 #include <errno.h>
 #include "../tester.h"
-#define MAX_CONNECTIONS  50
-static int connections[MAX_CONNECTIONS];
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    unsigned int i;
-    TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
+    ipc_callid_t callid;
+    ipc_call_t call;
+    ipcarg_t phonehash = icall->in_phone_hash;
+    int retval;
+    int i;
+    printf("Connected phone: %P, accepting\n", icall->in_phone_hash);
     ipc_answer_0(iid, EOK);
-    for (i = 0; i < MAX_CONNECTIONS; i++) {
+    for (i = 0; i < 1024; i++)
         if (!connections[i]) {
-            connections[i] = icall->in_phone_hash;
+            connections[i] = phonehash;
             break;
         }
-    }
-    while (true) {
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        int retval;
+    while (1) {
+        callid = async_get_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
-            TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
+            printf("Phone (%P) hung up.\n", phonehash);
             retval = 0;
             break;
-        case IPC_TEST_METHOD:
-            TPRINTF("Received well known message from %#x: %#x\n",
-                icall->in_phone_hash, callid);
-            ipc_answer_0(callid, EOK);
-            break;
         default:
-            TPRINTF("Received unknown message from %#x: %#x\n",
-                icall->in_phone_hash, callid);
-            ipc_answer_0(callid, ENOENT);
-            break;
+            printf("Received message from %P: %X\n", phonehash,
+                callid);
+            for (i = 0; i < 1024; i++)
+                if (!callids[i]) {
+                    callids[i] = callid;
+                    break;
+                }
+            continue;
         }
+        ipc_answer_0(callid, retval);
     }
 }
-char *test_register(void)
+char * test_register(bool quiet)
 {
+    int i;
     async_set_client_connection(client_connection);
+    for (i = IPC_TEST_START; i < IPC_TEST_START + 10; i++) {
+        ipcarg_t phonead;
+        int res = ipc_connect_to_me(PHONE_NS, i, 0, 0, &phonead);
+        if (!res)
+            break;
+        printf("Failed registering as %d..:%d\n", i, res);
+    }
+    printf("Registered as service: %d\n", i);
+    myservice = i;
-    ipcarg_t phonead;
-    int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
-    if (res != 0)
-        return "Failed registering IPC service";
-    TPRINTF("Registered as service %u, accepting connections\n", IPC_TEST_SERVICE);
-    async_manager();
     return NULL;
 }

 /trunk/uspace/app/tester/ipc/connect.c
 ,46 → 28,30
 #include <stdio.h>
 #include <unistd.h>
-#include <atomic.h>
 #include "../tester.h"
-static atomic_t finish;
-static void callback(void *priv, int retval, ipc_call_t *data)
+char * test_connect(bool quiet)
 {
-    atomic_set(&finish, 1);
-}
+    char c;
+    int svc;
+    int phid;
-char *test_connect(void)
-{
-    TPRINTF("Connecting to %u...", IPC_TEST_SERVICE);
-    int phone = ipc_connect_me_to(PHONE_NS, IPC_TEST_SERVICE, 0, 0);
-    if (phone > 0) {
-        TPRINTF("phoneid %d\n", phone);
-    } else {
-        TPRINTF("\n");
-        return "ipc_connect_me_to() failed";
-    }
+    printf("Choose one service: 0:10000....9:10009\n");
+    do {
+        c = getchar();
+    } while (c < '0' || c > '9');
-    printf("Sending synchronous message...\n");
-    int retval = ipc_call_sync_0_0(phone, IPC_TEST_METHOD);
-    TPRINTF("Received response to synchronous message\n");
+    svc = IPC_TEST_START + c - '0';
+    if (svc == myservice)
+        return "Currently cannot connect to myself, update test";
-    TPRINTF("Sending asynchronous message...\n");
-    atomic_set(&finish, 0);
-    ipc_call_async_0(phone, IPC_TEST_METHOD, NULL, callback, 1);
-    while (atomic_get(&finish) != 1)
-        TPRINTF(".");
-    TPRINTF("Received response to asynchronous message\n");
+    printf("Connecting to %d..", svc);
+    phid = ipc_connect_me_to(PHONE_NS, svc, 0, 0);
+    if (phid > 0) {
+        printf("phoneid: %d\n", phid);
+        phones[phid] = 1;
+    } else
+        return "Error";
-    TPRINTF("Hanging up...");
-    retval = ipc_hangup(phone);
-    if (retval == 0) {
-        TPRINTF("OK\n");
-    } else {
-        TPRINTF("\n");
-        return "ipc_hangup() failed";
-    }
     return NULL;
 }

 /trunk/uspace/app/tester/ipc/answer.c
 ,0 → 1,76
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include "../tester.h"
+char * test_answer(bool quiet)
+{
+    int i,cnt, errn = 0;
+    char c;
+    cnt = 0;
+    for (i = 0;i < 50; i++) {
+        if (callids[i]) {
+            printf("%d: %P\n", cnt, callids[i]);
+            cnt++;
+        }
+        if (cnt >= 10)
+            break;
+    }
+    if (!cnt)
+        return NULL;
+    printf("Choose message:\n");
+    do {
+        c = getchar();
+    } while (c < '0' || (c-'0') >= cnt);
+    cnt = c - '0' + 1;
+    for (i = 0; cnt; i++)
+        if (callids[i])
+            cnt--;
+    i -= 1;
+    printf("Normal (n) or hangup (h) or error(e) message?\n");
+    do {
+        c = getchar();
+    } while (c != 'n' && c != 'h' && c != 'e');
+    if (c == 'n')
+        errn = 0;
+    else if (c == 'h')
+        errn = EHANGUP;
+    else if (c == 'e')
+        errn = ENOENT;
+    printf("Answering %P\n", callids[i]);
+    ipc_answer_0(callids[i], errn);
+    callids[i] = 0;
+    return NULL;
+}

 /trunk/uspace/app/tester/ipc/send_async.c
 ,0 → 1,55
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include "../tester.h"
+static void callback(void *_private, int retval, ipc_call_t *data)
+{
+    printf("Received response to msg %d - retval: %d.\n", _private, retval);
+}
+char * test_send_async(bool quiet)
+{
+    int phoneid;
+    static int msgid = 1;
+    char c;
+    printf("Select phoneid to send msg: 2-9\n");
+    do {
+        c = getchar();
+    } while (c < '2' || c > '9');
+    phoneid = c - '0';
+    ipc_call_async_0(phoneid, 2000, (void *) msgid, callback, 1);
+    printf("Async sent - msg %d\n", msgid);
+    msgid++;
+    return NULL;
+}

 /trunk/uspace/app/tester/ipc/send_sync.c
 ,0 → 1,52
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include "../tester.h"
+#include <ipc/ipc.h>
+char * test_send_sync(bool quiet)
+{
+    int phoneid;
+    int res;
+    static int msgid = 1;
+    char c;
+    printf("Select phoneid to send msg: 2-9\n");
+    do {
+        c = getchar();
+    } while (c < '2' || c > '9');
+    phoneid = c - '0';
+    printf("Sending msg...");
+    res = ipc_call_sync_0_0(phoneid, 2000);
+    printf("done: %d\n", res);
+    return NULL;
+}

/trunk/uspace/app/tester/ipc/hangup.def
0,0 → 1,6
{
"hangup",
"IPC hangup test",
&test_hangup,
true
},

/trunk/uspace/app/tester/ipc/send_sync.def
0,0 → 1,6
{
"send_sync",
"IPC send sync message test",
&test_send_sync,
true
},

 /trunk/uspace/app/tester/ipc/hangup.c
 ,0 → 1,51
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include "../tester.h"
+char * test_hangup(bool quiet)
+{
+    char c;
+    int res;
+    int phoneid;
+    printf("Select phoneid to hangup: 2-9\n");
+    do {
+        c = getchar();
+    } while (c < '2' || c > '9');
+    phoneid = c - '0';
+    printf("Hanging up...");
+    res = ipc_hangup(phoneid);
+    printf("done: %d\n", phoneid);
+    return NULL;
+}

/trunk/uspace/app/tester/ipc/send_async.def
0,0 → 1,6
{
"send_async",
"IPC send async message test",
&test_send_async,
true
},

/trunk/uspace/app/tester/ipc/answer.def
0,0 → 1,6
{
"answer",
"IPC answer message test",
&test_answer,
true
},

 /trunk/uspace/app/tester/thread/thread1.c
 ,8 → 27,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define THREADS  20
-#define DELAY    10
+#define THREADS 5
 #include <atomic.h>
 #include <thread.h>
 ,42 → 37,45
 static atomic_t finish;
 static atomic_t threads_finished;
+static bool sh_quiet;
 static void threadtest(void *data)
 {
     thread_detach(thread_get_id());
-    while (atomic_get(&finish))
+    while (atomic_get(&finish)) {
+        if (!sh_quiet)
+            printf("%llu ", thread_get_id());
         usleep(100000);
+    }
     atomic_inc(&threads_finished);
 }
-char *test_thread1(void)
+char * test_thread1(bool quiet)
 {
-    unsigned int i;
-    int total = 0;
+    unsigned int i, total = 0;
+    sh_quiet = quiet;
     atomic_set(&finish, 1);
     atomic_set(&threads_finished, 0);
-    TPRINTF("Creating threads");
-    for (i = 0; i < THREADS; i++) {
+    for (i = 0; i < THREADS; i++) {
         if (thread_create(threadtest, NULL, "threadtest", NULL) < 0) {
-            TPRINTF("\nCould not create thread %u\n", i);
+            if (!quiet)
+                printf("Could not create thread %d\n", i);
             break;
         }
-        TPRINTF(".");
         total++;
     }
-    TPRINTF("\nRunning threads for %u seconds...", DELAY);
-    sleep(DELAY);
-    TPRINTF("\n");
+    if (!quiet)
+        printf("Running threads for 10 seconds...\n");
+    sleep(10);
     atomic_set(&finish, 0);
     while (atomic_get(&threads_finished) < total) {
-        TPRINTF("Threads left: %u\n", total - atomic_get(&threads_finished));
+        if (!quiet)
+            printf("Threads left: %d\n", total - atomic_get(&threads_finished));
         sleep(1);
     }

 /trunk/uspace/app/tester/fault/fault1.c
 ,7 → 29,7
 #include "../tester.h"
-char *test_fault1(void)
+char * test_fault1(bool quiet)
 {
     ((int *)(0))[1] = 0;

 /trunk/uspace/app/tester/fault/fault2.c
 ,7 → 29,7
 #include "../tester.h"
-char *test_fault2(void)
+char * test_fault2(bool quiet)
 {
     volatile long long var;
     volatile int var1;

/trunk/uspace/app/tester/print/print1.def
1,6 → 1,6
{
"print1",
"String printf test",
"Printf test",
&test_print1,
true
},

 /trunk/uspace/app/tester/print/print1.c
 ,27 → 30,44
 #include <unistd.h>
 #include "../tester.h"
-char *test_print1(void)
+#define BUFFER_SIZE 32
+char * test_print1(bool quiet)
 {
-    TPRINTF("Testing printf(\"%%*.*s\", 5, 3, \"text\"):\n");
-    TPRINTF("Expected output: \"  tex\"\n");
-    TPRINTF("Real output:     \"%*.*s\"\n\n", 5, 3, "text");
+    if (!quiet) {
+        int retval;
+        unsigned int nat = 0x12345678u;
+        char buffer[BUFFER_SIZE];
+        printf(" text 10.8s %*.*s \n", 5, 3, "text");
+        printf(" very long text 10.8s %10.8s \n", "very long text");
+        printf(" text 8.10s %8.10s \n", "text");
+        printf(" very long text 8.10s %8.10s \n", "very long text");
+        printf(" char: c '%c', 3.2c '%3.2c', -3.2c '%-3.2c', 2.3c '%2.3c', -2.3c '%-2.3c' \n",'a', 'b', 'c', 'd', 'e' );
+        printf(" int: d '%d', 3.2d '%3.2d', -3.2d '%-3.2d', 2.3d '%2.3d', -2.3d '%-2.3d' \n",1, 1, 1, 1, 1 );
+        printf(" -int: d '%d', 3.2d '%3.2d', -3.2d '%-3.2d', 2.3d '%2.3d', -2.3d '%-2.3d' \n",-1, -1, -1, -1, -1 );
+        printf(" 0xint: x '%#x', 5.3x '%#5.3x', -5.3x '%#-5.3x', 3.5x '%#3.5x', -3.5x '%#-3.5x' \n",17, 17, 17, 17, 17 );
+        printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, unative_t '%#zx'. '%#llx' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
+        printf(" Print to NULL '%s'\n", NULL);
+        retval = snprintf(buffer, BUFFER_SIZE, "Short text without parameters.");
+        printf("Result is: '%s', retval = %d\n", buffer, retval);
+        retval = snprintf(buffer, BUFFER_SIZE, "Very very very long text without parameters.");
+        printf("Result is: '%s', retval = %d\n", buffer, retval);
+        printf("Print short text to %d char long buffer via snprintf.\n", BUFFER_SIZE);
+        retval = snprintf(buffer, BUFFER_SIZE, "Short %s", "text");
+        printf("Result is: '%s', retval = %d\n", buffer, retval);
+        printf("Print long text to %d char long buffer via snprintf.\n", BUFFER_SIZE);
+        retval = snprintf(buffer, BUFFER_SIZE, "Very long %s. This text`s length is more than %d. We are interested in the result.", "text" , BUFFER_SIZE);
+        printf("Result is: '%s', retval = %d\n", buffer, retval);
+    }
-    TPRINTF("Testing printf(\"%%10.8s\", \"very long text\"):\n");
-    TPRINTF("Expected output: \"  very lon\"\n");
-    TPRINTF("Real output:     \"%10.8s\"\n\n", "very long text");
-    TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n");
-    TPRINTF("Expected output: \"text\"\n");
-    TPRINTF("Real output:     \"%8.10s\"\n\n", "text");
-    TPRINTF("Testing printf(\"%%8.10s\", \"very long text\"):\n");
-    TPRINTF("Expected output: \"very long \"\n");
-    TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
-    TPRINTF("Testing printf(\"%%s\", NULL):\n");
-    TPRINTF("Expected output: \"(NULL)\"\n");
-    TPRINTF("Real output:     \"%s\"\n\n", NULL);
     return NULL;
 }

 /trunk/uspace/app/klog/klog.c
 ,9 → 27,9
  */
 /** @addtogroup klog KLog
- * @brief HelenOS KLog
+ * @brief   HelenOS KLog
  * @{
- */
+ */
 /**
  * @file
  */
 ,55 → 40,48
 #include <ipc/services.h>
 #include <as.h>
 #include <sysinfo.h>
-#include <event.h>
-#include <errno.h>
-#include <io/klog.h>
-#define NAME  "klog"
 /* Pointer to klog area */
-static wchar_t *klog;
-static size_t klog_length;
+static char *klog;
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
-    size_t klog_start = (size_t) IPC_GET_ARG1(*call);
-    size_t klog_len = (size_t) IPC_GET_ARG2(*call);
-    size_t klog_stored = (size_t) IPC_GET_ARG3(*call);
-    size_t i;
+    int i;
-    for (i = klog_len - klog_stored; i < klog_len; i++)
-        putchar(klog[(klog_start + i) % klog_length]);
+    async_serialize_start();
+    for (i=0; klog[i + IPC_GET_ARG1(*call)] && i < IPC_GET_ARG2(*call); i++)
+        putchar(klog[i + IPC_GET_ARG1(*call)]);
+    putchar('\n');
+    async_serialize_end();
 }
 int main(int argc, char *argv[])
 {
-    size_t klog_pages = sysinfo_value("klog.pages");
-    size_t klog_size = klog_pages * PAGE_SIZE;
-    klog_length = klog_size / sizeof(wchar_t);
+    int res;
+    void *mapping;
+    printf("Kernel console output.\n");
-    klog = (wchar_t *) as_get_mappable_page(klog_size);
-    if (klog == NULL) {
-        printf(NAME ": Error allocating memory area\n");
-        return -1;
+    mapping = as_get_mappable_page(PAGE_SIZE);
+    res = ipc_share_in_start_1_0(PHONE_NS, mapping, PAGE_SIZE,
+        SERVICE_MEM_KLOG);
+    if (res) {
+        printf("Failed to initialize klog memarea\n");
+        _exit(1);
     }
-    int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog,
-        klog_size, SERVICE_MEM_KLOG);
-    if (res != EOK) {
-        printf(NAME ": Error initializing memory area\n");
-        return -1;
+    klog = mapping;
+    int inr = sysinfo_value("klog.inr");
+    int devno = sysinfo_value("klog.devno");
+    if (ipc_register_irq(inr, devno, 0, NULL)) {
+        printf("Error registering for klog service.\n");
+        return 0;
     }
-    if (event_subscribe(EVENT_KLOG, 0) != EOK) {
-        printf(NAME ": Error registering klog notifications\n");
-        return -1;
-    }
     async_set_interrupt_received(interrupt_received);
-    klog_update();
     async_manager();
     return 0;
 }

 /trunk/uspace/app/klog/Makefile
 ,7 → 31,6
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,24 → 47,22
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/app/tetris/screen.c
 ,7 → 36,7
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,26 → 50,22
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vfs/vfs.h>
+#include <io/stream.h>
 #include <async.h>
 #include "screen.h"
 #include "tetris.h"
-#include <io/console.h>
+#include "../../srv/console/console.h"
-#define STOP  (B_COLS - 3)
-static cell curscreen[B_SIZE];  /* non-zero => standout (or otherwise marked) */
+static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
 static int curscore;
-static int isset;               /* true => terminal is in game mode */
+static int isset;       /* true => terminal is in game mode */
-static int use_color;       /* true => use colors */
-static const struct shape *lastshape;
 /*
  * putstr() is for unpadded strings (either as in termcap(5) or
- * simply literal strings);
+ * simply literal strings);
  */
 static inline void putstr(char *s)
 {
 ,22 → 73,29
         putchar(*(s++));
 }
-static void start_standout(uint32_t color)
+static int con_phone;
+static void set_style(int fgcolor, int bgcolor)
 {
-    fflush(stdout);
-    console_set_rgb_color(fphone(stdout), 0xf0f0f0,
-        use_color ? color : 0x000000);
+    async_msg_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor);
 }
+static void start_standout(void)
+{
+    set_style(0xf0f0f0, 0);
+}
 static void resume_normal(void)
 {
-    fflush(stdout);
-    console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
+    set_style(0, 0xf0f0f0);
 }
 void clear_screen(void)
 {
-    console_clear(fphone(stdout));
+    async_msg_0(con_phone, CONSOLE_CLEAR);
     moveto(0, 0);
 }
 ,20 → 102,24
 /*
  * Clear the screen, forgetting the current contents in the process.
  */
-void scr_clear(void)
+void
+scr_clear(void)
 {
     resume_normal();
-    console_clear(fphone(stdout));
+    async_msg_0(con_phone, CONSOLE_CLEAR);
     curscore = -1;
-    memset(curscreen, 0, sizeof(curscreen));
+    memset((char *)curscreen, 0, sizeof(curscreen));
 }
 /*
  * Set up screen
  */
-void scr_init(void)
+void
+scr_init(void)
 {
-    console_cursor_visibility(fphone(stdout), 0);
+    con_phone = get_cons_phone();
+    async_msg_1(con_phone, CONSOLE_CURSOR_VISIBILITY, 0);
     resume_normal();
     scr_clear();
 }
 ,49 → 126,38
 void moveto(int r, int c)
 {
-    fflush(stdout);
-    console_goto(fphone(stdout), c, r);
+    async_msg_2(con_phone, CONSOLE_GOTO, r, c);
 }
+static void fflush(void)
+{
+    async_msg_0(con_phone, CONSOLE_FLUSH);
+}
 winsize_t winsize;
 static int get_display_size(winsize_t *ws)
 {
-    return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row);
+    return async_req_0_2(con_phone, CONSOLE_GETSIZE, &ws->ws_row,
+        &ws->ws_col);
 }
-static int get_display_color_sup(void)
-{
-    int rc;
-    int ccap;
-    rc = console_get_color_cap(fphone(stdout), &ccap);
-    if (rc != 0)
-        return 0;
-    return (ccap >= CONSOLE_CCAP_RGB);
-}
 /*
  * Set up screen mode.
  */
-void scr_set(void)
+void
+scr_set(void)
 {
     winsize_t ws;
-    Rows = 0;
-    Cols = 0;
+    Rows = 0, Cols = 0;
     if (get_display_size(&ws) == 0) {
         Rows = ws.ws_row;
         Cols = ws.ws_col;
     }
+    if (Rows < MINROWS || Cols < MINCOLS) {
+        char smallscr[55];
-    use_color = get_display_color_sup();
-    if ((Rows < MINROWS) || (Cols < MINCOLS)) {
-        char smallscr[55];
         snprintf(smallscr, sizeof(smallscr),
             "the screen is too small (must be at least %dx%d)",
             MINROWS, MINCOLS);
 ,7 → 164,7
         stop(smallscr);
     }
     isset = 1;
     scr_clear();
 }
 ,80 → 171,76
 /*
  * End screen mode.
  */
-void scr_end(void)
+void
+scr_end(void)
 {
-    console_cursor_visibility(fphone(stdout), 1);
 }
-void stop(char *why)
+void
+stop(char *why)
 {
     if (isset)
         scr_end();
     errx(1, "aborting: %s", why);
 }
 /*
  * Update the screen.
  */
-void scr_update(void)
+void
+scr_update(void)
 {
-    cell *bp;
-    cell *sp;
-    cell so;
-    cell cur_so = 0;
-    int i;
-    int j;
-    int ccol;
-    /* Always leave cursor after last displayed point */
+    cell *bp, *sp;
+    cell so, cur_so = 0;
+    int i, ccol, j;
+    static const struct shape *lastshape;
+    /* always leave cursor after last displayed point */
     curscreen[D_LAST * B_COLS - 1] = -1;
     if (score != curscore) {
         moveto(0, 0);
         printf("Score: %d", score);
         curscore = score;
     }
-    /* Draw preview of next pattern */
-    if ((showpreview) && (nextshape != lastshape)) {
+    /* draw preview of next pattern */
+    if (showpreview && (nextshape != lastshape)) {
         int i;
-        static int r = 5, c = 2;
+        static int r=5, c=2;
         int tr, tc, t;
         lastshape = nextshape;
-        /* Clean */
+        /* clean */
         resume_normal();
-        moveto(r - 1, c - 1);
-        putstr("          ");
-        moveto(r, c - 1);
-        putstr("          ");
-        moveto(r + 1, c - 1);
-        putstr("          ");
-        moveto(r + 2, c - 1);
-        putstr("          ");
-        moveto(r - 3, c - 2);
+        moveto(r-1, c-1); putstr("          ");
+        moveto(r,   c-1); putstr("          ");
+        moveto(r+1, c-1); putstr("          ");
+        moveto(r+2, c-1); putstr("          ");
+        moveto(r-3, c-2);
         putstr("Next shape:");
-        /* Draw */
-        start_standout(nextshape->color);
+        /* draw */
+        start_standout();
         moveto(r, 2 * c);
         putstr("  ");
         for (i = 0; i < 3; i++) {
             t = c + r * B_COLS;
             t += nextshape->off[i];
             tr = t / B_COLS;
             tc = t % B_COLS;
             moveto(tr, 2*tc);
             putstr("  ");
         }
         resume_normal();
     }
     bp = &board[D_FIRST * B_COLS];
     sp = &curscreen[D_FIRST * B_COLS];
     for (j = D_FIRST; j < D_LAST; j++) {
 ,7 → 248,6
         for (i = 0; i < B_COLS; bp++, sp++, i++) {
             if (*sp == (so = *bp))
                 continue;
             *sp = so;
             if (i != ccol) {
                 if (cur_so) {
 ,16 → 256,15
                 }
                 moveto(RTOD(j), CTOD(i));
             }
             if (so != cur_so) {
                 if (so)
-                    start_standout(so);
+                    start_standout();
                 else
                     resume_normal();
                 cur_so = so;
             }
             putstr("  ");
             ccol = i + 1;
             /*
              * Look ahead a bit, to avoid extra motion if
 ,35 → 274,33
              * `unnecessarily'.  Skip it all, though, if
              * the next cell is a different color.
              */
-            if ((i > STOP) || (sp[1] != bp[1]) || (so != bp[1]))
+#define STOP (B_COLS - 3)
+            if (i > STOP || sp[1] != bp[1] || so != bp[1])
                 continue;
             if (sp[2] != bp[2])
                 sp[1] = -1;
-            else if ((i < STOP) && (so == bp[2]) && (sp[3] != bp[3])) {
+            else if (i < STOP && so == bp[2] && sp[3] != bp[3]) {
                 sp[2] = -1;
                 sp[1] = -1;
             }
         }
     }
     if (cur_so)
         resume_normal();
-    fflush(stdout);
+    fflush();
 }
 /*
- * Write a message (set != 0), or clear the same message (set == 0).
+ * Write a message (set!=0), or clear the same message (set==0).
  * (We need its length in case we have to overwrite with blanks.)
  */
-void scr_msg(char *s, int set)
+void
+scr_msg(char *s, int set)
 {
-    int l = str_size(s);
+    int l = strlen(s);
     moveto(Rows - 2, ((Cols - l) >> 1) - 1);
     if (set)
         putstr(s);
     else
 ,3 → 310,4
 /** @}
  */

 /trunk/uspace/app/tetris/input.c
 ,7 → 36,7
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,9 → 57,7
 #include "tetris.h"
 #include <async.h>
-#include <vfs/vfs.h>
-#include <io/console.h>
-#include <ipc/console.h>
+#include "../../srv/console/console.h"
 /* return true iff the given timeval is positive */
 #define TV_POS(tv) \
 ,12 → 90,13
  * Return 0 => no input, 1 => can read() from stdin
  *
  */
-int rwait(struct timeval *tvp)
+int
+rwait(struct timeval *tvp)
 {
     struct timeval starttv, endtv, *s;
     static ipc_call_t charcall;
     ipcarg_t rc;
     /*
      * Someday, select() will do this for us.
      * Just in case that day is now, and no one has
 ,15 → 108,11
         s = &endtv;
     } else
         s = NULL;
     if (!lastchar) {
-again:
-        if (!getchar_inprog) {
-            getchar_inprog = async_send_0(fphone(stdin),
-                CONSOLE_GET_EVENT, &charcall);
-        }
-        if (!s)
+        if (!getchar_inprog)
+            getchar_inprog = async_send_2(1,CONSOLE_GETCHAR,0,0,&charcall);
+        if (!s)
             async_wait_for(getchar_inprog, &rc);
         else if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) {
             tvp->tv_sec = 0;
 ,25 → 119,19
             tvp->tv_usec = 0;
             return (0);
         }
         getchar_inprog = 0;
-        if (rc)
+        if (rc) {
             stop("end of file, help");
-        if (IPC_GET_ARG1(charcall) == KEY_RELEASE)
-            goto again;
-        lastchar = IPC_GET_ARG4(charcall);
+        }
+        lastchar = IPC_GET_ARG1(charcall);
     }
     if (tvp) {
         /* since there is input, we may not have timed out */
         (void) gettimeofday(&endtv, NULL);
         TV_SUB(&endtv, &starttv);
-        TV_SUB(tvp, &endtv);  /* adjust *tvp by elapsed time */
+        TV_SUB(tvp, &endtv);    /* adjust *tvp by elapsed time */
     }
-    return 1;
+    return (1);
 }
 /*
 ,10 → 138,11
  * `sleep' for the current turn time (using select).
  * Eat any input that might be available.
  */
-void tsleep(void)
+void
+tsleep(void)
 {
     struct timeval tv;
     tv.tv_sec = 0;
     tv.tv_usec = fallrate;
     while (TV_POS(&tv))
 ,11 → 155,12
 /*
  * getchar with timeout.
  */
-int tgetchar(void)
+int
+tgetchar(void)
 {
     static struct timeval timeleft;
     char c;
     /*
      * Reset timeleft to fallrate whenever it is not positive.
      * In any case, wait to see if there is any input.  If so,
 ,18 → 171,17
      * Most of the hard work is done by rwait().
      */
     if (!TV_POS(&timeleft)) {
-        faster();  /* go faster */
+        faster();   /* go faster */
         timeleft.tv_sec = 0;
         timeleft.tv_usec = fallrate;
     }
     if (!rwait(&timeleft))
-        return -1;
+        return (-1);
     c = lastchar;
     lastchar = '\0';
-    return ((int) (unsigned char) c);
+    return ((int)(unsigned char)c);
 }
 /** @}
  */

 /trunk/uspace/app/tetris/Makefile
 ,6 → 1,5
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 10,7
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 ,16 → 18,13
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 clean:
     -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-disasm: $(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/app/tetris/tetris.c
 ,25 → 36,30
  */
 /** @addtogroup tetris Tetris
- * @brief Tetris ported from OpenBSD
- * @{
+ * @brief   Tetris ported from OpenBSD
+ * @{
  */
 /** @file
  */
+#ifndef lint
 static const char copyright[] =
-    "@(#) Copyright (c) 1992, 1993\n"
-    "\tThe Regents of the University of California.  All rights reserved.\n";
+"@(#) Copyright (c) 1992, 1993\n\
+    The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+/*
+ * Tetris (or however it is spelled).
+ */
 #include <sys/time.h>
 #include <sys/types.h>
 #include <err.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 #include "input.h"
 #include "scores.h"
 ,76 → 66,66
 #include "screen.h"
 #include "tetris.h"
-cell board[B_SIZE];
-int Rows;
-int Cols;
+cell    board[B_SIZE];
+int Rows, Cols;
 const struct shape *curshape;
 const struct shape *nextshape;
+long    fallrate;
+int score;
+//gid_t gid, egid;
+char    key_msg[100];
+int showpreview, classic;
-long fallrate;
-int score;
-char key_msg[100];
-int showpreview;
-int classic;
+static void elide(void);
+static void setup_board(void);
+const struct shape *randshape(void);
+void    onintr(int);
+void    usage(void);
-static void elide(void);
-static void setup_board(void);
-static const struct shape *randshape(void);
-static void usage(void);
-static int firstgame = 1;
 /*
- * Set up the initial board. The bottom display row is completely set,
- * along with another (hidden) row underneath that. Also, the left and
+ * Set up the initial board.  The bottom display row is completely set,
+ * along with another (hidden) row underneath that.  Also, the left and
  * right edges are set.
  */
-static void setup_board(void)
+static void
+setup_board(void)
 {
     int i;
-    cell *p = board;
+    cell *p;
+    p = board;
     for (i = B_SIZE; i; i--)
-        *p++ = (i <= (2 * B_COLS) || (i % B_COLS) < 2) ? 0x0000ff : 0x000000;
+        *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2;
 }
 /*
  * Elide any full active rows.
  */
-static void elide(void)
+static void
+elide(void)
 {
     int rows = 0;
-    int i;
-    int j;
-    int base;
+    int i, j, base;
     cell *p;
     for (i = A_FIRST; i < A_LAST; i++) {
         base = i * B_COLS + 1;
         p = &board[base];
         for (j = B_COLS - 2; *p++ != 0;) {
             if (--j <= 0) {
-                /* This row is to be elided */
+                /* this row is to be elided */
                 rows++;
-                memset(&board[base], 0, sizeof(cell) * (B_COLS - 2));
+                memset(&board[base], 0, B_COLS - 2);
                 scr_update();
                 tsleep();
                 while (--base != 0)
                     board[base + B_COLS] = board[base];
                 scr_update();
                 tsleep();
                 break;
             }
         }
     }
     switch (rows) {
     case 1:
         score += 10;
 ,15 → 144,16
     }
 }
-const struct shape *randshape(void)
+const struct shape *
+randshape(void)
 {
-    const struct shape *tmp = &shapes[random() % 7];
-    int i;
-    int j = random() % 4;
+    const struct shape *tmp;
+    int i, j;
+    tmp = &shapes[random() % 7];
+    j = random() % 4;
     for (i = 0; i < j; i++)
-        tmp = &shapes[classic ? tmp->rotc : tmp->rot];
+        tmp = &shapes[classic? tmp->rotc : tmp->rot];
     return (tmp);
 }
 ,7 → 160,7
 static void srandomdev(void)
 {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     srandom(tv.tv_sec + tv.tv_usec / 100000);
 }
 ,43 → 167,61
 static void tetris_menu_draw(int level)
 {
-    clear_screen();
-    moveto(5, 10);
-    puts("Tetris\n\n");
-    moveto(8, 10);
-    printf("Level = %d (press keys 1 - 9 to change)", level);
-    moveto(9, 10);
-    printf("Preview is %s (press 'p' to change)", (showpreview ? "on ": "off"));
-    moveto(12, 10);
-    printf("Press 'h' to show hiscore table.");
-    moveto(13, 10);
-    printf("Press 's' to start game.");
-    moveto(14, 10);
-    printf("Press 'q' to quit game.");
-    moveto(20, 10);
-    printf("In game controls:");
-    moveto(21, 0);
-    puts(key_msg);
+        clear_screen();
+        moveto(5,10);
+        puts("Tetris\n\n");
+        moveto(8,10);
+        printf("Level = %d (press keys 1 - 9 to change)",level);
+        moveto(9,10);
+        printf("Preview is %s (press 'p' to change)", (showpreview?"on ":"off"));
+        moveto(12,10);
+        printf("Press 'h' to show hiscore table.");
+        moveto(13,10);
+        printf("Press 's' to start game.");
+        moveto(14,10);
+        printf("Press 'q' to quit game.");
+        moveto(20,10);
+        printf("In game controls:");
+        moveto(21,0);
+        puts(key_msg);
 }
-static int tetris_menu(int *level)
+static int tetris_menu(int *level)
 {
+    static int firstgame = 1;
+    int i;
+/*  if (showpreview == 0)
+        (void)printf("Your score:  %d point%s  x  level %d  =  %d\n",
+            score, score == 1 ? "" : "s", level, score * level);
+    else {
+        (void)printf("Your score:  %d point%s x level %d x preview penalty %0.3f = %d\n",
+            score, score == 1 ? "" : "s", level, (double)PRE_PENALTY,
+            (int)(score * level * PRE_PENALTY));
+        score = score * PRE_PENALTY;
+    }
+    savescore(level);
+    showscores(level);
+    printf("\nHit 's' to new game, 'q' to quit.\n");
+*/
     tetris_menu_draw(*level);
     while (1) {
-        int i = getchar();
+        i = getchar();
         switch(i) {
             case 'p':
                 showpreview = !showpreview;
-                moveto(9, 21);
+                moveto(9,21);
                 if (showpreview)
                     printf("on ");
                 else
                     printf("off");
                 break;
             case 'h':
-                loadscores();
                 showscores(firstgame);
                 tetris_menu_draw(*level);
                 break;
 ,103 → 235,112
             case '3':
             case '4':
             case '5':
-            case '6':
+            case '6':
             case '7':
             case '8':
             case '9':
                 *level = i - '0';
-                moveto(8, 18);
+                moveto(8,18);
                 printf("%d", *level);
                 break;
         }
     }
 }
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-    int pos;
-    int c;
-    const char *keys;
+    int pos, c;
+    char *keys;
     int level = 2;
     char key_write[6][10];
-    int i;
-    int j;
-    int ch;
+    int i, j;
     keys = "jkl pq";
+//  gid = getgid();
+//  egid = getegid();
+//  setegid(gid);
     classic = 0;
     showpreview = 1;
+/*  while ((ch = getopt(argc, argv, "ck:l:ps")) != -1) */
+/*      switch(ch) { */
+/*      case 'c': */
+/*          /\* */
+/*           * this means: */
+/*           *  - rotate the other way; */
+/*           *  - no reverse video. */
+/*           *\/ */
+/*          classic = 1; */
+/*          break; */
+/*      case 'k': */
+/*          if (strlen(keys = optarg) != 6) */
+/*              usage(); */
+/*          break; */
+/*      case 'l': */
+/*          level = (int)strtonum(optarg, MINLEVEL, MAXLEVEL, */
+/*              &errstr); */
+/*          if (errstr) */
+/*              errx(1, "level must be from %d to %d", */
+/*                  MINLEVEL, MAXLEVEL); */
+/*          break; */
+/*      case 'p': */
+/*          showpreview = 1; */
+/*          break; */
+/*      case 's': */
+/*          showscores(0); */
+/*          exit(0); */
+/*      default: */
+/*          usage(); */
+/*      } */
+/*  argc -= optind; */
+/*  argv += optind; */
+/*  if (argc) */
+/*      usage(); */
-    while ((ch = getopt(argc, argv, "ck:ps")) != -1)
-        switch(ch) {
-        case 'c':
-            /*
-             * this means:
-             *  - rotate the other way
-             *  - no reverse video
-             */
-            classic = 1;
-            break;
-        case 'k':
-            if (str_size(keys = optarg) != 6)
-                usage();
-            break;
-        case 'p':
-            showpreview = 1;
-            break;
-        case 's':
-            showscores(0);
-            exit(0);
-        default:
-            usage();
-        }
-    argc -= optind;
-    argv += optind;
-    if (argc)
-        usage();
     for (i = 0; i <= 5; i++) {
-        for (j = i + 1; j <= 5; j++) {
+        for (j = i+1; j <= 5; j++) {
             if (keys[i] == keys[j])
                 errx(1, "duplicate command keys specified.");
         }
         if (keys[i] == ' ')
-            str_cpy(key_write[i], sizeof(key_write[i]), "<space>");
+            strncpy(key_write[i], "<space>", sizeof key_write[i]);
         else {
             key_write[i][0] = keys[i];
             key_write[i][1] = '\0';
         }
     }
-    snprintf(key_msg, sizeof(key_msg),
-        "%s - left   %s - rotate   %s - right   %s - drop   %s - pause   %s - quit",
-        key_write[0], key_write[1], key_write[2], key_write[3],
-        key_write[4], key_write[5]);
+    snprintf(key_msg, sizeof key_msg,
+"%s - left   %s - rotate   %s - right   %s - drop   %s - pause   %s - quit",
+        key_write[0], key_write[1], key_write[2], key_write[3],
+        key_write[4], key_write[5]);
     scr_init();
-    if (loadscores() != EOK)
-        initscores();
+    initscores();
     while (tetris_menu(&level)) {
         fallrate = 1000000 / level;
         scr_clear();
         setup_board();
         srandomdev();
         scr_set();
-        pos = A_FIRST * B_COLS + (B_COLS / 2) - 1;
+        pos = A_FIRST*B_COLS + (B_COLS/2)-1;
         nextshape = randshape();
         curshape = randshape();
         scr_msg(key_msg, 1);
-        while (1) {
+        for (;;) {
             place(curshape, pos, 1);
             scr_update();
             place(curshape, pos, 0);
 ,7 → 353,7
                     pos += B_COLS;
                     continue;
                 }
                 /*
                  * Put up the current shape `permanently',
                  * bump score, and elide any full rows.
 ,7 → 361,7
                 place(curshape, pos, 1);
                 score++;
                 elide();
                 /*
                  * Choose a new shape.  If it does not fit,
                  * the game is over.
 ,14 → 368,12
                  */
                 curshape = nextshape;
                 nextshape = randshape();
-                pos = A_FIRST * B_COLS + (B_COLS / 2) - 1;
+                pos = A_FIRST*B_COLS + (B_COLS/2)-1;
                 if (!fits_in(curshape, pos))
                     break;
                 continue;
             }
             /*
              * Handle command keys.
              */
 ,25 → 381,22
                 /* quit */
                 break;
             }
             if (c == keys[4]) {
                 static char msg[] =
                     "paused - press RETURN to continue";
                 place(curshape, pos, 1);
                 do {
                     scr_update();
                     scr_msg(key_msg, 0);
                     scr_msg(msg, 1);
-                    (void) fflush(stdout);
-                } while (rwait((struct timeval *) NULL) == -1);
+    //              (void) fflush(stdout);
+                } while (rwait((struct timeval *)NULL) == -1);
                 scr_msg(msg, 0);
                 scr_msg(key_msg, 1);
                 place(curshape, pos, 0);
                 continue;
             }
             if (c == keys[0]) {
                 /* move left */
                 if (fits_in(curshape, pos - 1))
 ,17 → 403,15
                     pos--;
                 continue;
             }
             if (c == keys[1]) {
                 /* turn */
-                const struct shape *new =
-                    &shapes[classic ? curshape->rotc : curshape->rot];
+                const struct shape *new = &shapes[
+                    classic? curshape->rotc : curshape->rot];
                 if (fits_in(new, pos))
                     curshape = new;
                 continue;
             }
             if (c == keys[2]) {
                 /* move right */
                 if (fits_in(curshape, pos + 1))
 ,7 → 418,6
                     pos++;
                 continue;
             }
             if (c == keys[3]) {
                 /* move to bottom */
                 while (fits_in(curshape, pos + B_COLS)) {
 ,7 → 426,6
                 }
                 continue;
             }
             if (c == '\f') {
                 scr_clear();
                 scr_msg(key_msg, 1);
 ,24 → 433,37
         }
         scr_clear();
-        loadscores();
         insertscore(score, level);
-        savescores();
-        score = 0;
+        score=0;
     }
     scr_clear();
-    printf("\nGame over.\n");
+    printf("\n\n\n\t\tGame over.\n");
+/*
+    while ((i = getchar()) != '\n')
+        if (i == EOF)
+            break
+*/
     scr_end();
     return 0;
 }
-void usage(void)
+/* void */
+/* onintr(int signo) */
+/* { */
+/*  scr_clear();        /\* XXX signal race *\/ */
+/*  scr_end();      /\* XXX signal race *\/ */
+/*  _exit(0); */
+/* } */
+void
+usage(void)
 {
-    fprintf(stderr, "usage: tetris [-ps] [-k keys]\n");
+    (void)fprintf(stderr, "usage: tetris [-ps] [-k keys] [-l level]\n");
     exit(1);
 }
 /** @}
  */

 /trunk/uspace/app/tetris/scores.c
 ,7 → 36,7
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,18 → 48,21
  *
  * Major whacks since then.
  */
 #include <errno.h>
-#include <stdio.h>
+/* #include <err.h> */
+/* #include <fcntl.h> */
+/* #include <pwd.h> */
+ #include <stdio.h>
+/* #include <stdlib.h> */
 #include <string.h>
-#include <io/console.h>
-#include <io/keycode.h>
-#include <vfs/vfs.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <err.h>
-#include <time.h>
+/* #include <time.h> */
+/* #include <term.h> */
+/* #include <unistd.h> */
+/* #include <sys/param.h> */
+/* #include <sys/stat.h> */
+/* #include <sys/types.h> */
+#include "pathnames.h"
 #include "screen.h"
 #include "tetris.h"
 #include "scores.h"
 ,22 → 75,20
  * As long as the scores are kept sorted, this is simply the first one at
  * that level.
  */
+#define NUMSPOTS (MAXHISCORES + 1)
+#define NLEVELS (MAXLEVEL + 1)
-#define NUMSPOTS  (MAXHISCORES + 1)
-#define NLEVELS   (MAXLEVEL + 1)
+/* static time_t now; */
+/* static int nscores; */
+/* static int gotscores; */
+/* static struct highscore scores[NUMSPOTS]; */
 static struct highscore scores[NUMSPOTS];
-/** Copy from hiscore table score with index src to dest
- *
- */
-static void copyhiscore(int dest, int src)
-{
-    str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
-        scores[src].hs_name);
-    scores[dest].hs_score = scores[src].hs_score;
-    scores[dest].hs_level = scores[src].hs_level;
-}
+/* static int checkscores(struct highscore *, int); */
+/* static int cmpscores(const void *, const void *); */
+/* static void getscores(FILE **); */
+/* static void printem(int, int, struct highscore *, int, const char *); */
+/* static char *thisuser(void); */
 void showscores(int firstgame)
 {
 ,137 → 98,446
     moveto(10, 0);
     printf("\tRank \tLevel \tName\t                     points\n");
     printf("\t========================================================\n");
-    for (i = 0; i < NUMSPOTS - 1; i++)
-        printf("\t%6d %6d %-16s %20d\n",
-            i + 1, scores[i].hs_level, scores[i].hs_name, scores[i].hs_score);
+    for (i = 0; i < NUMSPOTS - 1; i++) {
+        printf("\t%6d %6d %-16s %20d\n", i+1, scores[i].hs_level, scores[i].hs_name, scores[i].hs_score);
+    }
     if (!firstgame) {
         printf("\t========================================================\n");
-        printf("\t  Last %6d %-16s %20d\n",
-            scores[NUMSPOTS - 1].hs_level, scores[NUMSPOTS - 1].hs_name, scores[NUMSPOTS - 1].hs_score);
+        printf("\t  Last %6d %-16s %20d\n", scores[NUMSPOTS - 1].hs_level, scores[NUMSPOTS - 1].hs_name, scores[NUMSPOTS - 1].hs_score);
     }
     printf("\n\n\n\n\tPress any key to return to main menu.");
     getchar();
 }
+/** Copy from hiscore table score with index src to dest
+ *
+ */
+static void copyhiscore(int dest, int src)
+{
+    strcpy(scores[dest].hs_name, scores[src].hs_name);
+    scores[dest].hs_score = scores[src].hs_score;
+    scores[dest].hs_level = scores[src].hs_level;
+}
 void insertscore(int score, int level)
 {
-    int i;
-    int j;
-    size_t off;
-    console_event_t ev;
+    int i,j;
+    int key;
     clear_screen();
-    moveto(10, 10);
+    moveto(10 , 10);
     puts("Insert your name: ");
-    str_cpy(scores[NUMSPOTS - 1].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
-        "Player");
+    strncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
     i = 6;
-    off = 6;
     moveto(10 , 28);
-    printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME-i,
-        "........................................");
-    while (1) {
-        fflush(stdout);
-        if (!console_get_event(fphone(stdin), &ev))
-            exit(1);
-        if (ev.type == KEY_RELEASE)
-            continue;
-        if (ev.key == KC_ENTER || ev.key == KC_NENTER)
-            break;
-        if (ev.key == KC_BACKSPACE) {
-            if (i > 0) {
-                wchar_t uc;
-                --i;
-                while (off > 0) {
-                    --off;
-                    size_t otmp = off;
-                    uc = str_decode(scores[NUMSPOTS - 1].hs_name,
-                        &otmp, STR_BOUNDS(MAXLOGNAME) + 1);
-                    if (uc != U_SPECIAL)
-                        break;
-                }
-                scores[NUMSPOTS - 1].hs_name[off] = '\0';
-            }
-        } else if (ev.c != '\0') {
-            if (i < (MAXLOGNAME - 1)) {
-                if (chr_encode(ev.c, scores[NUMSPOTS - 1].hs_name,
-                    &off, STR_BOUNDS(MAXLOGNAME) + 1) == EOK) {
-                    ++i;
-                }
-                scores[NUMSPOTS - 1].hs_name[off] = '\0';
-            }
+    printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................");
+    key = getchar();
+    while(key != '\n') {
+        if (key == '\b') {
+            if (i > 0)
+                scores[NUMSPOTS - 1].hs_name[--i] = '\0';
+        } else {
+            if (i < (MAXLOGNAME - 1))
+                scores[NUMSPOTS - 1].hs_name[i++] = key;
+                scores[NUMSPOTS - 1].hs_name[i] = '\0';
         }
-        moveto(10, 28);
-        printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME - i,
-            "........................................");
+        moveto(10 , 28);
+        printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................");
+        key = getchar();
     }
-    scores[NUMSPOTS - 1].hs_score = score;
+    scores[NUMSPOTS - 1].hs_score = score;
     scores[NUMSPOTS - 1].hs_level = level;
-    i = NUMSPOTS - 1;
+    i = NUMSPOTS-1;
     while ((i > 0) && (scores[i - 1].hs_score < score))
         i--;
-    for (j = NUMSPOTS - 2; j > i; j--)
-        copyhiscore(j, j-1);
-    copyhiscore(i, NUMSPOTS - 1);
+    for (j = NUMSPOTS - 2; j > i; j--) {
+        copyhiscore(j,j-1);
+    }
+    copyhiscore(i, NUMSPOTS - 1);
 }
 void initscores(void)
 {
     int i;
-    for (i = 0; i < NUMSPOTS; i++) {
-        str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team");
-        scores[i].hs_score = (NUMSPOTS - i) * 200;
-        scores[i].hs_level = (i + 1 > MAXLEVEL ? MAXLEVEL : i + 1);
+    for(i = 0; i < NUMSPOTS; i++) {
+        strncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+        scores[i].hs_score = (NUMSPOTS - i) * 200;
+        scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1);
     }
 }
-int loadscores(void)
-{
-    FILE *f;
-    size_t cnt;
-    int rc;
+/*
+ * Read the score file.  Can be called from savescore (before showscores)
+ * or showscores (if savescore will not be called).  If the given pointer
+ * is not NULL, sets *fpp to an open file pointer that corresponds to a
+ * read/write score file that is locked with LOCK_EX.  Otherwise, the
+ * file is locked with LOCK_SH for the read and closed before return.
+ *
+ * Note, we assume closing the stdio file releases the lock.
+ */
+/* static void */
+/* getscores(FILE **fpp) */
+/* { */
+/*  int sd, mint, lck, mask, i; */
+/*  char *mstr, *human; */
+/*  FILE *sf; */
-    f = fopen("/data/tetris.sco", "rb");
-    if (f == NULL)
-        return ENOENT;
+/*  if (fpp != NULL) { */
+/*      mint = O_RDWR | O_CREAT; */
+/*      mstr = "r+"; */
+/*      human = "read/write"; */
+/*      lck = LOCK_EX; */
+/*  } else { */
+/*      mint = O_RDONLY; */
+/*      mstr = "r"; */
+/*      human = "reading"; */
+/*      lck = LOCK_SH; */
+/*  } */
+/*  setegid(egid); */
+/*  mask = umask(S_IWOTH); */
+/*  sd = open(_PATH_SCOREFILE, mint, 0666); */
+/*  (void)umask(mask); */
+/*  setegid(gid); */
+/*  if (sd < 0) { */
+/*      if (fpp == NULL) { */
+/*          nscores = 0; */
+/*          return; */
+/*      } */
+/*      err(1, "cannot open %s for %s", _PATH_SCOREFILE, human); */
+/*  } */
+/*  setegid(egid); */
+/*  if ((sf = fdopen(sd, mstr)) == NULL) */
+/*      err(1, "cannot fdopen %s for %s", _PATH_SCOREFILE, human); */
+/*  setegid(gid); */
-    cnt = fread(scores, sizeof(struct highscore), NUMSPOTS, f);
-    rc = fclose(f);
+/*  /\* */
+/*   * Grab a lock. */
+/*   *\/ */
+/*  if (flock(sd, lck)) */
+/*      warn("warning: score file %s cannot be locked", */
+/*          _PATH_SCOREFILE); */
-    if (cnt != NUMSPOTS || rc != 0)
-        return EIO;
+/*  nscores = fread(scores, sizeof(scores[0]), MAXHISCORES, sf); */
+/*  if (ferror(sf)) */
+/*      err(1, "error reading %s", _PATH_SCOREFILE); */
+/*  for (i = 0; i < nscores; i++) */
+/*      if (scores[i].hs_level < MINLEVEL || */
+/*          scores[i].hs_level > MAXLEVEL) */
+/*          errx(1, "scorefile %s corrupt", _PATH_SCOREFILE); */
-    return EOK;
-}
+/*  if (fpp) */
+/*      *fpp = sf; */
+/*  else */
+/*      (void)fclose(sf); */
+/* } */
-void savescores(void)
+void
+savescore(int level)
 {
-    FILE *f;
-    size_t cnt;
-    int rc;
+    return;
+}
+/*  struct highscore *sp; */
+/*  int i; */
+/*  int change; */
+/*  FILE *sf; */
+/*  const char *me; */
-    f = fopen("/data/tetris.sco", "wb");
-    cnt = fwrite(scores, sizeof(struct highscore), NUMSPOTS, f);
-    rc = fclose(f);
+/*  getscores(&sf); */
+/*  gotscores = 1; */
+/*  (void)time(&now); */
-    if (cnt != NUMSPOTS || rc != 0)
-        printf("Error saving score table\n");
+/*  /\* */
+/*   * Allow at most one score per person per level -- see if we */
+/*   * can replace an existing score, or (easiest) do nothing. */
+/*   * Otherwise add new score at end (there is always room). */
+/*   *\/ */
+/*  change = 0; */
+/*  me = thisuser(); */
+/*  for (i = 0, sp = &scores[0]; i < nscores; i++, sp++) { */
+/*      if (sp->hs_level != level || strcmp(sp->hs_name, me) != 0) */
+/*          continue; */
+/*      if (score > sp->hs_score) { */
+/*          (void)printf("%s bettered %s %d score of %d!\n", */
+/*              "\nYou", "your old level", level, */
+/*              sp->hs_score * sp->hs_level); */
+/*          sp->hs_score = score;   /\* new score *\/ */
+/*          sp->hs_time = now;  /\* and time *\/ */
+/*          change = 1; */
+/*      } else if (score == sp->hs_score) { */
+/*          (void)printf("%s tied %s %d high score.\n", */
+/*              "\nYou", "your old level", level); */
+/*          sp->hs_time = now;  /\* renew it *\/ */
+/*          change = 1;     /\* gotta rewrite, sigh *\/ */
+/*      } /\* else new score < old score: do nothing *\/ */
+/*      break; */
+/*  } */
+/*  if (i >= nscores) { */
+/*      strlcpy(sp->hs_name, me, sizeof sp->hs_name); */
+/*      sp->hs_level = level; */
+/*      sp->hs_score = score; */
+/*      sp->hs_time = now; */
+/*      nscores++; */
+/*      change = 1; */
+/*  } */
+/*  if (change) { */
+/*      /\* */
+/*       * Sort & clean the scores, then rewrite. */
+/*       *\/ */
+/*      nscores = checkscores(scores, nscores); */
+/*      rewind(sf); */
+/*      if (fwrite(scores, sizeof(*sp), nscores, sf) != nscores || */
+/*          fflush(sf) == EOF) */
+/*          warnx("error writing %s: %s\n\t-- %s", */
+/*              _PATH_SCOREFILE, strerror(errno), */
+/*              "high scores may be damaged"); */
+/*  } */
+/*  (void)fclose(sf);   /\* releases lock *\/ */
+/* } */
+/*
+ * Get login name, or if that fails, get something suitable.
+ * The result is always trimmed to fit in a score.
+ */
+/* static char * */
+/* thisuser(void) */
+/* { */
+/*  const char *p; */
+/*  struct passwd *pw; */
+/*  static char u[sizeof(scores[0].hs_name)]; */
+/*  if (u[0]) */
+/*      return (u); */
+/*  p = getlogin(); */
+/*  if (p == NULL || *p == '\0') { */
+/*      pw = getpwuid(getuid()); */
+/*      if (pw != NULL) */
+/*          p = pw->pw_name; */
+/*      else */
+/*          p = "  ???"; */
+/*  } */
+/*  strlcpy(u, p, sizeof(u)); */
+/*  return (u); */
+/* } */
+/*
+ * Score comparison function for qsort.
+ *
+ * If two scores are equal, the person who had the score first is
+ * listed first in the highscore file.
+ */
+/* static int */
+/* cmpscores(const void *x, const void *y) */
+/* { */
+/*  const struct highscore *a, *b; */
+/*  long l; */
+/*  a = x; */
+/*  b = y; */
+/*  l = (long)b->hs_level * b->hs_score - (long)a->hs_level * a->hs_score; */
+/*  if (l < 0) */
+/*      return (-1); */
+/*  if (l > 0) */
+/*      return (1); */
+/*  if (a->hs_time < b->hs_time) */
+/*      return (-1); */
+/*  if (a->hs_time > b->hs_time) */
+/*      return (1); */
+/*  return (0); */
+/* } */
+/*
+ * If we've added a score to the file, we need to check the file and ensure
+ * that this player has only a few entries.  The number of entries is
+ * controlled by MAXSCORES, and is to ensure that the highscore file is not
+ * monopolised by just a few people.  People who no longer have accounts are
+ * only allowed the highest score.  Scores older than EXPIRATION seconds are
+ * removed, unless they are someone's personal best.
+ * Caveat:  the highest score on each level is always kept.
+ */
+/* static int */
+/* checkscores(struct highscore *hs, int num) */
+/* { */
+/*  struct highscore *sp; */
+/*  int i, j, k, numnames; */
+/*  int levelfound[NLEVELS]; */
+/*  struct peruser { */
+/*      char *name; */
+/*      int times; */
+/*  } count[NUMSPOTS]; */
+/*  struct peruser *pu; */
+/*  /\* */
+/*   * Sort so that highest totals come first. */
+/*   * */
+/*   * levelfound[i] becomes set when the first high score for that */
+/*   * level is encountered.  By definition this is the highest score. */
+/*   *\/ */
+/*  qsort((void *)hs, nscores, sizeof(*hs), cmpscores); */
+/*  for (i = MINLEVEL; i < NLEVELS; i++) */
+/*      levelfound[i] = 0; */
+/*  numnames = 0; */
+/*  for (i = 0, sp = hs; i < num;) { */
+/*      /\* */
+/*       * This is O(n^2), but do you think we care? */
+/*       *\/ */
+/*      for (j = 0, pu = count; j < numnames; j++, pu++) */
+/*          if (strcmp(sp->hs_name, pu->name) == 0) */
+/*              break; */
+/*      if (j == numnames) { */
+/*          /\* */
+/*           * Add new user, set per-user count to 1. */
+/*           *\/ */
+/*          pu->name = sp->hs_name; */
+/*          pu->times = 1; */
+/*          numnames++; */
+/*      } else { */
+/*          /\* */
+/*           * Two ways to keep this score: */
+/*           * - Not too many (per user), still has acct, & */
+/*           *  score not dated; or */
+/*           * - High score on this level. */
+/*           *\/ */
+/*          if ((pu->times < MAXSCORES && */
+/*               getpwnam(sp->hs_name) != NULL && */
+/*               sp->hs_time + EXPIRATION >= now) || */
+/*              levelfound[sp->hs_level] == 0) */
+/*              pu->times++; */
+/*          else { */
+/*              /\* */
+/*               * Delete this score, do not count it, */
+/*               * do not pass go, do not collect $200. */
+/*               *\/ */
+/*              num--; */
+/*              for (k = i; k < num; k++) */
+/*                  hs[k] = hs[k + 1]; */
+/*              continue; */
+/*          } */
+/*      } */
+/*      levelfound[sp->hs_level] = 1; */
+/*      i++, sp++; */
+/*  } */
+/*  return (num > MAXHISCORES ? MAXHISCORES : num); */
+/* } */
+/*
+ * Show current scores.  This must be called after savescore, if
+ * savescore is called at all, for two reasons:
+ * - Showscores munches the time field.
+ * - Even if that were not the case, a new score must be recorded
+ *   before it can be shown anyway.
+ */
+/*
+void
+showscores(int level)
+{
+    return;
 }
+*/
+/*  struct highscore *sp; */
+/*  int i, n, c; */
+/*  const char *me; */
+/*  int levelfound[NLEVELS]; */
+/*  if (!gotscores) */
+/*      getscores((FILE **)NULL); */
+/*  (void)printf("\n\t\t    Tetris High Scores\n"); */
+/*  /\* */
+/*   * If level == 0, the person has not played a game but just asked for */
+/*   * the high scores; we do not need to check for printing in highlight */
+/*   * mode.  If SOstr is null, we can't do highlighting anyway. */
+/*   *\/ */
+/*  me = level && SOstr ? thisuser() : NULL; */
+/*  /\* */
+/*   * Set times to 0 except for high score on each level. */
+/*   *\/ */
+/*  for (i = MINLEVEL; i < NLEVELS; i++) */
+/*      levelfound[i] = 0; */
+/*  for (i = 0, sp = scores; i < nscores; i++, sp++) { */
+/*      if (levelfound[sp->hs_level]) */
+/*          sp->hs_time = 0; */
+/*      else { */
+/*          sp->hs_time = 1; */
+/*          levelfound[sp->hs_level] = 1; */
+/*      } */
+/*  } */
+/*  /\* */
+/*   * Page each screenful of scores. */
+/*   *\/ */
+/*  for (i = 0, sp = scores; i < nscores; sp += n) { */
+/*      n = 20; */
+/*      if (i + n > nscores) */
+/*          n = nscores - i; */
+/*      printem(level, i + 1, sp, n, me); */
+/*      if ((i += n) < nscores) { */
+/*          (void)printf("\nHit RETURN to continue."); */
+/*          (void)fflush(stdout); */
+/*          while ((c = getchar()) != '\n') */
+/*              if (c == EOF) */
+/*                  break; */
+/*          (void)printf("\n"); */
+/*      } */
+/*  } */
+/*  if (nscores == 0) */
+/*      printf("\t\t\t      - none to date.\n"); */
+/* } */
+/* static void */
+/* printem(int level, int offset, struct highscore *hs, int n, const char *me) */
+/* { */
+/*  struct highscore *sp; */
+/*  int row, highlight, i; */
+/*  char buf[100]; */
+/* #define  TITLE "Rank  Score   Name                          (points/level)" */
+/* #define  TITL2 "==========================================================" */
+/*  printf("%s\n%s\n", TITLE, TITL2); */
+/*  highlight = 0; */
+/*  for (row = 0; row < n; row++) { */
+/*      sp = &hs[row]; */
+/*      (void)snprintf(buf, sizeof(buf), */
+/*          "%3d%c %6d  %-31s (%6d on %d)\n", */
+/*          row + offset, sp->hs_time ? '*' : ' ', */
+/*          sp->hs_score * sp->hs_level, */
+/*          sp->hs_name, sp->hs_score, sp->hs_level); */
+/*      /\* Print leaders every three lines *\/ */
+/*      if ((row + 1) % 3 == 0) { */
+/*          for (i = 0; i < sizeof(buf); i++) */
+/*              if (buf[i] == ' ') */
+/*                  buf[i] = '_'; */
+/*      } */
+/*      /\* */
+/*       * Highlight if appropriate.  This works because */
+/*       * we only get one score per level. */
+/*       *\/ */
+/*      if (me != NULL && */
+/*          sp->hs_level == level && */
+/*          sp->hs_score == score && */
+/*          strcmp(sp->hs_name, me) == 0) { */
+/*          putpad(SOstr); */
+/*          highlight = 1; */
+/*      } */
+/*      (void)printf("%s", buf); */
+/*      if (highlight) { */
+/*          putpad(SEstr); */
+/*          highlight = 0; */
+/*      } */
+/*  } */
+/* } */
 /** @}
  */

 /trunk/uspace/app/tetris/tetris.h
 ,7 → 36,7
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,60 → 55,57
  * worrying about addressing problems.
  */
-/* The board */
-#define B_COLS  12
-#define B_ROWS  23
-#define B_SIZE  (B_ROWS * B_COLS)
+    /* the board */
+#define B_COLS  12
+#define B_ROWS  23
+#define B_SIZE  (B_ROWS * B_COLS)
-typedef uint32_t cell;
+typedef unsigned char cell;
+extern cell board[B_SIZE];  /* 1 => occupied, 0 => empty */
-extern cell board[B_SIZE];  /* 1 => occupied, 0 => empty */
+    /* the displayed area (rows) */
+#define D_FIRST 1
+#define D_LAST  22
-/* The displayed area (rows) */
-#define D_FIRST  1
-#define D_LAST   22
+    /* the active area (rows) */
+#define A_FIRST 1
+#define A_LAST  21
-/* The active area (rows) */
-#define A_FIRST  1
-#define A_LAST   21
 /*
  * Minimum display size.
  */
-#define MINROWS  23
-#define MINCOLS  40
+#define MINROWS 23
+#define MINCOLS 40
-/* Current screen size */
-extern int Rows;
-extern int Cols;
+extern int  Rows, Cols; /* current screen size */
 /*
  * Translations from board coordinates to display coordinates.
  * As with board coordinates, display coordiates are zero origin.
  */
-#define RTOD(x)  ((x) - 1)
-#define CTOD(x)  ((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1))
+#define RTOD(x) ((x) - 1)
+#define CTOD(x) ((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1))
 /*
  * A `shape' is the fundamental thing that makes up the game.  There
  * are 7 basic shapes, each consisting of four `blots':
  *
- *      X.X       X.X           X.X
- *        X.X   X.X     X.X.X   X.X     X.X.X   X.X.X   X.X.X.X
- *                        X             X           X
+ *  X.X   X.X       X.X
+ *    X.X   X.X X.X.X   X.X X.X.X   X.X.X   X.X.X.X
+ *            X     X       X
  *
- *          0     1       2       3       4       5       6
+ *    0   1   2   3   4   5   6
  *
  * Except for 3 and 6, the center of each shape is one of the blots.
- * This blot is designated (0, 0).  The other three blots can then be
+ * This blot is designated (0,0).  The other three blots can then be
  * described as offsets from the center.  Shape 3 is the same under
  * rotation, so its center is effectively irrelevant; it has been chosen
  * so that it `sticks out' upward and leftward.  Except for shape 6,
- * all the blots are contained in a box going from (-1, -1) to (+1, +1);
+ * all the blots are contained in a box going from (-1,-1) to (+1,+1);
  * shape 6's center `wobbles' as it rotates, so that while it `sticks out'
  * rightward, its rotation---a vertical line---`sticks out' downward.
- * The containment box has to include the offset (2, 0), making the overall
- * containment box range from offset (-1, -1) to (+2, +1).  (This is why
+ * The containment box has to include the offset (2,0), making the overall
+ * containment box range from offset (-1,-1) to (+2,+1).  (This is why
  * there is only one row above, but two rows below, the display area.)
  *
  * The game works by choosing one of these shapes at random and putting
 ,7 → 116,7
  * At this time, any completely filled rows are elided, and blots above
  * these rows move down to make more room.  A new random shape is again
  * introduced at the top of the board, and the whole process repeats.
- * The game ends when the new shape will not fit at (1, 5).
+ * The game ends when the new shape will not fit at (1,5).
  *
  * While the shapes are falling, the user can rotate them counterclockwise
  * 90 degrees (in addition to moving them left or right), provided that the
 ,10 → 128,9
  * rotated forms.
  */
 struct shape {
-    int rot;     /* index of rotated version of this shape */
-    int rotc;    /* -- " -- in classic version  */
-    int off[3];  /* offsets to other blots if center is at (0,0) */
-    uint32_t color;
+    int rot;    /* index of rotated version of this shape */
+    int rotc;   /* -- " -- in classic version  */
+    int off[3]; /* offsets to other blots if center is at (0,0) */
 };
 extern const struct shape shapes[];
 ,16 → 148,15
  * The value eventually reaches a limit, and things stop going faster,
  * but by then the game is utterly impossible.
  */
-extern long fallrate;  /* less than 1 million; smaller => faster */
+extern long fallrate;   /* less than 1 million; smaller => faster */
+#define faster() (fallrate -= fallrate / 3000)
-#define faster()  (fallrate -= fallrate / 3000)
 /*
  * Game level must be between 1 and 9.  This controls the initial fall rate
  * and affects scoring.
  */
-#define MINLEVEL  1
-#define MAXLEVEL  9
+#define MINLEVEL    1
+#define MAXLEVEL    9
 /*
  * Scoring is as follows:
 ,17 → 170,19
  *
  * If previewing has been turned on, the score is multiplied by PRE_PENALTY.
  */
-#define PRE_PENALTY  0.75
+#define PRE_PENALTY 0.75
-extern int score;  /* The obvious thing */
+extern int  score;      /* the obvious thing */
+//extern gid_t  gid, egid;
-extern char key_msg[100];
-extern int showpreview;
-extern int classic;
+extern char key_msg[100];
+extern int  showpreview;
+extern int  classic;
-extern int fits_in(const struct shape *, int);
-extern void place(const struct shape *, int, int);
-extern void stop(char *);
+int fits_in(const struct shape *, int);
+void    place(const struct shape *, int, int);
+void    stop(char *);
 /** @}
  */

 /trunk/uspace/app/tetris/scores.h
 ,9 → 34,8
  *
  *  @(#)scores.h    8.1 (Berkeley) 5/31/93
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,27 → 44,24
 /*
  * Tetris scores.
  */
 #include <sys/time.h>
-#include <string.h>
-#define MAXLOGNAME   16
-#define MAXHISCORES  10
-#define MAXSCORES    9  /* maximum high score entries per person */
-#define EXPIRATION   (5L * 365 * 24 * 60 * 60)
+#define MAXLOGNAME 16
 struct highscore {
-    char hs_name[STR_BOUNDS(MAXLOGNAME) + 1];  /* login name */
-    int hs_score;                              /* raw score */
-    int hs_level;                              /* play level */
-    time_t hs_time;                            /* time at game end */
+    char    hs_name[MAXLOGNAME + 1];    /* login name */
+    int hs_score;   /* raw score */
+    int hs_level;   /* play level */
+//  time_t  hs_time;    /* time at game end */
 };
-extern void showscores(int);
-extern void initscores(void);
-extern void insertscore(int score, int level);
-extern int loadscores(void);
-extern void savescores(void);
+#define MAXHISCORES 10
+//#define MAXSCORES 9   /* maximum high score entries per person */
+//#define   EXPIRATION  (5L * 365 * 24 * 60 * 60)
+void savescore(int);
+void showscores(int);
+void insertscore(int score, int level);
+void initscores(void);
 /** @}
  */

 /trunk/uspace/app/tetris/shapes.c
 ,7 → 36,7
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 ,35 → 50,35
 #include <unistd.h>
 #include "tetris.h"
-#define TL  (-B_COLS - 1)  /* top left */
-#define TC  (-B_COLS)      /* top center */
-#define TR  (-B_COLS + 1)  /* top right */
-#define ML  -1             /* middle left */
-#define MR  1              /* middle right */
-#define BL  (B_COLS - 1)   /* bottom left */
-#define BC  B_COLS         /* bottom center */
-#define BR  (B_COLS + 1)   /* bottom right */
+#define TL  -B_COLS-1   /* top left */
+#define TC  -B_COLS     /* top center */
+#define TR  -B_COLS+1   /* top right */
+#define ML  -1      /* middle left */
+#define MR  1       /* middle right */
+#define BL  B_COLS-1    /* bottom left */
+#define BC  B_COLS      /* bottom center */
+#define BR  B_COLS+1    /* bottom right */
 const struct shape shapes[] = {
-    /*  0 */  {  7,  7, { TL, TC, MR }, 0xff042d},
-    /*  1 */  {  8,  8, { TC, TR, ML }, 0xff9304},
-    /*  2 */  {  9, 11, { ML, MR, BC }, 0xbeff04},
-    /*  3 */  {  3,  3, { TL, TC, ML }, 0x63ff04},
-    /*  4 */  { 12, 14, { ML, BL, MR }, 0xce04ff},
-    /*  5 */  { 15, 17, { ML, BR, MR }, 0xff04cf},
-    /*  6 */  { 18, 18, { ML, MR, 2  }, 0x7604ff},  /* sticks out */
-    /*  7 */  {  0,  0, { TC, ML, BL }, 0xff042d},
-    /*  8 */  {  1,  1, { TC, MR, BR }, 0xff9304},
-    /*  9 */  { 10,  2, { TC, MR, BC }, 0xbeff04},
-    /* 10 */  { 11,  9, { TC, ML, MR }, 0xbeff04},
-    /* 11 */  {  2, 10, { TC, ML, BC }, 0xbeff04},
-    /* 12 */  { 13,  4, { TC, BC, BR }, 0xce04ff},
-    /* 13 */  { 14, 12, { TR, ML, MR }, 0xce04ff},
-    /* 14 */  {  4, 13, { TL, TC, BC }, 0xce04ff},
-    /* 15 */  { 16,  5, { TR, TC, BC }, 0xff04cf},
-    /* 16 */  { 17, 15, { TL, MR, ML }, 0xff04cf},
-    /* 17 */  {  5, 16, { TC, BC, BL }, 0xff04cf},
-    /* 18 */  {  6,  6, { TC, BC, 2 * B_COLS }, 0x7604ff}  /* sticks out */
+    /* 0*/  { 7,    7,  { TL, TC, MR } },
+    /* 1*/  { 8,    8,  { TC, TR, ML } },
+    /* 2*/  { 9,    11, { ML, MR, BC } },
+    /* 3*/  { 3,    3,  { TL, TC, ML } },
+    /* 4*/  { 12,   14, { ML, BL, MR } },
+    /* 5*/  { 15,   17, { ML, BR, MR } },
+    /* 6*/  { 18,   18, { ML, MR, 2  } }, /* sticks out */
+    /* 7*/  { 0,    0,  { TC, ML, BL } },
+    /* 8*/  { 1,    1,  { TC, MR, BR } },
+    /* 9*/  { 10,   2,  { TC, MR, BC } },
+    /*10*/  { 11,   9,  { TC, ML, MR } },
+    /*11*/  { 2,    10, { TC, ML, BC } },
+    /*12*/  { 13,   4,  { TC, BC, BR } },
+    /*13*/  { 14,   12, { TR, ML, MR } },
+    /*14*/  { 4,    13, { TL, TC, BC } },
+    /*15*/  { 16,   5,  { TR, TC, BC } },
+    /*16*/  { 17,   15, { TL, MR, ML } },
+    /*17*/  { 5,    16, { TC, BC, BL } },
+    /*18*/  { 6,    6,  { TC, BC, 2*B_COLS } }/* sticks out */
 };
 /*
 ,14 → 85,14
  * Return true iff the given shape fits in the given position,
  * taking the current board into account.
  */
-int fits_in(const struct shape *shape, int pos)
+int
+fits_in(const struct shape *shape, int pos)
 {
-    const int *o = shape->off;
-    if ((board[pos]) || (board[pos + *o++]) || (board[pos + *o++]) ||
-        (board[pos + *o]))
+    int *o = shape->off;
+    if (board[pos] || board[pos + *o++] || board[pos + *o++] ||
+        board[pos + *o])
         return 0;
     return 1;
 }
 ,15 → 100,17
  * Write the given shape into the current board, turning it on
  * if `onoff' is 1, and off if `onoff' is 0.
  */
-void place(const struct shape *shape, int pos, int onoff)
+void
+place(const struct shape *shape, int pos, int onoff)
 {
-    const int *o = shape->off;
-    board[pos] = onoff ? shape->color : 0x000000;
-    board[pos + *o++] = onoff ? shape->color : 0x000000;
-    board[pos + *o++] = onoff ? shape->color : 0x000000;
-    board[pos + *o] = onoff ? shape->color : 0x000000;
+    int *o = shape->off;
+    board[pos] = onoff;
+    board[pos + *o++] = onoff;
+    board[pos + *o++] = onoff;
+    board[pos + *o] = onoff;
 }
 /** @}
  */

 /trunk/uspace/app/tetris/input.h
 ,14 → 36,15
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
-extern int rwait(struct timeval *);
-extern int tgetchar(void);
-extern void tsleep(void);
+int rwait(struct timeval *);
+int tgetchar(void);
+void    tsleep(void);
 /** @}
  */

 /trunk/uspace/app/tetris/screen.h
 ,17 → 36,16
  */
 /** @addtogroup tetris
- * @{
+ * @{
  */
 /** @file
  */
 /*
- * putpad() is for padded strings with count = 1.
+ * putpad() is for padded strings with count=1.
  */
-#define putpad(s)  tputs(s, 1, put)
+#define putpad(s)   tputs(s, 1, put)
-#include <sys/types.h>
 #include <async.h>
 typedef struct {
 ,17 → 55,17
 extern winsize_t winsize;
-extern void moveto(int r, int c);
-extern void clear_screen(void);
+void moveto(int r, int c);
+void clear_screen(void);
-/* just calls putchar; for tputs */
-extern int put(int);
-extern void scr_clear(void);
-extern void scr_end(void);
-extern void scr_init(void);
-extern void scr_msg(char *, int);
-extern void scr_set(void);
-extern void scr_update(void);
+int put(int);           /* just calls putchar; for tputs */
+void    scr_clear(void);
+void    scr_end(void);
+void    scr_init(void);
+void    scr_msg(char *, int);
+void    scr_set(void);
+void    scr_update(void);
 /** @}
  */

 /trunk/uspace/app/tetris/pathnames.h
 ,0 → 1,49
+/*  $OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:41 millert Exp $   */
+/*  $NetBSD: pathnames.h,v 1.2 1995/04/22 07:42:37 cgd Exp $    */
+/*-
+ * Copyright (c) 1992, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek and Darren F. Provine.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)pathnames.h 8.1 (Berkeley) 5/31/93
+ */
+/** @addtogroup tetris
+ * @{
+ */
+/** @file
+ */
+#define _PATH_SCOREFILE "/var/games/tetris.scores"
+/** @}
+ */

 /trunk/uspace/app/init/Makefile
 ,46 → 26,57
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+include ../../../version
+include ../../Makefile.config
 ## Setup toolchain
 #
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS += -I../../..
+CFLAGS += -I../../srv/kbd/include
 LIBS = $(LIBC_PREFIX)/libc.a
+DEFS += -DRELEASE=\"$(RELEASE)\"
+ifdef REVISION
+    DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 ## Sources
 #
 OUTPUT = init
 SOURCES = \
-    init.c
+    init.c \
+    version.c
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 .PHONY: all clean depend disasm
-all: $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) disasm
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-disasm: $(OUTPUT).disasm
+disasm:
+    $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-$(OUTPUT).disasm: $(OUTPUT)
-    $(OBJDUMP) -d $< > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /trunk/uspace/app/init/init.c
 ,245 → 27,37
  */
 /** @addtogroup init Init
- * @brief Init process for user space environment configuration.
+ * @brief   Init process for testing purposes.
  * @{
- */
+ */
 /**
  * @file
  */
+#include "version.h"
 #include <stdio.h>
-#include <unistd.h>
-#include <ipc/ipc.h>
-#include <vfs/vfs.h>
-#include <bool.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <task.h>
-#include <malloc.h>
-#include <macros.h>
-#include <string.h>
-#include <devmap.h>
-#include <config.h>
-#include "init.h"
-static void info_print(void)
+static void test_console(void)
 {
-    printf(NAME ": HelenOS init\n");
-}
+    int c;
-static bool mount_root(const char *fstype)
-{
-    char *opts = "";
-    const char *root_dev = "initrd";
-    if (str_cmp(fstype, "tmpfs") == 0)
-        opts = "restore";
-    int rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
-    switch (rc) {
-    case EOK:
-        printf(NAME ": Root filesystem mounted, %s at %s\n",
-            fstype, root_dev);
-        break;
-    case EBUSY:
-        printf(NAME ": Root filesystem already mounted\n");
-        return false;
-    case ELIMIT:
-        printf(NAME ": Unable to mount root filesystem\n");
-        return false;
-    case ENOENT:
-        printf(NAME ": Unknown filesystem type (%s)\n", fstype);
-        return false;
-    default:
-        printf(NAME ": Error mounting root filesystem (%d)\n", rc);
-        return false;
-    }
-    return true;
+    while ((c = getchar()) != EOF)
+        putchar(c);
 }
-static bool mount_devfs(void)
+int main(int argc, char *argv[])
 {
-    char null[MAX_DEVICE_NAME];
-    int null_id = devmap_null_create();
-    if (null_id == -1) {
-        printf(NAME ": Unable to create null device\n");
-        return false;
-    }
-    snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
-    int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
-    switch (rc) {
-    case EOK:
-        printf(NAME ": Device filesystem mounted\n");
-        break;
-    case EBUSY:
-        printf(NAME ": Device filesystem already mounted\n");
-        devmap_null_destroy(null_id);
-        return false;
-    case ELIMIT:
-        printf(NAME ": Unable to mount device filesystem\n");
-        devmap_null_destroy(null_id);
-        return false;
-    case ENOENT:
-        printf(NAME ": Unknown filesystem type (devfs)\n");
-        devmap_null_destroy(null_id);
-        return false;
-    default:
-        printf(NAME ": Error mounting device filesystem (%d)\n", rc);
-        devmap_null_destroy(null_id);
-        return false;
-    }
-    return true;
-}
+    version_print();
-static void spawn(char *fname)
-{
-    char *argv[2];
-    struct stat s;
+    printf("This is init\n");
-    if (stat(fname, &s) == ENOENT)
-        return;
-    printf(NAME ": Spawning %s\n", fname);
-    argv[0] = fname;
-    argv[1] = NULL;
-    if (!task_spawn(fname, argv))
-        printf(NAME ": Error spawning %s\n", fname);
-}
+    test_console();
-static void srv_start(char *fname)
-{
-    char *argv[2];
-    task_id_t id;
-    task_exit_t texit;
-    int rc, retval;
-    struct stat s;
-    if (stat(fname, &s) == ENOENT)
-        return;
-    printf(NAME ": Starting %s\n", fname);
-    argv[0] = fname;
-    argv[1] = NULL;
-    id = task_spawn(fname, argv);
-    if (!id) {
-        printf(NAME ": Error spawning %s\n", fname);
-        return;
-    }
+    printf("\nBye.\n");
-    rc = task_wait(id, &texit, &retval);
-    if (rc != EOK) {
-        printf(NAME ": Error waiting for %s\n", fname);
-        return;
-    }
-    if (texit != TASK_EXIT_NORMAL || retval != 0) {
-        printf(NAME ": Server %s failed to start (returned %d)\n",
-            fname, retval);
-    }
-}
-static void getvc(char *dev, char *app)
-{
-    char *argv[4];
-    char vc[MAX_DEVICE_NAME];
-    int rc;
-    snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
-    printf(NAME ": Spawning getvc on %s\n", vc);
-    dev_handle_t handle;
-    rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
-    if (rc == EOK) {
-        argv[0] = "/app/getvc";
-        argv[1] = vc;
-        argv[2] = app;
-        argv[3] = NULL;
-        if (!task_spawn("/app/getvc", argv))
-            printf(NAME ": Error spawning getvc on %s\n", vc);
-    } else {
-        printf(NAME ": Error waiting on %s\n", vc);
-    }
-}
-static void mount_data(void)
-{
-    int rc;
-    printf("Trying to mount disk0 on /data... ");
-    fflush(stdout);
-    rc = mount("fat", "/data", "disk0", "wtcache", 0);
-    if (rc == EOK)
-        printf("OK\n");
-    else
-        printf("Failed\n");
-}
-int main(int argc, char *argv[])
-{
-    info_print();
-    if (!mount_root(STRING(RDFMT))) {
-        printf(NAME ": Exiting\n");
-        return -1;
-    }
-    spawn("/srv/devfs");
-    if (!mount_devfs()) {
-        printf(NAME ": Exiting\n");
-        return -2;
-    }
-    spawn("/srv/fb");
-    spawn("/srv/kbd");
-//  spawn("/srv/netstart");
-    spawn("/srv/console");
-    spawn("/srv/fhc");
-    spawn("/srv/obio");
-    /*
-     * Start these synchronously so that mount_data() can be
-     * non-blocking.
-     */
-#ifdef CONFIG_START_BD
-    srv_start("/srv/ata_bd");
-    srv_start("/srv/gxe_bd");
-#else
-    (void) srv_start;
-#endif
-#ifdef CONFIG_MOUNT_DATA
-    mount_data();
-#else
-    (void) mount_data;
-#endif
-    getvc("vc0", "/app/bdsh");
-    getvc("vc1", "/app/bdsh");
-    getvc("vc2", "/app/bdsh");
-    getvc("vc3", "/app/bdsh");
-    getvc("vc4", "/app/bdsh");
-    getvc("vc5", "/app/bdsh");
-    getvc("vc6", "/app/klog");
     return 0;
 }
 /** @}
  */

 /trunk/uspace/app/init/version.c
 ,0 → 1,61
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup init
+ * @{
+ */
+/**
+ * @file
+ */
+#include <unistd.h>
+#include <stdio.h>
+#include "version.h"
+char *release = RELEASE;
+#ifdef REVISION
+    char *revision = ", revision " REVISION;
+#else
+    char *revision = "";
+#endif
+#ifdef TIMESTAMP
+    char *timestamp = "\nBuilt on " TIMESTAMP;
+#else
+    char *timestamp = "";
+#endif
+/** Print version information. */
+void version_print(void)
+{
+    printf("HelenOS init\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+}
+/** @}
+ */

 /trunk/uspace/app/init/init.h
 ,7 → 28,7
 /** @addtogroup init
  * @{
- */
+ */
 /**
  * @file
  */
 ,11 → 36,10
 #ifndef __INIT_H__
 #define __INIT_H__
-#define NAME  "init"
+#include "version.h"
-#define MAX_DEVICE_NAME  32
 #endif
 /** @}
  */

 /trunk/uspace/app/init/version.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup init
+ * @{
+ */
+/**
+ * @file
+ */
+#ifndef __VERSION_H__
+#define __VERSION_H__
+extern void version_print(void);
+#endif
+/** @}
+ */

 /trunk/uspace/Makefile
 ,63 → 29,66
 ## Include configuration
 #
--include ../Makefile.config
+-include Makefile.config
 DIRS = \
     lib/libc \
     lib/libfs \
-    lib/libblock \
     lib/softint \
     lib/softfloat \
-    srv/bd/ata_bd \
-    srv/bd/file_bd \
-    srv/bd/gxe_bd \
-    srv/bd/rd \
     srv/ns \
-    srv/loader \
     srv/fb \
     srv/kbd \
     srv/console \
+    srv/rd \
     srv/fs/fat \
     srv/fs/tmpfs \
-    srv/fs/devfs \
     srv/vfs \
     srv/devmap \
-    srv/net \
     app/tetris \
     app/tester \
-    app/trace \
     app/klog \
-    app/init \
-    app/getvc \
-    app/bdsh
+    app/init
-ifeq ($(UARCH),amd64)
+ifeq ($(ARCH), amd64)
     DIRS += srv/pci
 endif
-ifeq ($(UARCH),ia32)
+ifeq ($(ARCH), ia32)
     DIRS += srv/pci
 endif
-ifeq ($(UARCH),sparc64)
-    DIRS += \
-        srv/cir/fhc \
-        srv/cir/obio
+ifeq ($(ARCH), mips32)
+    CFLAGS += -DCONFIG_MIPS_FPU
 endif
+ifeq ($(ARCH), mips32eb)
+    CFLAGS += -DCONFIG_MIPS_FPU
+endif
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
-.PHONY: all $(BUILDS) $(CLEANS) clean
+.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
-all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
+all:
+    ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
+    $(MAKE) -C . build
+config:
+    ../tools/config.py uspace.config
+build: $(BUILDS)
 clean: $(CLEANS)
+    find $(DIRS) -name '*.o' -follow -exec rm \{\} \;
+    find lib/libc -name "_link.ld" -exec rm \{\} \;
+distclean: clean
+    -rm Makefile.config
 $(CLEANS):
-    -$(MAKE) -C $(basename $@) clean
+    -$(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
 $(BUILDS):
-    $(MAKE) -C $(basename $@) all
+    $(MAKE) -C $(basename $@) all ARCH=$(ARCH) COMPILER=$(COMPILER)

 /trunk/uspace/uspace.config
 ,0 → 1,40
+## General configuration directives
+# Architecture
+@ "amd64" AMD64/Intel EM64T
+@ "arm32" ARM 32-bit
+@ "ia32" Intel IA-32
+@ "ia64" Intel IA-64
+@ "mips32" MIPS 32-bit Little Endian
+@ "mips32eb" MIPS 32-bit Big Endian
+@ "ppc32" PowerPC 32-bit
+@ "ppc64" PowerPC 64-bit
+@ "sparc64" Sun UltraSPARC 64-bit
+! ARCH (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
+@ "suncc_native" Sun Studio C Compiler
+! [ARCH=amd64|ARCH=ia32] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
+! [ARCH=ia64] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "suncc_native" Sun Studio C Compiler
+! [ARCH=sparc64] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+! [ARCH=arm32|ARCH=mips32|ARCH=mips32eb|ARCH=ppc32|ARCH=ppc64] COMPILER (choice)
+# General debuging and assert checking
+! CONFIG_DEBUG (y/n)

 /trunk/uspace/doc/doxygroups.h
 ,7 → 1,5
-/** @file
- *  Definitions of modules and its relations for generating Doxygen documentation.
- */
+/* Definitions of modules and its relations for generating Doxygen documentation */
 /**
  * @defgroup srvcs HelenOS Services
 ,134 → 20,19
      * @defgroup fbs Framebuffer Service
      * @ingroup srvcs
      */
     /**
      * @defgroup console Console Service
      * @ingroup srvcs
      */
     /**
-     * @defgroup net Networking Stack
-     * @ingroup srvcs
-     */
-        /**
-         * @defgroup netif Network interface drivers
-         * @ingroup net
-         */
-            /**
-             * @defgroup lo Loopback Service
-             * @ingroup netif
-             */
-            /**
-             * @defgroup dp8390 Generic DP8390 network interface family service
-             * @ingroup netif
-             */
-                /**
-                 * @defgroup ne2k NE2000 network interface family
-                 * @ingroup dp8390
-                 */
-        /**
-         * @defgroup net_nil Network interface layer
-         * @ingroup net
-         */
-            /**
-             * @defgroup eth Ethernet (IEEE 802.3) network interface layer Service
-             * @ingroup net_nil
-             */
-            /**
-             * @defgroup nildummy Dummy network interface layer Service
-             * @ingroup net_nil
-             */
-        /**
-         * @defgroup net_il Inter-networking layer
-         * @ingroup net
-         */
-            /**
-             * @defgroup arp Address Resolution Protocol (ARP) Service
-             * @ingroup net_il
-             */
-            /**
-             * @defgroup ip Internet Protocol (IP) Service
-             * @ingroup net_il
-             */
-        /**
-         * @defgroup net_tl Transport layer
-         * @ingroup net
-         */
-            /**
-             * @defgroup icmp Internet Control Message Protocol (ICMP) Service
-             * @ingroup net_tl
-             */
-            /**
-             * @defgroup udp User Datagram Protocol (UDP) Service
-             * @ingroup net_tl
-             */
-            /**
-             * @defgroup tcp Transmission Control Protocol (TCP) Service
-             * @ingroup net_tl
-             */
-        /**
-         * @defgroup packet Packet management system
-         * @ingroup net
-         */
-        /**
-         * @defgroup net_app Applications
-         * @ingroup net
-         */
-            /**
-             * @defgroup echo Echo Service
-             * @ingroup net_app
-             */
-            /**
-             * @defgroup ping Ping
-             * @ingroup net_app
-             */
-            /**
-             * @defgroup nettest Networking tests
-             * @ingroup net_app
-             */
-        /**
-         * @defgroup net_lib Application library
-         * @ingroup net
-         */
-            /**
-             * @defgroup socket Sockets
-             * @ingroup net_lib
-             */
-            /**
-             * @defgroup netdb Netdb
-             * @ingroup net_lib
-             */
-    /**
      * @cond amd64
      * @defgroup pci PCI Service
      * @ingroup srvcs
      * @endcond
      */
     /**
      * @cond ia32
      * @defgroup pci PCI Service
 ,19 → 39,18
      * @ingroup srvcs
      * @endcond
      */
 /**
  * @defgroup emul Emulation Libraries
  * @ingroup uspace
  */
     /**
      * @defgroup sfl Softloat
      * @ingroup emul
      */
     /**
      * @defgroup softint Softint
      * @ingroup emul
      */

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev HEAD → Rev 2728