1.1 --- a/README	Fri Jan 20 14:32:03 2012 -0800
     1.2 +++ b/README	Mon Jan 23 11:04:15 2012 -0800
     1.3 @@ -30,10 +30,9 @@
     1.4   * Lenovo X200 and X301 laptops
     1.5   * ASUS Eee PC 1015PEM netbooks
     1.6  
     1.7 -In addition, ports to the ARM and Beehive processor architectures are in
     1.8 -progress. These are less complete than the x86 and SCC ports, and are
     1.9 -not described in this document, but feel free to ask for help on the
    1.10 -mailing list.
    1.11 +In addition, a port to the ARM architectures is in progress. This is 
    1.12 +less complete than the x86 and SCC ports, and not described in this 
    1.13 +document, but feel free to ask for help on the mailing list.
    1.14  
    1.15  The e1000n driver should work with most recent Intel gigabit ethernet
    1.16  controllers (see the list in devices/e1000.dev). We've mostly used the

     2.1 --- a/capabilities/caps.hl	Fri Jan 20 14:32:03 2012 -0800
     2.2 +++ b/capabilities/caps.hl	Mon Jan 23 11:04:15 2012 -0800
     2.3 @@ -302,17 +302,6 @@
     2.4      eq uint16 chanid;
     2.5  };
     2.6  
     2.7 -/* Beehive HW message passing endpoint */
     2.8 -cap BMPEndPoint {
     2.9 -    eq uint8 coreid;
    2.10 -    eq uint16 chanid;
    2.11 -};
    2.12 -
    2.13 -cap BMPTable {
    2.14 -    /* BMP association table */
    2.15 -    is_always_copy;
    2.16 -};
    2.17 -
    2.18  cap Domain {
    2.19      /* Domain capability (opaque type, used by the monitors) */
    2.20      eq uint32 domainid;

     3.1 --- a/doc/007-Beehive/Beehive.tex	Fri Jan 20 14:32:03 2012 -0800
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,215 +0,0 @@
     3.4 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     3.5 -% Copyright (c) 2011, ETH Zurich.
     3.6 -% All rights reserved.
     3.7 -%
     3.8 -% This file is distributed under the terms in the attached LICENSE file.
     3.9 -% If you do not find this file, copies can be found by writing to:
    3.10 -% ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
    3.11 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    3.12 -
    3.13 -\documentclass[a4paper,twoside]{report} % for a report (default)
    3.14 -
    3.15 -\usepackage{bftn,color} % You need this
    3.16 -
    3.17 -\title{Barrelfish on the Beehive experimental platform}   % title of report
    3.18 -\author{Richard Black}	% author
    3.19 -\tnnumber{007}  % give the number of the tech report
    3.20 -\tnkey{Beehive} % Short title, will appear in footer
    3.21 -
    3.22 -% \date{Month Year} % Not needed - will be taken from version history
    3.23 -
    3.24 -%% \newcommand{\note}[1]{}
    3.25 -\newcommand{\note}[1]{[\textcolor{red}{\textit{#1}}]}
    3.26 -
    3.27 -\begin{document}
    3.28 -\maketitle
    3.29 -
    3.30 -%
    3.31 -% Include version history first
    3.32 -%
    3.33 -\begin{versionhistory}
    3.34 -\vhEntry{1.0}{14.06.2010}{RJB}{Initial version}
    3.35 -%\vhEntry{1.01}{14.06.2010}{AS}{Added discussion of design and unresolved issues}
    3.36 -\end{versionhistory}
    3.37 -
    3.38 -% \intro{Abstract}		% Insert abstract here
    3.39 -% \intro{Acknowledgements}	% Uncomment (if needed) for acknowledgements
    3.40 -% \tableofcontents		% Uncomment (if needed) for final draft
    3.41 -% \listoffigures		% Uncomment (if needed) for final draft
    3.42 -% \listoftables			% Uncomment (if needed) for final draft
    3.43 -
    3.44 -\chapter{Introduction}
    3.45 -
    3.46 -This report describes the port of the Barrlelfish operating system to
    3.47 -the Beehive multi-core experimental platform.
    3.48 -
    3.49 -\note{This is what a note does.}
    3.50 -
    3.51 -\note{summarise chapters}
    3.52 -
    3.53 -\note{executive summary}
    3.54 -
    3.55 -\chapter{Barrelfish implementation on Beehive}
    3.56 -
    3.57 -\section{Hypervisor}
    3.58 -
    3.59 -\section{Memory map}
    3.60 -
    3.61 -\section{System calls}
    3.62 -
    3.63 -\section{Timer interrupts}
    3.64 -
    3.65 -\section{BMP interconnect driver}
    3.66 -
    3.67 -\emph{Beehive} is an experimental FPGA-based multicore architecture
    3.68 -under development at Microsoft Research\cite{beehive:hwman} targeting
    3.69 -the RAMP BEE-3 platform\cite{davis:bee3}. The current design has 13
    3.70 -RISC cores on a ring network with a memory controller, gigabit
    3.71 -Ethernet, and other IO devices. Like SCC, each core has a private
    3.72 -non-coherent cache and hardware support for message passing. However,
    3.73 -Beehive's message-passing mechanism bypasses the caches and memory
    3.74 -system entirely.  Each core may directly send a message of up to 63
    3.75 -words to another core on the ring.  Incoming messages are placed in a
    3.76 -FIFO which can be cheaply (three cycles) polled. The FIFO holds 1024
    3.77 -words and has no hardware flow control -- software must ensure that it
    3.78 -does not overflow.
    3.79 -
    3.80 -As with SCC, the challenge for a Beehive interconnect driver is to
    3.81 -provide secure efficient multiplexing of the shared hardware message
    3.82 -channel.  We do this at two levels. Between CPU drivers, a single
    3.83 -point-to-point message channel is implemented with credit-based flow
    3.84 -control, with 64 words of the 1024-word buffer reserved for each
    3.85 -sender core.  User channels are multiplexed over this by prepending a
    3.86 -one-word header to each message. At user-level, the interconnect
    3.87 -driver similarly maintains an incoming message buffer. The generated
    3.88 -stubs pack message arguments into variable-length fragments of up to
    3.89 -57 words of payload (the remainder is used for headers or reserved for
    3.90 -credit messages), perform flow-control on the user-level buffer, and
    3.91 -handle incoming messages when notified by the interconnect driver.
    3.92 -
    3.93 -\subsection{Kernel BMP protocol}
    3.94 -
    3.95 -At the hardware level messages have a single word header containing
    3.96 -the length of the message, the core number and the type followed by
    3.97 -between 1 and 63 words of payload.  Messages of length zero are
    3.98 -reserved for communication between the master core and the debug unit.
    3.99 -A single type (2) is used for BMP messages.  Each core has a 1024 word
   3.100 -FIFO which must not overflow.
   3.101 -
   3.102 -To ensure that the FIFO does not overflow the kernel BMP components
   3.103 -use a credit based flow control mechanism.  The first word of the
   3.104 -message (after the hardware header) is divided into two fields; one of
   3.105 -which contains any credit being sent, and the other provides
   3.106 -demultiplexing into multiple user level channels.
   3.107 -
   3.108 -Each core is initialised with 64 words of credit for each other core
   3.109 -and once this is consumed transmission must wait for credit to be sent
   3.110 -from the destination.  The sending of a credit acknowledgement also
   3.111 -requires space in the destination FIFO and so itself consumes credit.
   3.112 -To avoid sending a credit acknowledgement for a credit
   3.113 -acknowledgement, credits are not sent if the available amount is less
   3.114 -than or equal to 2 words.
   3.115 -
   3.116 -When sending a message the code ensures that it has enough credit to
   3.117 -send the message and still have 2 words of credit remaining.  This
   3.118 -permits it to send an acknowledgement for the other core without first
   3.119 -having to wait for an acknowledgment from the other core, which seems
   3.120 -sufficient to avoid deadlocking (but may not strictly be necessary).
   3.121 -
   3.122 -The MTU for BMP messages is calculated as follows.  The hardware
   3.123 -supports 64 words, 62 plus kernel BMP header plus header, but this is
   3.124 -also the flow control limit.  Since we might have sent an ACK already
   3.125 -which is not acked a common value of credit is 62.  Since we have to
   3.126 -keep enough credit to be able to send an ACK subsequent to sending a
   3.127 -message, the maximum sized message is 60 words, i.e. 58 words of
   3.128 -payload.
   3.129 -
   3.130 -As a possible future change, we observe that core 0 is always the DRAM
   3.131 -controller, and cores do not need to send themselves messages,
   3.132 -therefore there are a maximum of 14 cores on the ring to divide out
   3.133 -the FIFO between.  This would permit 73 words of credit per core
   3.134 -rather than 64 which would translate into a kernel MTU of 67 instead
   3.135 -of 58 words.
   3.136 -
   3.137 -\subsection{Kernel BMP processing}
   3.138 -
   3.139 -The state machine for processing BMP has to take carefully into
   3.140 -consideration the fact that there are no interrupts for the FIFO, or
   3.141 -for timers, the multiplexed nature of the FIFO, and the neccessity to
   3.142 -receive credit in order to trasnmit.
   3.143 -
   3.144 -One entry point is when the core is idle; the FIFO should be processed
   3.145 -completely until it is idle with any incoming message potentially
   3.146 -causing a domain to become runnable and the scheduler then being
   3.147 -called.  Once the FIFO is idle it should continue to be polled until
   3.148 -the timer interrupt fire.  During this time credit acknowledgements
   3.149 -must be sent as appropriate.
   3.150 -
   3.151 -The second entry point is when a send is desired.  This has to deal
   3.152 -with the possibility that there is insufficient credit.  If there is
   3.153 -insufficient credit then the code must process messages, delivering
   3.154 -them on incoming channels, and sending and receiving credit, until
   3.155 -there is enough credit to send the required message.  Then the message
   3.156 -can be sent.  After the message is sent the FIFO must again be
   3.157 -processed until it is idle.
   3.158 -
   3.159 -Note that if a message is desired to be sent when there is
   3.160 -insufficient credit the code currently processes the FIO until there
   3.161 -is credit which can be a substantially long time.  An alternative
   3.162 -would be to return a ``busy'' code the caller which would have the
   3.163 -difficulty that it is impossible to subsequently advise when a retry
   3.164 -might succeed.
   3.165 -
   3.166 -To mitigate busy waiting on transmit the third entry point is called
   3.167 -on a timer tick before the scheduler is called.  This once again
   3.168 -processes the FIFO until it is idle (including the sending of
   3.169 -acknowledgements).  This processing has the benefit of providing the
   3.170 -scheduler with as much information as possible before the timer tick
   3.171 -is delivered.
   3.172 -
   3.173 -There is an additional entry point that currently for debug purposes
   3.174 -the \texttt{sys\_nop} system call also pumps messages from the FIFO.
   3.175 -
   3.176 -The \texttt{sys\_yield} call currently does not pump the FIFO, but
   3.177 -probably should.
   3.178 -
   3.179 -\subsection{User-level BMP component}
   3.180 -
   3.181 -\chapter{Performance measurements}
   3.182 -
   3.183 -Several unconventional features of Beehive make performance of any
   3.184 -communication system a challenge.  In particular, the small,
   3.185 -direct-mapped instruction cache and low instruction density mean 
   3.186 -I-cache miss rate tends to dominate performance.
   3.187 -We found that a single word echo between user programs on
   3.188 -different cores has a latency of 56k$\pm$1k cycles with more than 80\%
   3.189 -of this cost attributable to I-cache misses (each taking
   3.190 -$\approx54$ cycles).
   3.191 -
   3.192 -It is more instructive to look at the count of instructions executed,
   3.193 -even though instruction density is low.  It takes about 2900
   3.194 -instructions to send a request: 230 in user stubs,
   3.195 -630 in the capability invocation, 100 in sending the message, 600
   3.196 -returning from the system call, and 1300 for stubs, threads package
   3.197 -and kernel to idle. 
   3.198 -
   3.199 -The receive path is about 3200 instructions: 100
   3.200 -to receive the message in the CPU driver, 570 to look up the endpoint
   3.201 -capability and copy the message to the user's channel buffer, 480 to
   3.202 -make the process runnable, and a further 2000 to upcall the process
   3.203 -and dispatch the message through the stub to application code.
   3.204 -
   3.205 -While the performance of the processor is low, and both Barrelfish
   3.206 -and the FPGA processor core have scope for optimization,
   3.207 -the interconnect driver does provide secure multiplexed
   3.208 -messaging on this non-cache-coherent hardware at a cost which is low
   3.209 -considering the general cost of execution on the platform.
   3.210 -
   3.211 -
   3.212 -
   3.213 -\chapter{General observations}
   3.214 -
   3.215 -\bibliographystyle{abbrvnat}
   3.216 -\bibliography{defs,barrelfish}
   3.217 -
   3.218 -\end{document}

     4.1 --- a/doc/007-Beehive/Hakefile	Fri Jan 20 14:32:03 2012 -0800
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,13 +0,0 @@
     4.4 -----------------------------------------------------------------------
     4.5 --- Copyright (c) 2010, ETH Zurich.
     4.6 --- All rights reserved.
     4.7 ---
     4.8 --- This file is distributed under the terms in the attached LICENSE file.
     4.9 --- If you do not find this file, copies can be found by writing to:
    4.10 --- ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
    4.11 ---
    4.12 --- Hakefile for /doc/007-Beehive
    4.13 ---
    4.14 -----------------------------------------------------------------------
    4.15 -
    4.16 -[ buildTechNote "Beehive.tex" "TN-007-Beehive.pdf" True False [] ]

     5.1 --- a/errors/errno.fugu	Fri Jan 20 14:32:03 2012 -0800
     5.2 +++ b/errors/errno.fugu	Mon Jan 23 11:04:15 2012 -0800
     5.3 @@ -31,9 +31,6 @@
     5.4      failure LRPC_NOT_ENDPOINT   "Slot specified for LRPC does not contain an endpoint cap",
     5.5      failure INVALID_EPLEN       "Endpoint buffer has invalid length",
     5.6  
     5.7 -    // BMP (Beehive messaging)
     5.8 -    failure BMP_TX_BUSY         "BMP send failed; insufficient TX credits to remote core",
     5.9 -
    5.10      // XXX: this should go away -AB
    5.11      failure IDC_MSG_BOUNDS      "Attempted to retrieve a word beyond the size of an LMP message structure",
    5.12  
    5.13 @@ -81,12 +78,6 @@
    5.14      // IO capability
    5.15      failure IO_PORT_INVALID     "IO port out of range",
    5.16  
    5.17 -    // errors related to BMP table
    5.18 -    failure BMP_LOOKUP          "Specified capability was not found while inserting in IRQ table",
    5.19 -    failure BMP_NOT_ENDPOINT    "Specified capability is not an endpoint cap",
    5.20 -    failure BMP_NO_LISTENER     "No listener on specified endpoint cap", // ??
    5.21 -    failure BMP_INVALID         "BMP association ID out of range",
    5.22 -
    5.23      // Dispatcher setup and spawn core invocations
    5.24      failure DISP_CSPACE_ROOT    "Error setting CSpace root on dispatcher",
    5.25      failure DISP_CSPACE_INVALID "Invalid capability type given for CSpace root on dispatcher",
    5.26 @@ -244,7 +235,7 @@
    5.27      failure CORESET_NEW             "Failure in coreset_new()",
    5.28      failure CORESET_GET_NEXT_DONE   "No more elements left in coreset_get_next()",
    5.29  
    5.30 -    // IDC (and LMP/UMP/BMP channels)
    5.31 +    // IDC (and LMP/UMP channels)
    5.32      failure NO_LMP_MSG          "No LMP message available",
    5.33      failure LMP_RECV_BUF_OVERFLOW "LMP message in endpoint is longer than user-provided buffer",
    5.34      failure NO_UMP_MSG          "No UMP message available",
    5.35 @@ -261,18 +252,13 @@
    5.36      failure CHAN_DEREGISTER_RECV "Failure in *_chan_deregister_recv()",
    5.37      failure LMP_CHAN_INIT       "Failure in lmp_chan_init()",
    5.38      failure UMP_CHAN_INIT       "Failure in ump_chan_init()",
    5.39 -    failure BMP_CHAN_INIT       "Failure in bmp_chan_init()",
    5.40      failure LMP_CHAN_RECV       "Failure in lmp_chan_recv()",
    5.41      failure UMP_CHAN_RECV       "Failure in ump_chan_recv()",
    5.42 -    failure BMP_CHAN_RECV       "Failure in bmp_chan_recv()",
    5.43      failure LMP_CHAN_SEND       "Failure in lmp_chan_send()",
    5.44 -    failure BMP_CHAN_SEND       "Failure in bmp_chan_send()",
    5.45      failure LMP_CHAN_BIND       "Failure in lmp_chan_bind()",
    5.46      failure UMP_CHAN_BIND       "Failure in ump_chan_bind()",
    5.47 -    failure BMP_CHAN_BIND       "Failure in bmp_chan_bind()",
    5.48      failure LMP_CHAN_ACCEPT     "Failure in lmp_chan_accept()",
    5.49      failure UMP_CHAN_ACCEPT     "Failure in ump_chan_accept()",
    5.50 -    failure BMP_CHAN_ACCEPT     "Failure in bmp_chan_accept()",
    5.51      failure LMP_ALLOC_RECV_SLOT "Failure in lmp_chan_alloc_recv_slot()",
    5.52      failure LMP_NOT_CONNECTED   "Channel is disconnected",
    5.53      failure MSGBUF_OVERFLOW     "Attempted to demarshall beyond bounds of message buffer",
    5.54 @@ -286,13 +272,10 @@
    5.55      failure NAMESERVICE_NOT_BOUND "Name service client is not bound",
    5.56      failure BIND_LMP_REQ        "Failure sending bind_lmp_request to monitor",
    5.57      failure BIND_UMP_REQ        "Failure sending bind_ump_request to monitor",
    5.58 -    failure BIND_BMP_REQ        "Failure sending bind_bmp_request to monitor",
    5.59      failure BIND_LMP_REPLY      "Failure sending bind_lmp_reply to monitor",
    5.60      failure BIND_UMP_REPLY      "Failure sending bind_ump_reply to monitor",
    5.61 -    failure BIND_BMP_REPLY      "Failure sending bind_bmp_reply to monitor",
    5.62      failure NO_LMP_BIND_HANDLER "LMP connection handler not registered for this service",
    5.63      failure NO_UMP_BIND_HANDLER "UMP connection handler not registered for this service",
    5.64 -    failure NO_BMP_BIND_HANDLER "BMP connection handler not registered for this service",
    5.65      failure MONITOR_CAP_SEND    "Failed sending capability via monitor",
    5.66      failure MONITOR_RPC_BIND    "Error in monitor_rpc_init()",
    5.67  
    5.68 @@ -604,7 +587,6 @@
    5.69      failure COPY_PACN_CAP       "Failed to copy phys addr CNode cap to monitor",
    5.70      failure COPY_IRQ_CAP        "Failed to copy IRQ cap to monitor",
    5.71      failure COPY_IO_CAP         "Failed to copy IO cap to monitor",
    5.72 -    failure COPY_BMP_CAP        "Failed to copy BMP cap to monitor",
    5.73      failure COPY_UMP_CAP        "Failed to copy UMP cap to monitor",
    5.74      failure NO_MATCHING_RAM_CAP "No suitably-sized RAM cap found when initialising local memory allocator",
    5.75  };

     6.1 --- a/hake/Args.hs	Fri Jan 20 14:32:03 2012 -0800
     6.2 +++ b/hake/Args.hs	Mon Jan 23 11:04:15 2012 -0800
     6.3 @@ -68,12 +68,12 @@
     6.4        architectures = allArchitectures
     6.5  }
     6.6  
     6.7 -allArchitectures = [ "x86_64", "x86_32", "arm", "arm11mp", "beehive", "scc", "xscale" ]
     6.8 -allArchitectureFamilies = [ "x86_64", "x86_32", "arm", "beehive", "scc" ]
     6.9 +allArchitectures = [ "x86_64", "x86_32", "arm", "arm11mp", "scc", "xscale" ]
    6.10 +allArchitectureFamilies = [ "x86_64", "x86_32", "arm", "scc" ]
    6.11  
    6.12  -- all known flounder backends that we might want to generate defs for
    6.13  allFlounderBackends
    6.14 -    = [ "lmp", "ump", "ump_ipi", "bmp", "loopback", "rpcclient", "msgbuf", "multihop", "ahci" ]
    6.15 +    = [ "lmp", "ump", "ump_ipi", "loopback", "rpcclient", "msgbuf", "multihop", "ahci" ]
    6.16  
    6.17  defaultBuildFn :: [String] -> String -> Args -> HRule
    6.18  defaultBuildFn _ f _ = 

     7.1 --- a/hake/Beehive.hs	Fri Jan 20 14:32:03 2012 -0800
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,179 +0,0 @@
     7.4 ---------------------------------------------------------------------------
     7.5 --- Copyright (c) 2009, 2010, ETH Zurich.
     7.6 --- All rights reserved.
     7.7 ---
     7.8 --- This file is distributed under the terms in the attached LICENSE file.
     7.9 --- If you do not find this file, copies can be found by writing to:
    7.10 --- ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
    7.11 ---
    7.12 --- Architectural definitions for Barrelfish on Beehive.
    7.13 --- 
    7.14 ---------------------------------------------------------------------------
    7.15 -
    7.16 -module Beehive where
    7.17 -
    7.18 -import List
    7.19 -import HakeTypes
    7.20 -import Path
    7.21 -import qualified Config
    7.22 -import qualified ArchDefaults
    7.23 -
    7.24 --------------------------------------------------------------------------
    7.25 ---
    7.26 --- Architecture specific definitions for Beehive
    7.27 ---
    7.28 --------------------------------------------------------------------------
    7.29 -
    7.30 -arch = "beehive"
    7.31 -archFamily = "beehive"
    7.32 -
    7.33 -cpp      = "cpp"
    7.34 -compiler = "Bcc"
    7.35 -cxxcompiler = "Bcc"
    7.36 -objcopy  = "Beehive-is-not-a-gnu-bfd-target"
    7.37 -objdump  = "Beehive-is-not-a-gnu-bfd-target"
    7.38 -ar       = "Bar"
    7.39 -ranlib   = "Branlib"
    7.40 -
    7.41 -
    7.42 -ourCommonFlags = [ Str "-fno-omit-frame-pointer" ]
    7.43 -ourExcludeFlags = [ Str "-Ulinux", Str "-U__linux__", Str "-g" ]
    7.44 -
    7.45 -
    7.46 -cFlags = [ f | f <- ( ArchDefaults.commonCFlags ++ 
    7.47 -                      ArchDefaults.commonFlags ++ 
    7.48 -                      ourCommonFlags ) \\ ourExcludeFlags ]
    7.49 -
    7.50 -cxxFlags = [ f | f <- ( ArchDefaults.commonCxxFlags ++ 
    7.51 -                        ArchDefaults.commonFlags ++ 
    7.52 -                        ourCommonFlags ) \\ ourExcludeFlags ]
    7.53 -
    7.54 -cDefines = ArchDefaults.cDefines options
    7.55 -cStdIncs = ArchDefaults.cStdIncs arch archFamily
    7.56 -
    7.57 -ldFlags = [ Str $ unwords $ (words Config.cOptFlags) \\ ["-g"],
    7.58 -            Str "-Wl,-N",
    7.59 -            Str "-Wl,-codebase=0", Str "-Wl,-datafloat",
    7.60 -            In InstallTree arch "/lib/crt0.o",
    7.61 -            In InstallTree arch "/lib/crtbegin.o", 
    7.62 -            Str "-fno-builtin" ]
    7.63 -
    7.64 -ldCxxFlags = ldFlags
    7.65 -
    7.66 -stdLibs = ArchDefaults.stdLibs arch 
    7.67 -          ++ [ Str "-lgcc" ]
    7.68 -
    7.69 -options = (ArchDefaults.options arch archFamily) { 
    7.70 -            optFlags = cFlags,
    7.71 -            optCxxFlags = cxxFlags,
    7.72 -            optDefines = cDefines,
    7.73 -            optLdFlags = ldFlags,
    7.74 -            optLdCxxFlags = ldCxxFlags,
    7.75 -            optLibs = stdLibs,
    7.76 -            optInterconnectDrivers = ["lmp", "bmp"],
    7.77 -            optFlounderBackends = ["lmp", "bmp"]
    7.78 -          }
    7.79 -
    7.80 ---
    7.81 --- The kernel is "different"
    7.82 ---
    7.83 -
    7.84 -kernelCFlags = [ Str s | s <- [ "-fno-builtin",
    7.85 -                                "-fno-omit-frame-pointer",
    7.86 -                                "-nostdinc",
    7.87 -                                "-std=c99",
    7.88 -                                "-Wall",
    7.89 -                                "-Wshadow",
    7.90 -                                "-Wstrict-prototypes",
    7.91 -                                "-Wold-style-definition",
    7.92 -                                "-Wmissing-prototypes",
    7.93 -                                "-Wmissing-declarations",
    7.94 -                                "-Wmissing-field-initializers",
    7.95 -                                "-Wredundant-decls",
    7.96 -                                "-Werror",
    7.97 -                                "-imacros deputy/nodeputy.h" ]]
    7.98 -                                -- "-Wmissing-noreturn" ]]
    7.99 -
   7.100 -kernelLdFlags = [ Str "-Wl,-N",
   7.101 -                  Str "-Wl,-codebase=2000", Str "-Wl,-datafloat",
   7.102 -                  NStr "-Wl,-map,", Out arch "kernel.map",
   7.103 -                  Str "-fno-builtin"
   7.104 -                ]
   7.105 -
   7.106 -
   7.107 -------------------------------------------------------------------------
   7.108 ---
   7.109 --- Now, commands to actually do something
   7.110 ---
   7.111 -------------------------------------------------------------------------
   7.112 -
   7.113 ---
   7.114 --- Compilers
   7.115 ---
   7.116 -cCompiler = ArchDefaults.cCompiler arch compiler
   7.117 -cPreprocessor = ArchDefaults.cPreprocessor arch compiler
   7.118 -cxxCompiler = ArchDefaults.cxxCompiler arch cxxcompiler
   7.119 -cToAssembler = ArchDefaults.cToAssembler arch compiler
   7.120 -assembler = ArchDefaults.assembler arch compiler
   7.121 -linker = ArchDefaults.linker arch compiler
   7.122 -cxxlinker = ArchDefaults.cxxlinker arch cxxcompiler
   7.123 -
   7.124 ---
   7.125 --- Create a library from a set of object files
   7.126 ---
   7.127 -
   7.128 ---
   7.129 --- Create a library from a set of object files
   7.130 ---
   7.131 -archive :: Options -> [String] -> String -> [ RuleToken ]
   7.132 -archive opts objs libname =
   7.133 -    [ Str "rm -f ", Out arch libname ]
   7.134 -    ++ 
   7.135 -    [ NL, Str (ar ++ " cr "), Out arch libname ] 
   7.136 -    ++ 
   7.137 -    [ In BuildTree arch o | o <- objs ]
   7.138 -    ++ 
   7.139 -    [ NL, Str ranlib, Out arch libname ]
   7.140 -
   7.141 ---
   7.142 --- Create C file dependencies
   7.143 ---
   7.144 -makeDepend opts phase src obj depfile =
   7.145 -    let incls = (optIncludes opts) ++ (extraIncludes opts)
   7.146 -        flags = (optFlags opts) 
   7.147 -                ++ (optDefines opts)
   7.148 -                ++ [ Str f | f <- extraFlags opts ]
   7.149 -                ++ [ Str f | f <- extraDefines opts ]
   7.150 -        cpp_undef = "-undef -U__unix -U__unix__ -Uunix -U__CYGWIN__ -U__CYGWIN32__"
   7.151 -    in
   7.152 -      [ Str ('@':cpp), Str cpp_undef,
   7.153 -        Str "-imacros", NoDep SrcTree "src" "/hake/beehive-dM-noSTDC.txt" ]
   7.154 -      ++ filter (\f -> not (isPrefixOf "-Wmissing-field-initializers" (formatToken f))) flags
   7.155 -      ++ [ Str "-nostdinc -std=c99 -imacros" ] 
   7.156 -      ++ [ NoDep SrcTree "src" "/include/deputy/nodeputy.h" ]
   7.157 -      ++ concat [ [ NStr "-I", i ] | i <- incls ] 
   7.158 -      ++ (optDependencies opts) ++ (extraDependencies opts)
   7.159 -      ++ [ Str "-M -MF", 
   7.160 -           Out arch depfile,
   7.161 -           Str "-MQ", NoDep BuildTree arch obj, 
   7.162 -           Str "-MQ", NoDep BuildTree arch depfile,
   7.163 -           In (if phase == "src" then SrcTree else BuildTree) phase src
   7.164 -         ] 
   7.165 -
   7.166 -makeCxxDepend = makeDepend
   7.167 -
   7.168 ---
   7.169 --- Link the kernel (CPU Driver)
   7.170 --- 
   7.171 -
   7.172 -linkKernel :: Options -> [String] -> [String] -> String -> HRule
   7.173 -linkKernel opts objs libs kbin = 
   7.174 -    Rules [ Rule (
   7.175 -           [ Str compiler ]
   7.176 -           ++ (optLdFlags opts)
   7.177 -           ++ (extraLdFlags opts)
   7.178 -           ++ [ Str "-o", Out arch kbin ]
   7.179 -           ++ [ In BuildTree arch o | o <- objs ]
   7.180 -           ++ [ In BuildTree arch l | l <- libs ]
   7.181 -           ++ [ Str "-lgcc" ]
   7.182 -    ) ]

     8.1 --- a/hake/RuleDefs.hs	Fri Jan 20 14:32:03 2012 -0800
     8.2 +++ b/hake/RuleDefs.hs	Mon Jan 23 11:04:15 2012 -0800
     8.3 @@ -19,7 +19,6 @@
     8.4  import qualified SCC
     8.5  import qualified ARM
     8.6  import qualified ARM11MP
     8.7 -import qualified Beehive
     8.8  import qualified XScale
     8.9  import HakeTypes
    8.10  import qualified Args
    8.11 @@ -81,7 +80,6 @@
    8.12  options "scc" = SCC.options
    8.13  options "arm" = ARM.options
    8.14  options "arm11mp" = ARM11MP.options
    8.15 -options "beehive" = Beehive.options
    8.16  options "xscale" = XScale.options
    8.17  
    8.18  kernelCFlags "x86_64" = X86_64.kernelCFlags
    8.19 @@ -89,7 +87,6 @@
    8.20  kernelCFlags "scc" = SCC.kernelCFlags
    8.21  kernelCFlags "arm" = ARM.kernelCFlags
    8.22  kernelCFlags "arm11mp" = ARM11MP.kernelCFlags
    8.23 -kernelCFlags "beehive" = Beehive.kernelCFlags
    8.24  kernelCFlags "xscale" = XScale.kernelCFlags
    8.25  
    8.26  kernelLdFlags "x86_64" = X86_64.kernelLdFlags
    8.27 @@ -97,7 +94,6 @@
    8.28  kernelLdFlags "scc" = SCC.kernelLdFlags
    8.29  kernelLdFlags "arm" = ARM.kernelLdFlags
    8.30  kernelLdFlags "arm11mp" = ARM11MP.kernelLdFlags
    8.31 -kernelLdFlags "beehive" = Beehive.kernelLdFlags
    8.32  kernelLdFlags "xscale" = XScale.kernelLdFlags
    8.33  
    8.34  archFamily :: String -> String
    8.35 @@ -168,13 +164,11 @@
    8.36      | optArch opts == "scc"     = SCC.cCompiler opts phase src obj
    8.37      | optArch opts == "arm"     = ARM.cCompiler opts phase src obj
    8.38      | optArch opts == "arm11mp" = ARM11MP.cCompiler opts phase src obj
    8.39 -    | optArch opts == "beehive" = Beehive.cCompiler opts phase src obj
    8.40      | optArch opts == "xscale" = XScale.cCompiler opts phase src obj
    8.41      | otherwise = [ ErrorMsg ("no C compiler for " ++ (optArch opts)) ]
    8.42  
    8.43  cPreprocessor :: Options -> String -> String -> String -> [ RuleToken ]
    8.44  cPreprocessor opts phase src obj
    8.45 -    | optArch opts == "beehive" = Beehive.cPreprocessor opts phase src obj
    8.46      | otherwise = [ ErrorMsg ("no C preprocessor for " ++ (optArch opts)) ]
    8.47  
    8.48  --
    8.49 @@ -183,7 +177,6 @@
    8.50  cxxCompiler :: Options -> String -> String -> String -> [ RuleToken ]
    8.51  cxxCompiler opts phase src obj
    8.52      | optArch opts == "x86_64"  = X86_64.cxxCompiler opts phase src obj
    8.53 -    | optArch opts == "beehive" = Beehive.cxxCompiler opts phase src obj
    8.54      | otherwise = [ ErrorMsg ("no C++ compiler for " ++ (optArch opts)) ]
    8.55  
    8.56  
    8.57 @@ -202,8 +195,6 @@
    8.58          ARM.makeDepend opts phase src obj depfile
    8.59      | optArch opts == "arm11mp" = 
    8.60          ARM11MP.makeDepend opts phase src obj depfile
    8.61 -    | optArch opts == "beehive" = 
    8.62 -        Beehive.makeDepend opts phase src obj depfile
    8.63      | optArch opts == "xscale" = 
    8.64          XScale.makeDepend opts phase src obj depfile
    8.65      | otherwise = [ ErrorMsg ("no dependency generator for " ++ (optArch opts)) ]
    8.66 @@ -212,8 +203,6 @@
    8.67  makeCxxDepend opts phase src obj depfile
    8.68      | optArch opts == "x86_64" = 
    8.69          X86_64.makeCxxDepend opts phase src obj depfile
    8.70 -    | optArch opts == "beehive" = 
    8.71 -        Beehive.makeCxxDepend opts phase src obj depfile
    8.72      | otherwise = [ ErrorMsg ("no C++ dependency generator for " ++ (optArch opts)) ]
    8.73  
    8.74  cToAssembler :: Options -> String -> String -> String -> String -> [ RuleToken ]
    8.75 @@ -223,7 +212,6 @@
    8.76      | optArch opts == "scc"     = SCC.cToAssembler opts phase src afile objdepfile
    8.77      | optArch opts == "arm"     = ARM.cToAssembler opts phase src afile objdepfile
    8.78      | optArch opts == "arm11mp" = ARM11MP.cToAssembler opts phase src afile objdepfile
    8.79 -    | optArch opts == "beehive" = Beehive.cToAssembler opts phase src afile objdepfile
    8.80      | optArch opts == "xscale" = XScale.cToAssembler opts phase src afile objdepfile
    8.81      | otherwise = [ ErrorMsg ("no C compiler for " ++ (optArch opts)) ]
    8.82  
    8.83 @@ -237,7 +225,6 @@
    8.84      | optArch opts == "scc"     = SCC.assembler opts src obj
    8.85      | optArch opts == "arm"     = ARM.assembler opts src obj
    8.86      | optArch opts == "arm11mp" = ARM11MP.assembler opts src obj
    8.87 -    | optArch opts == "beehive" = Beehive.assembler opts src obj
    8.88      | optArch opts == "xscale" = XScale.assembler opts src obj
    8.89      | otherwise = [ ErrorMsg ("no assembler for " ++ (optArch opts)) ]
    8.90  
    8.91 @@ -248,7 +235,6 @@
    8.92      | optArch opts == "scc"     = SCC.archive opts objs libname
    8.93      | optArch opts == "arm"     = ARM.archive opts objs libname
    8.94      | optArch opts == "arm11mp" = ARM11MP.archive opts objs libname
    8.95 -    | optArch opts == "beehive" = Beehive.archive opts objs libname
    8.96      | optArch opts == "xscale" = XScale.archive opts objs libname
    8.97      | otherwise = [ ErrorMsg ("Can't build a library for " ++ (optArch opts)) ]
    8.98  
    8.99 @@ -259,7 +245,6 @@
   8.100      | optArch opts == "scc"    = SCC.linker opts objs libs bin
   8.101      | optArch opts == "arm" = ARM.linker opts objs libs bin
   8.102      | optArch opts == "arm11mp" = ARM11MP.linker opts objs libs bin
   8.103 -    | optArch opts == "beehive" = Beehive.linker opts objs libs bin
   8.104      | optArch opts == "xscale" = XScale.linker opts objs libs bin
   8.105      | otherwise = [ ErrorMsg ("Can't link executables for " ++ (optArch opts)) ]
   8.106  
   8.107 @@ -720,7 +705,6 @@
   8.108      | optArch opts == "scc"    = SCC.linkKernel opts objs [libraryPath l | l <- libs ] kernelPath
   8.109      | optArch opts == "arm" = ARM.linkKernel opts objs [libraryPath l | l <- libs ] kernelPath
   8.110      | optArch opts == "arm11mp" = ARM11MP.linkKernel opts objs [libraryPath l | l <- libs ] kernelPath
   8.111 -    | optArch opts == "beehive" = Beehive.linkKernel opts objs [libraryPath l | l <- libs ] kernelPath
   8.112      | optArch opts == "xscale" = XScale.linkKernel opts objs [libraryPath l | l <- libs ] kernelPath
   8.113      | otherwise = 
   8.114          Rule [ Str ("Error: Can't link kernel for '" ++ (optArch opts) ++ "'") ]

     9.1 --- a/hake/beehive-dM-noSTDC.txt	Fri Jan 20 14:32:03 2012 -0800
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,104 +0,0 @@
     9.4 -#define __DBL_MIN_EXP__ (-1021)
     9.5 -#define __FLT_MIN__ 1.17549435e-38F
     9.6 -#define __DEC64_DEN__ 0.000000000000001E-383DD
     9.7 -#define __CHAR_BIT__ 8
     9.8 -#define __WCHAR_MAX__ 2147483647
     9.9 -#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
    9.10 -#define __FLT_EVAL_METHOD__ 0
    9.11 -#define __DBL_MIN_10_EXP__ (-307)
    9.12 -#define __FINITE_MATH_ONLY__ 0
    9.13 -#define __GNUC_PATCHLEVEL__ 3
    9.14 -#define __DEC64_MAX_EXP__ 384
    9.15 -#define __SHRT_MAX__ 32767
    9.16 -#define __LDBL_MAX__ 1.7976931348623157e+308L
    9.17 -#define __UINTMAX_TYPE__ long long unsigned int
    9.18 -#define __DEC32_EPSILON__ 1E-6DF
    9.19 -#define __CHAR_UNSIGNED__ 1
    9.20 -#define __LDBL_MAX_EXP__ 1024
    9.21 -#define __SCHAR_MAX__ 127
    9.22 -#define __DBL_DIG__ 15
    9.23 -#define __SIZEOF_INT__ 4
    9.24 -#define __SIZEOF_POINTER__ 4
    9.25 -#define __USER_LABEL_PREFIX__ _
    9.26 -#define __LDBL_HAS_INFINITY__ 1
    9.27 -#define __BEEHIVE__ 1
    9.28 -#define __FLT_EPSILON__ 1.19209290e-7F
    9.29 -#define __LDBL_MIN__ 2.2250738585072014e-308L
    9.30 -#define __DEC32_MAX__ 9.999999E96DF
    9.31 -#define __SIZEOF_LONG__ 4
    9.32 -#define __DECIMAL_DIG__ 17
    9.33 -#define __LDBL_HAS_QUIET_NAN__ 1
    9.34 -#define __GNUC__ 4
    9.35 -#define __FLT_HAS_DENORM__ 1
    9.36 -#define __SIZEOF_LONG_DOUBLE__ 8
    9.37 -#define __DBL_MAX__ 1.7976931348623157e+308
    9.38 -#define __DBL_HAS_INFINITY__ 1
    9.39 -#define __DEC32_MIN_EXP__ (-95)
    9.40 -#define __LDBL_HAS_DENORM__ 1
    9.41 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
    9.42 -#define __USING_SJLJ_EXCEPTIONS__ 1
    9.43 -#define __DEC32_MIN__ 1E-95DF
    9.44 -#define __DBL_MAX_EXP__ 1024
    9.45 -#define __DEC128_EPSILON__ 1E-33DL
    9.46 -#define __LONG_LONG_MAX__ 9223372036854775807LL
    9.47 -#define __SIZEOF_SIZE_T__ 4
    9.48 -#define __SIZEOF_WINT_T__ 4
    9.49 -#define __GXX_ABI_VERSION 1002
    9.50 -#define __FLT_MIN_EXP__ (-125)
    9.51 -#define __DBL_MIN__ 2.2250738585072014e-308
    9.52 -#define __DEC128_MIN__ 1E-6143DL
    9.53 -#define __REGISTER_PREFIX__ 
    9.54 -#define __DBL_HAS_DENORM__ 1
    9.55 -#define __NO_INLINE__ 1
    9.56 -#define __FLT_MANT_DIG__ 24
    9.57 -#define __VERSION__ "4.3.3"
    9.58 -#define __DEC64_EPSILON__ 1E-15DD
    9.59 -#define __DEC128_MIN_EXP__ (-6143)
    9.60 -#define __SIZE_TYPE__ unsigned int
    9.61 -#define __DEC32_DEN__ 0.000001E-95DF
    9.62 -#define __ELF__ 1
    9.63 -#define __FLT_RADIX__ 2
    9.64 -#define __LDBL_EPSILON__ 2.2204460492503131e-16L
    9.65 -#define __SIZEOF_PTRDIFF_T__ 4
    9.66 -#define __FLT_HAS_QUIET_NAN__ 1
    9.67 -#define __FLT_MAX_10_EXP__ 38
    9.68 -#define __LONG_MAX__ 2147483647L
    9.69 -#define __FLT_HAS_INFINITY__ 1
    9.70 -#define __DEC64_MAX__ 9.999999999999999E384DD
    9.71 -#define __DEC64_MANT_DIG__ 16
    9.72 -#define __DEC32_MAX_EXP__ 96
    9.73 -#define __DEC128_DEN__ 0.000000000000000000000000000000001E-6143DL
    9.74 -#define __LDBL_MANT_DIG__ 53
    9.75 -#define __DBL_HAS_QUIET_NAN__ 1
    9.76 -#define __WCHAR_TYPE__ int
    9.77 -#define __SIZEOF_FLOAT__ 4
    9.78 -#define __DEC64_MIN_EXP__ (-383)
    9.79 -#define __FLT_DIG__ 6
    9.80 -#define __INT_MAX__ 2147483647
    9.81 -#define __FLT_MAX_EXP__ 128
    9.82 -#define __DBL_MANT_DIG__ 53
    9.83 -#define __DEC64_MIN__ 1E-383DD
    9.84 -#define __WINT_TYPE__ unsigned int
    9.85 -#define __SIZEOF_SHORT__ 2
    9.86 -#define __LDBL_MIN_EXP__ (-1021)
    9.87 -#define __LDBL_MAX_10_EXP__ 308
    9.88 -#define __DBL_EPSILON__ 2.2204460492503131e-16
    9.89 -#define __SIZEOF_WCHAR_T__ 4
    9.90 -#define __DEC_EVAL_METHOD__ 2
    9.91 -#define __INTMAX_MAX__ 9223372036854775807LL
    9.92 -#define __FLT_DENORM_MIN__ 1.40129846e-45F
    9.93 -#define __FLT_MAX__ 3.40282347e+38F
    9.94 -#define __SIZEOF_DOUBLE__ 8
    9.95 -#define __FLT_MIN_10_EXP__ (-37)
    9.96 -#define __INTMAX_TYPE__ long long int
    9.97 -#define __DEC128_MAX_EXP__ 6144
    9.98 -#define __GNUC_MINOR__ 3
    9.99 -#define __DEC32_MANT_DIG__ 7
   9.100 -#define __DBL_MAX_10_EXP__ 308
   9.101 -#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
   9.102 -#define __PTRDIFF_TYPE__ int
   9.103 -#define __DEC128_MANT_DIG__ 34
   9.104 -#define __LDBL_MIN_10_EXP__ (-307)
   9.105 -#define __SIZEOF_LONG_LONG__ 8
   9.106 -#define __LDBL_DIG__ 15
   9.107 -#define __GNUC_GNU_INLINE__ 1

    10.1 --- a/hake/beehive-dM.txt	Fri Jan 20 14:32:03 2012 -0800
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,106 +0,0 @@
    10.4 -#define __DBL_MIN_EXP__ (-1021)
    10.5 -#define __FLT_MIN__ 1.17549435e-38F
    10.6 -#define __DEC64_DEN__ 0.000000000000001E-383DD
    10.7 -#define __CHAR_BIT__ 8
    10.8 -#define __WCHAR_MAX__ 2147483647
    10.9 -#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
   10.10 -#define __FLT_EVAL_METHOD__ 0
   10.11 -#define __DBL_MIN_10_EXP__ (-307)
   10.12 -#define __FINITE_MATH_ONLY__ 0
   10.13 -#define __GNUC_PATCHLEVEL__ 3
   10.14 -#define __DEC64_MAX_EXP__ 384
   10.15 -#define __SHRT_MAX__ 32767
   10.16 -#define __LDBL_MAX__ 1.7976931348623157e+308L
   10.17 -#define __UINTMAX_TYPE__ long long unsigned int
   10.18 -#define __DEC32_EPSILON__ 1E-6DF
   10.19 -#define __CHAR_UNSIGNED__ 1
   10.20 -#define __LDBL_MAX_EXP__ 1024
   10.21 -#define __SCHAR_MAX__ 127
   10.22 -#define __DBL_DIG__ 15
   10.23 -#define __SIZEOF_INT__ 4
   10.24 -#define __SIZEOF_POINTER__ 4
   10.25 -#define __USER_LABEL_PREFIX__ _
   10.26 -#define __STDC_HOSTED__ 1
   10.27 -#define __LDBL_HAS_INFINITY__ 1
   10.28 -#define __BEEHIVE__ 1
   10.29 -#define __FLT_EPSILON__ 1.19209290e-7F
   10.30 -#define __LDBL_MIN__ 2.2250738585072014e-308L
   10.31 -#define __DEC32_MAX__ 9.999999E96DF
   10.32 -#define __SIZEOF_LONG__ 4
   10.33 -#define __DECIMAL_DIG__ 17
   10.34 -#define __LDBL_HAS_QUIET_NAN__ 1
   10.35 -#define __GNUC__ 4
   10.36 -#define __FLT_HAS_DENORM__ 1
   10.37 -#define __SIZEOF_LONG_DOUBLE__ 8
   10.38 -#define __DBL_MAX__ 1.7976931348623157e+308
   10.39 -#define __DBL_HAS_INFINITY__ 1
   10.40 -#define __DEC32_MIN_EXP__ (-95)
   10.41 -#define __LDBL_HAS_DENORM__ 1
   10.42 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
   10.43 -#define __USING_SJLJ_EXCEPTIONS__ 1
   10.44 -#define __DEC32_MIN__ 1E-95DF
   10.45 -#define __DBL_MAX_EXP__ 1024
   10.46 -#define __DEC128_EPSILON__ 1E-33DL
   10.47 -#define __LONG_LONG_MAX__ 9223372036854775807LL
   10.48 -#define __SIZEOF_SIZE_T__ 4
   10.49 -#define __SIZEOF_WINT_T__ 4
   10.50 -#define __GXX_ABI_VERSION 1002
   10.51 -#define __FLT_MIN_EXP__ (-125)
   10.52 -#define __DBL_MIN__ 2.2250738585072014e-308
   10.53 -#define __DEC128_MIN__ 1E-6143DL
   10.54 -#define __REGISTER_PREFIX__ 
   10.55 -#define __DBL_HAS_DENORM__ 1
   10.56 -#define __NO_INLINE__ 1
   10.57 -#define __FLT_MANT_DIG__ 24
   10.58 -#define __VERSION__ "4.3.3"
   10.59 -#define __DEC64_EPSILON__ 1E-15DD
   10.60 -#define __DEC128_MIN_EXP__ (-6143)
   10.61 -#define __SIZE_TYPE__ unsigned int
   10.62 -#define __DEC32_DEN__ 0.000001E-95DF
   10.63 -#define __ELF__ 1
   10.64 -#define __FLT_RADIX__ 2
   10.65 -#define __LDBL_EPSILON__ 2.2204460492503131e-16L
   10.66 -#define __SIZEOF_PTRDIFF_T__ 4
   10.67 -#define __FLT_HAS_QUIET_NAN__ 1
   10.68 -#define __FLT_MAX_10_EXP__ 38
   10.69 -#define __LONG_MAX__ 2147483647L
   10.70 -#define __FLT_HAS_INFINITY__ 1
   10.71 -#define __DEC64_MAX__ 9.999999999999999E384DD
   10.72 -#define __DEC64_MANT_DIG__ 16
   10.73 -#define __DEC32_MAX_EXP__ 96
   10.74 -#define __DEC128_DEN__ 0.000000000000000000000000000000001E-6143DL
   10.75 -#define __LDBL_MANT_DIG__ 53
   10.76 -#define __DBL_HAS_QUIET_NAN__ 1
   10.77 -#define __WCHAR_TYPE__ int
   10.78 -#define __SIZEOF_FLOAT__ 4
   10.79 -#define __DEC64_MIN_EXP__ (-383)
   10.80 -#define __FLT_DIG__ 6
   10.81 -#define __INT_MAX__ 2147483647
   10.82 -#define __FLT_MAX_EXP__ 128
   10.83 -#define __DBL_MANT_DIG__ 53
   10.84 -#define __DEC64_MIN__ 1E-383DD
   10.85 -#define __WINT_TYPE__ unsigned int
   10.86 -#define __SIZEOF_SHORT__ 2
   10.87 -#define __LDBL_MIN_EXP__ (-1021)
   10.88 -#define __LDBL_MAX_10_EXP__ 308
   10.89 -#define __DBL_EPSILON__ 2.2204460492503131e-16
   10.90 -#define __SIZEOF_WCHAR_T__ 4
   10.91 -#define __DEC_EVAL_METHOD__ 2
   10.92 -#define __INTMAX_MAX__ 9223372036854775807LL
   10.93 -#define __FLT_DENORM_MIN__ 1.40129846e-45F
   10.94 -#define __FLT_MAX__ 3.40282347e+38F
   10.95 -#define __SIZEOF_DOUBLE__ 8
   10.96 -#define __FLT_MIN_10_EXP__ (-37)
   10.97 -#define __INTMAX_TYPE__ long long int
   10.98 -#define __DEC128_MAX_EXP__ 6144
   10.99 -#define __GNUC_MINOR__ 3
  10.100 -#define __DEC32_MANT_DIG__ 7
  10.101 -#define __DBL_MAX_10_EXP__ 308
  10.102 -#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
  10.103 -#define __STDC__ 1
  10.104 -#define __PTRDIFF_TYPE__ int
  10.105 -#define __DEC128_MANT_DIG__ 34
  10.106 -#define __LDBL_MIN_10_EXP__ (-307)
  10.107 -#define __SIZEOF_LONG_LONG__ 8
  10.108 -#define __LDBL_DIG__ 15
  10.109 -#define __GNUC_GNU_INLINE__ 1

    11.1 --- a/hake/menu.lst.beehive	Fri Jan 20 14:32:03 2012 -0800
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,42 +0,0 @@
    11.4 -# spawnd is used to control which cpus are booted
    11.5 -#
    11.6 -# "spawnd boot" will use the skb and pci to figure out and
    11.7 -#  boot all cores in the machine
    11.8 -#
    11.9 -# "spawnd boot bootbees=3-5" will not use the skb and
   11.10 -# boot the list of cores passed as argument.
   11.11 -# The hardware id of the cores to boot should be specified.
   11.12 -# This list may not include the bsp core id.
   11.13 -
   11.14 -# NB: Beehive currently executes programs in-place without
   11.15 -# relocation, requiring a separate copy of each binary for
   11.16 -# each core on which it will run. This is achieved by the
   11.17 -# |2 |3 etc. annotations on the module name, which are
   11.18 -# ignored by Bsplice when deciding which file to open.
   11.19 -
   11.20 -timeout 0
   11.21 -
   11.22 -title	Barrelfish
   11.23 -root	(nd)
   11.24 -hypervisor	/beehive/sbin/hyper
   11.25 -kernel	/beehive/sbin/cpu loglevel=3
   11.26 -module  /beehive/sbin/cpu|3
   11.27 -module	/beehive/sbin/init
   11.28 -
   11.29 -# Domains spawned by init
   11.30 -module	/beehive/sbin/mem_serv
   11.31 -module	/beehive/sbin/monitor
   11.32 -module	/beehive/sbin/monitor|3
   11.33 -
   11.34 -# Special boot time domains spawned by monitor
   11.35 -module	/beehive/sbin/chips boot
   11.36 -module	/beehive/sbin/ramfsd boot
   11.37 -#module  /beehive/sbin/skb boot
   11.38 -#module  /beehive/sbin/pci boot
   11.39 -module  /beehive/sbin/spawnd boot bootbees=3
   11.40 -module  /beehive/sbin/spawnd|3 nospawn
   11.41 -module  /beehive/sbin/startd boot
   11.42 -
   11.43 -# General user domains
   11.44 -#module	/beehive/sbin/serial
   11.45 -#module	/beehive/sbin/fish

    12.1 --- a/hake/symbolic_targets.mk	Fri Jan 20 14:32:03 2012 -0800
    12.2 +++ b/hake/symbolic_targets.mk	Mon Jan 23 11:04:15 2012 -0800
    12.3 @@ -211,16 +211,6 @@
    12.4  MODULES_arm11mp=\
    12.5  	sbin/cpu.bin
    12.6  
    12.7 -# Beehive-specific modules to build by default
    12.8 -MODULES_beehive=\
    12.9 -	sbin/hyper \
   12.10 -	sbin/bmp_bench \
   12.11 -	sbin/bulkbench \
   12.12 -	sbin/thc_v_flounder_empty \
   12.13 -	sbin/thcidctest \
   12.14 -	sbin/thcminitest \
   12.15 -	sbin/thctest \
   12.16 -
   12.17  # construct list of all modules to be built (arch-specific and common for each arch)
   12.18  MODULES=$(foreach a,$(HAKE_ARCHS),$(foreach m,$(MODULES_$(a)),$(a)/$(m)) \
   12.19                                    $(foreach m,$(MODULES_COMMON),$(a)/$(m))) \
   12.20 @@ -285,20 +275,6 @@
   12.21  else ifeq ($(ARCH),arm11mp)
   12.22  	QEMU_CMD=qemu-system-arm -cpu mpcore -M realview -kernel arm11mp/sbin/cpu.bin
   12.23  	GDB=arm-none-linux-gnueabi-gdb
   12.24 -else ifeq ($(ARCH),beehive)
   12.25 -
   12.26 -simulate: ./beehive/sbin/spliced.img
   12.27 -	Bsimimg -slave=$(SRCDIR)/kernel/arch/beehive/slavecode.mem -noaddrcheck -ncores=3 -ibase=1000 -datarota=2 ./beehive/sbin/spliced.img
   12.28 -.PHONY : simulate
   12.29 -
   12.30 -trace: ./beehive/sbin/spliced.img
   12.31 -	Bsimimg -slave=$(SRCDIR)/kernel/arch/beehive/slavecode.mem -noaddrcheck -ncores=3 -ibase=1000 -datarota=2 -instructions=instructions.txt -events=events.txt -cache=cache.txt ./beehive/sbin/spliced.img | tee sim.out
   12.32 -
   12.33 -.PHONY : trace
   12.34 -
   12.35 -./beehive/sbin/spliced.img: ./menu.lst $(MODULES)
   12.36 -	Bsplice -o ./beehive/sbin/spliced.img -s ./beehive/sbin/beehive.splice -i menu.lst
   12.37 -
   12.38  endif
   12.39  
   12.40  
   12.41 @@ -424,7 +400,6 @@
   12.42  	./docs/TN-004-VirtualMemory.pdf \
   12.43  	./docs/TN-005-SCC.pdf \
   12.44  	./docs/TN-006-Routing.pdf \
   12.45 -	./docs/TN-007-Beehive.pdf \
   12.46  	./docs/TN-008-Tracing.pdf \
   12.47  	./docs/TN-009-Notifications.pdf \
   12.48  	./docs/TN-010-Spec.pdf \

    13.1 --- a/if/arch/beehive.if	Fri Jan 20 14:32:03 2012 -0800
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,11 +0,0 @@
    13.4 -/*
    13.5 - * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
    13.6 - * All rights reserved.
    13.7 - *
    13.8 - * This file is distributed under the terms in the attached LICENSE file.
    13.9 - * If you do not find this file, copies can be found by writing to:
   13.10 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   13.11 - */
   13.12 -
   13.13 -alias errval uint32;
   13.14 -alias cycles uint32;

    14.1 --- a/if/intermon.if	Fri Jan 20 14:32:03 2012 -0800
    14.2 +++ b/if/intermon.if	Mon Jan 23 11:04:15 2012 -0800
    14.3 @@ -90,16 +90,6 @@
    14.4                                 errval err,
    14.5                                 caprep notify);
    14.6  
    14.7 -        message bind_bmp_request(iref iref,
    14.8 -                                 mon_id_t mon_id,
    14.9 -                                 uint32 chanid,
   14.10 -                                 uint32 ep_len);
   14.11 -        message bind_bmp_reply(con_id_t con_id,
   14.12 -                               mon_id_t mon_id,
   14.13 -                               errval err,
   14.14 -                               uint32 chanid,
   14.15 -                               uint32 ep_len);
   14.16 -
   14.17          message cap_send_request(con_id_t con_id,
   14.18                                   capid_t capid,
   14.19                                   caprep cap,

    15.1 --- a/if/monitor.if	Fri Jan 20 14:32:03 2012 -0800
    15.2 +++ b/if/monitor.if	Mon Jan 23 11:04:15 2012 -0800
    15.3 @@ -98,30 +98,6 @@
    15.4                          errval err,
    15.5  			cap notify);
    15.6  
    15.7 -          message bind_bmp_client_request(
    15.8 -                        iref iref,
    15.9 -                        uintptr conn_id,
   15.10 -                        cap lmp_ep);
   15.11 -
   15.12 -          message bind_bmp_service_request(
   15.13 -                        uintptr service_id,
   15.14 -                        uintptr mon_id,
   15.15 -                        cap bee_ep,
   15.16 -                        size remote_ep_len);
   15.17 -
   15.18 -          call bind_bmp_reply_monitor(
   15.19 -                        uintptr mon_id,
   15.20 -                        uintptr conn_id,
   15.21 -                        cap lmp_ep,
   15.22 -                        errval err);
   15.23 -
   15.24 -          response bind_bmp_reply_client(
   15.25 -                        uintptr mon_id,
   15.26 -                        uintptr conn_id,
   15.27 -                        cap bee_ep,
   15.28 -                        size remote_ep_len,
   15.29 -                        errval err);
   15.30 -
   15.31            call ipi_alloc_notify_request(cap ep, uintptr state);
   15.32  	  response ipi_alloc_notify_reply(uintptr state, cap notify, errval err);
   15.33  

    16.1 --- a/if/platform/beehive.if	Fri Jan 20 14:32:03 2012 -0800
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,12 +0,0 @@
    16.4 -/*
    16.5 - * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
    16.6 - * All rights reserved.
    16.7 - *
    16.8 - * This file is distributed under the terms in the attached LICENSE file.
    16.9 - * If you do not find this file, copies can be found by writing to:
   16.10 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   16.11 - */
   16.12 -
   16.13 -alias genpaddr uint64;
   16.14 -alias genvaddr uint64;
   16.15 -alias rsrcid   uint32;

    17.1 --- a/include/Hakefile	Fri Jan 20 14:32:03 2012 -0800
    17.2 +++ b/include/Hakefile	Mon Jan 23 11:04:15 2012 -0800
    17.3 @@ -13,7 +13,6 @@
    17.4  [ includeFile (options arch) f
    17.5        | f <- [ 
    17.6     "assert.h",
    17.7 -   "bexec.h",
    17.8     "complex.h",
    17.9     "cpiobin.h",
   17.10     "ctype.h",

    18.1 --- a/include/arch/beehive/_fpmath.h	Fri Jan 20 14:32:03 2012 -0800
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,49 +0,0 @@
    18.4 -/*-
    18.5 - * Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
    18.6 - * All rights reserved.
    18.7 - *
    18.8 - * Redistribution and use in source and binary forms, with or without
    18.9 - * modification, are permitted provided that the following conditions
   18.10 - * are met:
   18.11 - * 1. Redistributions of source code must retain the above copyright
   18.12 - *    notice, this list of conditions and the following disclaimer.
   18.13 - * 2. Redistributions in binary form must reproduce the above copyright
   18.14 - *    notice, this list of conditions and the following disclaimer in the
   18.15 - *    documentation and/or other materials provided with the distribution.
   18.16 - *
   18.17 - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
   18.18 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   18.19 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   18.20 - * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
   18.21 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   18.22 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   18.23 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   18.24 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   18.25 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   18.26 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   18.27 - * SUCH DAMAGE.
   18.28 - *
   18.29 - * $FreeBSD$
   18.30 - */
   18.31 -
   18.32 -union IEEEl2bits {
   18.33 -	long double	e;
   18.34 -	struct {
   18.35 -		unsigned int	manl	:32;
   18.36 -		unsigned int	manh	:20;
   18.37 -		unsigned int	exp	:11;
   18.38 -		unsigned int	sign	:1;
   18.39 -	} bits;
   18.40 -};
   18.41 -
   18.42 -#define	LDBL_NBIT	0
   18.43 -#define	mask_nbit_l(u)	((void)0)
   18.44 -
   18.45 -#define	LDBL_MANH_SIZE	32
   18.46 -#define	LDBL_MANL_SIZE	32
   18.47 -
   18.48 -#define	LDBL_TO_ARRAY32(u, a) do {			\
   18.49 -	(a)[0] = (uint32_t)(u).bits.manl;		\
   18.50 -	(a)[1] = (uint32_t)(u).bits.manh;		\
   18.51 -} while(0)
   18.52 -

    19.1 --- a/include/arch/beehive/arch/inttypes.h	Fri Jan 20 14:32:03 2012 -0800
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,87 +0,0 @@
    19.4 -/*
    19.5 - * Australian Public Licence B (OZPLB)
    19.6 - * 
    19.7 - * Version 1-0
    19.8 - * 
    19.9 - * Copyright (c) 2004 National ICT Australia
   19.10 - * 
   19.11 - * All rights reserved. 
   19.12 - * 
   19.13 - * Developed by: Embedded, Real-time and Operating Systems Program (ERTOS)
   19.14 - *               National ICT Australia
   19.15 - *               http://www.ertos.nicta.com.au
   19.16 - * 
   19.17 - * Permission is granted by National ICT Australia, free of charge, to
   19.18 - * any person obtaining a copy of this software and any associated
   19.19 - * documentation files (the "Software") to deal with the Software without
   19.20 - * restriction, including (without limitation) the rights to use, copy,
   19.21 - * modify, adapt, merge, publish, distribute, communicate to the public,
   19.22 - * sublicense, and/or sell, lend or rent out copies of the Software, and
   19.23 - * to permit persons to whom the Software is furnished to do so, subject
   19.24 - * to the following conditions:
   19.25 - * 
   19.26 - *     * Redistributions of source code must retain the above copyright
   19.27 - *       notice, this list of conditions and the following disclaimers.
   19.28 - * 
   19.29 - *     * Redistributions in binary form must reproduce the above
   19.30 - *       copyright notice, this list of conditions and the following
   19.31 - *       disclaimers in the documentation and/or other materials provided
   19.32 - *       with the distribution.
   19.33 - * 
   19.34 - *     * Neither the name of National ICT Australia, nor the names of its
   19.35 - *       contributors, may be used to endorse or promote products derived
   19.36 - *       from this Software without specific prior written permission.
   19.37 - * 
   19.38 - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
   19.39 - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND
   19.40 - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS,
   19.41 - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
   19.42 - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS
   19.43 - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE,
   19.44 - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT,
   19.45 - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF
   19.46 - * ERRORS, WHETHER OR NOT DISCOVERABLE.
   19.47 - * 
   19.48 - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL
   19.49 - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL
   19.50 - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT,
   19.51 - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER
   19.52 - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR
   19.53 - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS
   19.54 - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR
   19.55 - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT,
   19.56 - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN
   19.57 - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER
   19.58 - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS
   19.59 - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS,
   19.60 - * DAMAGES OR OTHER LIABILITY.
   19.61 - * 
   19.62 - * If applicable legislation implies representations, warranties, or
   19.63 - * conditions, or imposes obligations or liability on National ICT
   19.64 - * Australia or one of its contributors in respect of the Software that
   19.65 - * cannot be wholly or partly excluded, restricted or modified, the
   19.66 - * liability of National ICT Australia or the contributor is limited, to
   19.67 - * the full extent permitted by the applicable legislation, at its
   19.68 - * option, to:
   19.69 - * a.  in the case of goods, any one or more of the following:
   19.70 - * i.  the replacement of the goods or the supply of equivalent goods;
   19.71 - * ii.  the repair of the goods;
   19.72 - * iii. the payment of the cost of replacing the goods or of acquiring
   19.73 - *  equivalent goods;
   19.74 - * iv.  the payment of the cost of having the goods repaired; or
   19.75 - * b.  in the case of services:
   19.76 - * i.  the supplying of the services again; or
   19.77 - * ii.  the payment of the cost of having the services supplied again.
   19.78 - * 
   19.79 - * The construction, validity and performance of this licence is governed
   19.80 - * by the laws in force in New South Wales, Australia.
   19.81 - */
   19.82 -/*
   19.83 -  Author: Ben Leslie
   19.84 -*/
   19.85 -#define __LENGTH_8_MOD "hh"
   19.86 -#define __LENGTH_16_MOD "h"
   19.87 -#define __LENGTH_32_MOD
   19.88 -#define __LENGTH_64_MOD "ll"
   19.89 -#define __LENGTH_MAX_MOD "ll"
   19.90 -#define __LENGTH_PTR_MOD

    20.1 --- a/include/arch/beehive/arch/setjmp.h	Fri Jan 20 14:32:03 2012 -0800
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,14 +0,0 @@
    20.4 -/*
    20.5 - * Copyright (c) 2009, ETH Zurich.
    20.6 - * All rights reserved.
    20.7 - *
    20.8 - * This file is distributed under the terms in the attached LICENSE file.
    20.9 - * If you do not find this file, copies can be found by writing to:
   20.10 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   20.11 - */
   20.12 -
   20.13 -/* ISO/IEC 9899:1990 Sec 7.6 "jmp_buf is an array type" */
   20.14 -typedef uintptr_t jmp_buf[32];
   20.15 -
   20.16 -
   20.17 -    

    21.1 --- a/include/arch/beehive/arch/stdint.h	Fri Jan 20 14:32:03 2012 -0800
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,93 +0,0 @@
    21.4 -/*
    21.5 - * Australian Public Licence B (OZPLB)
    21.6 - * 
    21.7 - * Version 1-0
    21.8 - * 
    21.9 - * Copyright (c) 2004 National ICT Australia
   21.10 - * 
   21.11 - * All rights reserved. 
   21.12 - * 
   21.13 - * Developed by: Embedded, Real-time and Operating Systems Program (ERTOS)
   21.14 - *               National ICT Australia
   21.15 - *               http://www.ertos.nicta.com.au
   21.16 - * 
   21.17 - * Permission is granted by National ICT Australia, free of charge, to
   21.18 - * any person obtaining a copy of this software and any associated
   21.19 - * documentation files (the "Software") to deal with the Software without
   21.20 - * restriction, including (without limitation) the rights to use, copy,
   21.21 - * modify, adapt, merge, publish, distribute, communicate to the public,
   21.22 - * sublicense, and/or sell, lend or rent out copies of the Software, and
   21.23 - * to permit persons to whom the Software is furnished to do so, subject
   21.24 - * to the following conditions:
   21.25 - * 
   21.26 - *     * Redistributions of source code must retain the above copyright
   21.27 - *       notice, this list of conditions and the following disclaimers.
   21.28 - * 
   21.29 - *     * Redistributions in binary form must reproduce the above
   21.30 - *       copyright notice, this list of conditions and the following
   21.31 - *       disclaimers in the documentation and/or other materials provided
   21.32 - *       with the distribution.
   21.33 - * 
   21.34 - *     * Neither the name of National ICT Australia, nor the names of its
   21.35 - *       contributors, may be used to endorse or promote products derived
   21.36 - *       from this Software without specific prior written permission.
   21.37 - * 
   21.38 - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
   21.39 - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND
   21.40 - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS,
   21.41 - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
   21.42 - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS
   21.43 - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE,
   21.44 - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT,
   21.45 - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF
   21.46 - * ERRORS, WHETHER OR NOT DISCOVERABLE.
   21.47 - * 
   21.48 - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL
   21.49 - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL
   21.50 - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT,
   21.51 - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER
   21.52 - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR
   21.53 - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS
   21.54 - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR
   21.55 - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT,
   21.56 - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN
   21.57 - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER
   21.58 - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS
   21.59 - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS,
   21.60 - * DAMAGES OR OTHER LIABILITY.
   21.61 - * 
   21.62 - * If applicable legislation implies representations, warranties, or
   21.63 - * conditions, or imposes obligations or liability on National ICT
   21.64 - * Australia or one of its contributors in respect of the Software that
   21.65 - * cannot be wholly or partly excluded, restricted or modified, the
   21.66 - * liability of National ICT Australia or the contributor is limited, to
   21.67 - * the full extent permitted by the applicable legislation, at its
   21.68 - * option, to:
   21.69 - * a.  in the case of goods, any one or more of the following:
   21.70 - * i.  the replacement of the goods or the supply of equivalent goods;
   21.71 - * ii.  the repair of the goods;
   21.72 - * iii. the payment of the cost of replacing the goods or of acquiring
   21.73 - *  equivalent goods;
   21.74 - * iv.  the payment of the cost of having the goods repaired; or
   21.75 - * b.  in the case of services:
   21.76 - * i.  the supplying of the services again; or
   21.77 - * ii.  the payment of the cost of having the services supplied again.
   21.78 - * 
   21.79 - * The construction, validity and performance of this licence is governed
   21.80 - * by the laws in force in New South Wales, Australia.
   21.81 - */
   21.82 -/*
   21.83 -  Author: Ben Leslie
   21.84 -*/
   21.85 -
   21.86 -typedef signed char int8_t;
   21.87 -typedef short int16_t;
   21.88 -typedef int int32_t;
   21.89 -typedef long long int64_t;
   21.90 -
   21.91 -typedef unsigned char uint8_t;
   21.92 -typedef unsigned short uint16_t;
   21.93 -typedef unsigned int uint32_t;
   21.94 -typedef unsigned long long uint64_t;
   21.95 -
   21.96 -#define __PTR_SIZE 32

    22.1 --- a/include/arch/beehive/barrelfish/bmp_chan.h	Fri Jan 20 14:32:03 2012 -0800
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,171 +0,0 @@
    22.4 -/**
    22.5 - * \file
    22.6 - * \brief Bidirectional Beehive messaging channel
    22.7 - */
    22.8 -
    22.9 -/*
   22.10 - * Copyright (c) 2009, 2010, ETH Zurich.
   22.11 - * All rights reserved.
   22.12 - *
   22.13 - * This file is distributed under the terms in the attached LICENSE file.
   22.14 - * If you do not find this file, copies can be found by writing to:
   22.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   22.16 - */
   22.17 -
   22.18 -#ifndef BARRELFISH_BMP_CHAN_H
   22.19 -#define BARRELFISH_BMP_CHAN_H
   22.20 -
   22.21 -#include <barrelfish/waitset.h>
   22.22 -#include <barrelfish/lmp_endpoints.h>
   22.23 -#include <barrelfish/syscall_arch.h>
   22.24 -#include <barrelfish_kpi/bmp.h>
   22.25 -#include <barrelfish/monitor_client.h>
   22.26 -#include <trace/trace.h>
   22.27 -
   22.28 -struct bmp_chan;
   22.29 -
   22.30 -/// Default size of BMP endpoint buffer (in words), must be >= BMP_MSG_LENGTH
   22.31 -// We make this reasonably large, because the flow control logic sends
   22.32 -// an ack whenever there is less than BMP_MSG_LENGTH space remaining.
   22.33 -#define DEFAULT_BMP_BUF_WORDS           (BMP_MSG_LENGTH * 2)
   22.34 -
   22.35 -struct bmp_bind_continuation {
   22.36 -    /**
   22.37 -     * \brief Handler which runs when a binding succeeds or fails
   22.38 -     * \param st State pointer set in closure
   22.39 -     * \param err Success/failure of binding
   22.40 -     * \param c On success, contains pointer to channel
   22.41 -     */
   22.42 -    void (*handler)(void *st, errval_t err, struct bmp_chan *c);
   22.43 -    void *st;
   22.44 -};
   22.45 -
   22.46 -/// A bidirectional Beehive channel
   22.47 -struct bmp_chan {
   22.48 -    struct monitor_cap_handlers cap_handlers;   /* XXX: must be first */
   22.49 -
   22.50 -    struct bmp_chan *next, *prev;  ///< Next/prev in list of channels with send events
   22.51 -    struct capref outepcap;        ///< Cap to remote Beehive endpoint
   22.52 -    size_t outeplen;               ///< Size of remote endpoint buffer
   22.53 -    struct lmp_endpoint *inep;     ///< Incoming LMP endpoint
   22.54 -    struct capref inepcap;         ///< Cap to incoming LMP endpoint
   22.55 -    struct waitset_chanstate send_waitset; ///< State belonging to waitset (for send)
   22.56 -
   22.57 -    /// connection state
   22.58 -    enum {BMP_DISCONNECTED,     ///< Disconnected
   22.59 -          BMP_BIND_WAIT,        ///< Waiting for bind reply
   22.60 -          BMP_CONNECTED,        ///< Connection established
   22.61 -    } connstate;
   22.62 -
   22.63 -    uintptr_t monitor_id;       ///< Local monitor's connection ID for this channel
   22.64 -    struct monitor_binding *monitor_binding; ///< Monitor binding used for cap xfer
   22.65 -
   22.66 -    /* Arguments for an ongoing bind attempt */
   22.67 -    iref_t iref;                ///< IREF to which we bound
   22.68 -    struct bmp_bind_continuation bind_continuation; ///< Continuation for bind
   22.69 -};
   22.70 -
   22.71 -/// Fixed-length version of #lmp_recv_buf
   22.72 -struct bmp_recv_msg {
   22.73 -    struct lmp_recv_buf buf;
   22.74 -    uintptr_t words[BMP_MSG_LENGTH]; ///< Payload (fixed length)
   22.75 -};
   22.76 -
   22.77 -/// Static initialiser for lmp_recv_msg
   22.78 -#define BMP_RECV_MSG_INIT { .buf.buflen = BMP_MSG_LENGTH }
   22.79 -
   22.80 -struct event_queue_node;
   22.81 -
   22.82 -void bmp_chan_init(struct bmp_chan *c);
   22.83 -errval_t bmp_chan_bind(struct bmp_chan *c, struct bmp_bind_continuation cont,
   22.84 -                       struct event_queue_node *qnode,  iref_t iref,
   22.85 -                       struct monitor_binding *monitor_binding,
   22.86 -                       size_t ep_buflen);
   22.87 -errval_t bmp_chan_accept(struct bmp_chan *c, uintptr_t mon_id,
   22.88 -                         struct capref remote_ep, size_t remote_ep_len,
   22.89 -                         size_t local_ep_len);
   22.90 -void bmp_chan_send_bind_reply(struct monitor_binding *mb,
   22.91 -                              struct bmp_chan *c, errval_t err,
   22.92 -                              uintptr_t monitor_id);
   22.93 -errval_t bmp_chan_register_send(struct bmp_chan *c, struct waitset *ws,
   22.94 -                                struct event_closure closure);
   22.95 -errval_t bmp_chan_deregister_send(struct bmp_chan *c);
   22.96 -void bmp_chan_destroy(struct bmp_chan *c);
   22.97 -void bmp_channels_retry_send_disabled(dispatcher_handle_t handle);
   22.98 -void bmp_init(void);
   22.99 -
  22.100 -/**
  22.101 - * \brief Register an event handler to be notified when messages can be received
  22.102 - *
  22.103 - * In the future, call the closure on the given waitset when it is likely that
  22.104 - * a message can be received on the channel. A channel may only be registered
  22.105 - * with a single receive event handler on a single waitset at any one time.
  22.106 - *
  22.107 - * \param c channel
  22.108 - * \param ws Waitset
  22.109 - * \param closure Event handler
  22.110 - */
  22.111 -static inline errval_t bmp_chan_register_recv(struct bmp_chan *c,
  22.112 -                                              struct waitset *ws,
  22.113 -                                              struct event_closure closure)
  22.114 -{
  22.115 -    return lmp_endpoint_register(c->inep, ws, closure);
  22.116 -}
  22.117 -
  22.118 -/**
  22.119 - * \brief Cancel an event registration made with bmp_chan_register_recv()
  22.120 - *
  22.121 - * \param c channel
  22.122 - */
  22.123 -static inline errval_t bmp_chan_deregister_recv(struct bmp_chan *c)
  22.124 -{
  22.125 -    return lmp_endpoint_deregister(c->inep);
  22.126 -}
  22.127 -
  22.128 -/**
  22.129 - * \brief Receive a message from a BMP channel, if possible
  22.130 - *
  22.131 - * Non-blocking. May fail if no message is available.
  22.132 - *
  22.133 - * \param c  channel
  22.134 - * \param msg BMP message buffer, to be filled-in
  22.135 - */
  22.136 -static inline errval_t bmp_chan_recv(struct bmp_chan *c,
  22.137 -                                     struct bmp_recv_msg *msg)
  22.138 -{
  22.139 -    assert(msg != NULL);
  22.140 -    assert(msg->buf.buflen == BMP_MSG_LENGTH);
  22.141 -    return lmp_endpoint_recv(c->inep, &msg->buf, NULL);
  22.142 -}
  22.143 -
  22.144 -/**
  22.145 - * \brief Send a message to a BMP channel, if possible
  22.146 - *
  22.147 - * Non-blocking. May fail if the channel cannot currently transmit.
  22.148 - *
  22.149 - * \param c  channel
  22.150 - * \param ptr Message payload as an array of words
  22.151 - * \param len Length of message payload, in words
  22.152 - */
  22.153 -static inline errval_t bmp_chan_send(struct bmp_chan *c,
  22.154 -                                     uintptr_t *ptr, size_t len)
  22.155 -{
  22.156 -    trace_event(TRACE_SUBSYS_KERNEL, TRACE_EVENT_BMP_SEND, (uintptr_t)c);
  22.157 -
  22.158 -    assert(c != NULL);
  22.159 -    assert(ptr != NULL);
  22.160 -    assert(len > 0 && len <= BMP_MSG_LENGTH);
  22.161 -
  22.162 -    struct idc_send_msg msg;
  22.163 -
  22.164 -    idc_msg_init(&msg);
  22.165 -    idc_msg_encode_word(&msg, len);
  22.166 -    idc_msg_encode_word(&msg, (uintptr_t)ptr);
  22.167 -
  22.168 -    errval_t err;
  22.169 -    err = cap_invoke(c->outepcap, &msg).error;
  22.170 -    trace_event(TRACE_SUBSYS_KERNEL, TRACE_EVENT_BMP_SEND, ((uintptr_t)c)|1);
  22.171 -    return err;
  22.172 -}
  22.173 -
  22.174 -#endif // BARRELFISH_BMP_CHAN_H

    23.1 --- a/include/arch/beehive/barrelfish/bulk_transfer_arch.h	Fri Jan 20 14:32:03 2012 -0800
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,32 +0,0 @@
    23.4 -/**
    23.5 - * \file
    23.6 - * \brief Unidirectional bulk data transfer via shared memory
    23.7 - */
    23.8 -
    23.9 -/*
   23.10 - * Copyright (c) 2009, 2010, ETH Zurich.
   23.11 - * All rights reserved.
   23.12 - *
   23.13 - * This file is distributed under the terms in the attached LICENSE file.
   23.14 - * If you do not find this file, copies can be found by writing to:
   23.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   23.16 - */
   23.17 -
   23.18 -#ifndef ARCH_BULK_TRANSFER_H
   23.19 -#define ARCH_BULK_TRANSFER_H
   23.20 -
   23.21 -// Provided by assembler
   23.22 -//extern void bee_dcache_flush_rgn(void * a,size_t n);
   23.23 -extern void bee_dcache_empty_rgn(void * a,size_t n);
   23.24 -
   23.25 -static inline void bulk_arch_prepare_send(void *mem, size_t size)
   23.26 -{
   23.27 -    bee_dcache_flush_rgn(mem, size);
   23.28 -}
   23.29 -
   23.30 -static inline void bulk_arch_prepare_recv(void *mem, size_t size)
   23.31 -{
   23.32 -    bee_dcache_empty_rgn(mem, size);
   23.33 -}
   23.34 -
   23.35 -#endif

    24.1 --- a/include/arch/beehive/barrelfish/core_state_arch.h	Fri Jan 20 14:32:03 2012 -0800
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,30 +0,0 @@
    24.4 -/**
    24.5 - * \file
    24.6 - * \brief
    24.7 - */
    24.8 -
    24.9 -/*
   24.10 - * Copyright (c) 2008, 2009, 2010, ETH Zurich.
   24.11 - * All rights reserved.
   24.12 - *
   24.13 - * This file is distributed under the terms in the attached LICENSE file.
   24.14 - * If you do not find this file, copies can be found by writing to:
   24.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   24.16 - */
   24.17 -
   24.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_CORESTATE_H
   24.19 -#define ARCH_BEEHIVE_BARRELFISH_CORESTATE_H
   24.20 -
   24.21 -#include <barrelfish/core_state.h>
   24.22 -
   24.23 -struct vspace_state {
   24.24 -    struct vspace vspace;
   24.25 -    struct pmap pmap;
   24.26 -};
   24.27 -
   24.28 -struct core_state_arch {
   24.29 -    struct core_state_generic c;
   24.30 -    struct vspace_state vspace_state;
   24.31 -};
   24.32 -
   24.33 -#endif

    25.1 --- a/include/arch/beehive/barrelfish/cpu_arch.h	Fri Jan 20 14:32:03 2012 -0800
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,20 +0,0 @@
    25.4 -/**
    25.5 - * \file
    25.6 - * \brief Architecture specific CPU bits.
    25.7 - */
    25.8 -
    25.9 -/*
   25.10 - * Copyright (c) 2010, ETH Zurich.
   25.11 - * All rights reserved.
   25.12 - *
   25.13 - * This file is distributed under the terms in the attached LICENSE file.
   25.14 - * If you do not find this file, copies can be found by writing to:
   25.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   25.16 - */
   25.17 -
   25.18 -#ifndef BEEHIVE_BARRELFISH_CPU_H
   25.19 -#define BEEHIVE_BARRELFISH_CPU_H
   25.20 -
   25.21 -#define CURRENT_CPU_TYPE CPU_BEEHIVE
   25.22 -
   25.23 -#endif

    26.1 --- a/include/arch/beehive/barrelfish/curdispatcher_arch.h	Fri Jan 20 14:32:03 2012 -0800
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,32 +0,0 @@
    26.4 -/**
    26.5 - * \file
    26.6 - * \brief Dispatcher architecture-specific code
    26.7 - */
    26.8 -
    26.9 -/*
   26.10 - * Copyright (c) 2009, ETH Zurich.
   26.11 - * All rights reserved.
   26.12 - *
   26.13 - * This file is distributed under the terms in the attached LICENSE file.
   26.14 - * If you do not find this file, copies can be found by writing to:
   26.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   26.16 - */
   26.17 -
   26.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_CURDISPATCHER_H
   26.19 -#define ARCH_BEEHIVE_BARRELFISH_CURDISPATCHER_H
   26.20 -
   26.21 -/**
   26.22 - * \brief Returns pointer to current dispatcher, using thread register
   26.23 - */
   26.24 -static inline dispatcher_handle_t curdispatcher(void)
   26.25 -{
   26.26 -    dispatcher_handle_t ret;
   26.27 -
   26.28 -    // We keep the dispatcher pointer in the platform usage register.
   26.29 -    // This register is not used by the compiler.
   26.30 -    __asm("ld %0, p1" : "=r" (ret) : );
   26.31 -
   26.32 -    return ret;
   26.33 -}
   26.34 -
   26.35 -#endif // ARCH_BEEHIVE_BARRELFISH_CURDISPATCHER_H

    27.1 --- a/include/arch/beehive/barrelfish/dispatcher_arch.h	Fri Jan 20 14:32:03 2012 -0800
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,32 +0,0 @@
    27.4 -/**
    27.5 - * \file
    27.6 - * \brief Architecture specific dispatcher structure private to the user
    27.7 - */
    27.8 -
    27.9 -/*
   27.10 - * Copyright (c) 2010, ETH Zurich.
   27.11 - * All rights reserved.
   27.12 - *
   27.13 - * This file is distributed under the terms in the attached LICENSE file.
   27.14 - * If you do not find this file, copies can be found by writing to:
   27.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   27.16 - */
   27.17 -
   27.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_DISPATCHER_H
   27.19 -#define ARCH_BEEHIVE_BARRELFISH_DISPATCHER_H
   27.20 -
   27.21 -#include <target/beehive/barrelfish/dispatcher_target.h>
   27.22 -
   27.23 -static inline struct dispatcher_generic*
   27.24 -get_dispatcher_generic(dispatcher_handle_t handle)
   27.25 -{
   27.26 -    struct dispatcher_beehive *disp = (struct dispatcher_beehive*)handle;
   27.27 -    return &disp->generic;
   27.28 -}
   27.29 -
   27.30 -static inline size_t get_dispatcher_size(void)
   27.31 -{
   27.32 -    return sizeof(struct dispatcher_beehive);
   27.33 -}
   27.34 -
   27.35 -#endif // ARCH_BEEHIVE_BARRELFISH_DISPATCHER_H

    28.1 --- a/include/arch/beehive/barrelfish/invocations_arch.h	Fri Jan 20 14:32:03 2012 -0800
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,332 +0,0 @@
    28.4 -/**
    28.5 - * \file
    28.6 - * \brief Low-level capability invocations
    28.7 - */
    28.8 -
    28.9 -/*
   28.10 - * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
   28.11 - * All rights reserved.
   28.12 - *
   28.13 - * This file is distributed under the terms in the attached LICENSE file.
   28.14 - * If you do not find this file, copies can be found by writing to:
   28.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   28.16 - */
   28.17 -
   28.18 -#include <barrelfish_kpi/legacy_idc_buffer.h> // for idc_send_msg
   28.19 -#include <barrelfish/syscall_arch.h> // for sys_invoke and cap_invoke
   28.20 -
   28.21 -
   28.22 -/**
   28.23 - * \brief Retype a capability.
   28.24 - *
   28.25 - * Retypes CPtr 'cap' into 2^'objbits' caps of type 'newtype' and places them
   28.26 - * into slots starting at slot 'slot' in the CNode, addressed by 'to', with
   28.27 - * 'bits' address bits of 'to' valid.
   28.28 - *
   28.29 - * See also cap_retype(), which wraps this.
   28.30 - *
   28.31 - * \param root          Capability of the CNode to invoke
   28.32 - * \param cap           Address of cap to retype.
   28.33 - * \param newtype       Kernel object type to retype to.
   28.34 - * \param objbits       Size of created objects, for variable-sized types
   28.35 - * \param to            Address of CNode cap to place retyped caps into.
   28.36 - * \param slot          Slot in CNode cap to start placement.
   28.37 - * \param bits          Number of valid address bits in 'to'.
   28.38 - *
   28.39 - * \return Error code
   28.40 - */
   28.41 -static inline errval_t invoke_cnode_retype(struct capref root, caddr_t cap,
   28.42 -                                           enum objtype newtype, int objbits,
   28.43 -                                           caddr_t to, caddr_t slot, int bits)
   28.44 -{
   28.45 -    assert(cap != CPTR_NULL);
   28.46 -    struct idc_send_msg msg;
   28.47 -
   28.48 -    idc_msg_init(&msg);
   28.49 -    idc_msg_encode_word(&msg, CNodeCmd_Retype);
   28.50 -    idc_msg_encode_word(&msg, cap);
   28.51 -    idc_msg_encode_word(&msg, newtype);
   28.52 -    idc_msg_encode_word(&msg, objbits);
   28.53 -    idc_msg_encode_word(&msg, to);
   28.54 -    idc_msg_encode_word(&msg, slot);
   28.55 -    idc_msg_encode_word(&msg, bits);
   28.56 -
   28.57 -    return cap_invoke(root, &msg).error;
   28.58 -}
   28.59 -
   28.60 -/**
   28.61 - * \brief "Mint" a capability.
   28.62 - *
   28.63 - * Copies CPtr 'from' into slot 'slot' in the CNode, addressed by 'to', within
   28.64 - * the address space, rooted at 'root' and with 'tobits' and 'frombits' address
   28.65 - * bits of 'to' and 'from' valid, respectively.
   28.66 - *
   28.67 - * See also cap_mint(), which wraps this.
   28.68 - *
   28.69 - * \param root          Capability of the CNode to invoke
   28.70 - * \param to            CNode to place copy into.
   28.71 - * \param slot          Slot in CNode cap to place copy into.
   28.72 - * \param from          Address of cap to copy.
   28.73 - * \param tobits        Number of valid address bits in 'to'.
   28.74 - * \param frombits      Number of valid address bits in 'from'.
   28.75 - * \param param1        1st cap-dependent parameter.
   28.76 - * \param param2        2nd cap-dependent parameter.
   28.77 - *
   28.78 - * \return Error code
   28.79 - */
   28.80 -static inline errval_t invoke_cnode_mint(struct capref root, caddr_t to,
   28.81 -                                         caddr_t slot, caddr_t from, int tobits,
   28.82 -                                         int frombits, uint64_t param1,
   28.83 -                                         uint64_t param2)
   28.84 -{
   28.85 -    struct idc_send_msg msg;
   28.86 -
   28.87 -    idc_msg_init(&msg);
   28.88 -    idc_msg_encode_word(&msg, CNodeCmd_Mint);
   28.89 -    idc_msg_encode_word(&msg, to);
   28.90 -    idc_msg_encode_word(&msg, slot);
   28.91 -    idc_msg_encode_word(&msg, from);
   28.92 -    idc_msg_encode_word(&msg, tobits);
   28.93 -    idc_msg_encode_word(&msg, frombits);
   28.94 -    idc_msg_encode_word(&msg, param1);
   28.95 -    idc_msg_encode_word(&msg, param2);
   28.96 -
   28.97 -    return cap_invoke(root, &msg).error;
   28.98 -}
   28.99 -
  28.100 -// Required to compile
  28.101 -static inline errval_t invoke_vnode_unmap(struct capref cap, size_t entry)
  28.102 -{
  28.103 -    assert(!"should not be called");
  28.104 -    return LIB_ERR_NOT_IMPLEMENTED;
  28.105 -}
  28.106 -
  28.107 -/**
  28.108 - * \brief Copy a capability.
  28.109 - *
  28.110 - * Copies CPtr 'from' into slot 'slot' in the CNode, addressed by 'to', within
  28.111 - * the address space, rooted at 'root' and with 'tobits' and 'frombits' address
  28.112 - * bits of 'to' and 'from' valid, respectively.
  28.113 - *
  28.114 - * See also cap_copy(), which wraps this.
  28.115 - *
  28.116 - * \param root          Capability of the CNode to invoke
  28.117 - * \param to            CNode to place copy into.
  28.118 - * \param slot          Slot in CNode cap to place copy into.
  28.119 - * \param from          Address of cap to copy.
  28.120 - * \param tobits        Number of valid address bits in 'to'.
  28.121 - * \param frombits      Number of valid address bits in 'from'.
  28.122 - *
  28.123 - * \return Error code
  28.124 - */
  28.125 -static inline errval_t invoke_cnode_copy(struct capref root, caddr_t to,
  28.126 -                                         caddr_t slot, caddr_t from, int tobits,
  28.127 -                                         int frombits)
  28.128 -{
  28.129 -    struct idc_send_msg msg;
  28.130 -
  28.131 -    idc_msg_init(&msg);
  28.132 -    idc_msg_encode_word(&msg, CNodeCmd_Copy);
  28.133 -    idc_msg_encode_word(&msg, to);
  28.134 -    idc_msg_encode_word(&msg, slot);
  28.135 -    idc_msg_encode_word(&msg, from);
  28.136 -    idc_msg_encode_word(&msg, tobits);
  28.137 -    idc_msg_encode_word(&msg, frombits);
  28.138 -
  28.139 -    return cap_invoke(root, &msg).error;
  28.140 -}
  28.141 -
  28.142 -/**
  28.143 - * \brief Delete a capability.
  28.144 - *
  28.145 - * Delete the capability pointed to by 'cap', with 'bits' address bits
  28.146 - * of it valid, from the address space rooted at 'root'.
  28.147 - *
  28.148 - * \param root  Capability of the CNode to invoke
  28.149 - * \param cap   Address of cap to delete.
  28.150 - * \param bits  Number of valid bits within 'cap'.
  28.151 - *
  28.152 - * \return Error code
  28.153 - */
  28.154 -static inline errval_t invoke_cnode_delete(struct capref root, caddr_t cap,
  28.155 -                                           int bits)
  28.156 -{
  28.157 -    struct idc_send_msg msg;
  28.158 -
  28.159 -    idc_msg_init(&msg);
  28.160 -    idc_msg_encode_word(&msg, CNodeCmd_Delete);
  28.161 -    idc_msg_encode_word(&msg, cap);
  28.162 -    idc_msg_encode_word(&msg, bits);
  28.163 -
  28.164 -    return cap_invoke(root, &msg).error;
  28.165 -}
  28.166 -
  28.167 -static inline errval_t invoke_cnode_revoke(struct capref root, caddr_t cap,
  28.168 -                                           int bits)
  28.169 -{
  28.170 -    struct idc_send_msg msg;
  28.171 -
  28.172 -    idc_msg_init(&msg);
  28.173 -    idc_msg_encode_word(&msg, CNodeCmd_Revoke);
  28.174 -    idc_msg_encode_word(&msg, cap);
  28.175 -    idc_msg_encode_word(&msg, bits);
  28.176 -
  28.177 -    return cap_invoke(root, &msg).error;
  28.178 -}
  28.179 -
  28.180 -/**
  28.181 - * \brief Return the physical address and size of a frame capability
  28.182 - *
  28.183 - * \param frame    CSpace address of frame capability
  28.184 - * \param ret      frame_identity struct filled in with relevant data
  28.185 - *
  28.186 - * \return Error code
  28.187 - */
  28.188 -static inline errval_t invoke_frame_identify(struct capref frame,
  28.189 -                                             struct frame_identity *ret)
  28.190 -{
  28.191 -    struct idc_send_msg msg;
  28.192 -
  28.193 -    idc_msg_init(&msg);
  28.194 -    idc_msg_encode_word(&msg, FrameCmd_Identify);
  28.195 -    struct sysret sysret = cap_invoke(frame, &msg);
  28.196 -    assert(ret != NULL);
  28.197 -    if (err_is_ok(sysret.error)) {
  28.198 -        ret->base = sysret.value & (~BASE_PAGE_MASK);
  28.199 -        ret->bits = sysret.value & BASE_PAGE_MASK;
  28.200 -        return sysret.error;
  28.201 -    }
  28.202 -
  28.203 -    ret->base = 0;
  28.204 -    ret->bits = 0;
  28.205 -    return sysret.error;
  28.206 -}
  28.207 -
  28.208 -static inline errval_t invoke_iocap_in(struct capref iocap, enum io_cmd cmd,
  28.209 -                                       uint16_t port, uint32_t *data)
  28.210 -{
  28.211 -    struct idc_send_msg msg;
  28.212 -
  28.213 -    idc_msg_init(&msg);
  28.214 -    idc_msg_encode_word(&msg, cmd);
  28.215 -    idc_msg_encode_word(&msg, port);
  28.216 -    struct sysret sysret = cap_invoke(iocap, &msg);
  28.217 -    if (err_is_ok(sysret.error)) {
  28.218 -        assert(data != NULL);
  28.219 -        *data = sysret.value;
  28.220 -    }
  28.221 -    return sysret.error;
  28.222 -}
  28.223 -
  28.224 -static inline errval_t invoke_iocap_out(struct capref iocap, enum io_cmd cmd,
  28.225 -                                        uint16_t port, uint32_t data)
  28.226 -{
  28.227 -    struct idc_send_msg msg;
  28.228 -
  28.229 -    idc_msg_init(&msg);
  28.230 -    idc_msg_encode_word(&msg, cmd);
  28.231 -    idc_msg_encode_word(&msg, port);
  28.232 -    idc_msg_encode_word(&msg, data);
  28.233 -    return cap_invoke(iocap, &msg).error;
  28.234 -}
  28.235 -
  28.236 -/**
  28.237 - * \brief Setup a dispatcher, possibly making it runnable
  28.238 - *
  28.239 - * \param dispatcher    Address of dispatcher capability
  28.240 - * \param domdispatcher Address of existing dispatcher for domain ID
  28.241 - * \param cspace_root   Root of CSpace for new dispatcher
  28.242 - * \param cspace_root_bits  Number of valid bits in cspace_root
  28.243 - * \param vspace_root   Root of VSpace for new dispatcher
  28.244 - * \param dispatcher_frame Frame capability for dispatcher structure
  28.245 - * \param run           Make runnable if true
  28.246 - *
  28.247 - * Any arguments of CPTR_NULL are ignored.
  28.248 - *
  28.249 - * \return Error code
  28.250 - */
  28.251 -static inline errval_t
  28.252 -invoke_dispatcher(struct capref dispatcher, struct capref domdispatcher,
  28.253 -                  struct capref cspace, struct capref vspace,
  28.254 -                  struct capref dispframe, bool run)
  28.255 -{
  28.256 -    uint8_t root_vbits = get_cap_valid_bits(cspace);
  28.257 -    caddr_t root_caddr = get_cap_addr(cspace) >> (CPTR_BITS - root_vbits);
  28.258 -    caddr_t vtree_caddr = get_cap_addr(vspace);
  28.259 -    caddr_t disp_caddr = get_cap_addr(dispframe);
  28.260 -    caddr_t dd_caddr = get_cap_addr(domdispatcher);
  28.261 -
  28.262 -    struct idc_send_msg msg;
  28.263 -    idc_msg_init(&msg);
  28.264 -    idc_msg_encode_word(&msg, DispatcherCmd_Setup);
  28.265 -    idc_msg_encode_word(&msg, root_caddr);
  28.266 -    idc_msg_encode_word(&msg, root_vbits);
  28.267 -    idc_msg_encode_word(&msg, vtree_caddr);
  28.268 -    idc_msg_encode_word(&msg, disp_caddr);
  28.269 -    idc_msg_encode_word(&msg, run);
  28.270 -    idc_msg_encode_word(&msg, dd_caddr);
  28.271 -    return cap_invoke(dispatcher, &msg).error;
  28.272 -}
  28.273 -
  28.274 -/**
  28.275 - * \brief Setup a VM guest DCB
  28.276 - *
  28.277 - * \param dcb       Dispatcher capability
  28.278 - */
  28.279 -static inline errval_t invoke_dispatcher_setup_guest(struct capref dispatcher,
  28.280 -                                                     caddr_t ep_cap,
  28.281 -                                                     caddr_t vnode,
  28.282 -                                                     caddr_t vmkit_guest,
  28.283 -                                                     caddr_t guest_control_cap)
  28.284 -{
  28.285 -    struct idc_send_msg msg;
  28.286 -    idc_msg_init(&msg);
  28.287 -    idc_msg_encode_word(&msg, DispatcherCmd_SetupGuest);
  28.288 -    idc_msg_encode_word(&msg, ep_cap);
  28.289 -    idc_msg_encode_word(&msg, vnode);
  28.290 -    idc_msg_encode_word(&msg, vmkit_guest);
  28.291 -    idc_msg_encode_word(&msg, guest_control_cap);
  28.292 -    return cap_invoke(dispatcher, &msg).error;
  28.293 -}
  28.294 -
  28.295 -static inline errval_t invoke_irqtable_set(struct capref irqcap, int irq,
  28.296 -                                           struct capref ep)
  28.297 -{
  28.298 -    struct idc_send_msg msg;
  28.299 -
  28.300 -    idc_msg_init(&msg);
  28.301 -    idc_msg_encode_word(&msg, IRQTableCmd_Set);
  28.302 -    idc_msg_encode_word(&msg, irq);
  28.303 -    idc_msg_encode_word(&msg, get_cap_addr(ep));
  28.304 -    return cap_invoke(irqcap, &msg).error;
  28.305 -}
  28.306 -
  28.307 -static inline errval_t invoke_irqtable_delete(struct capref irqcap, int irq)
  28.308 -{
  28.309 -    struct idc_send_msg msg;
  28.310 -
  28.311 -    idc_msg_init(&msg);
  28.312 -    idc_msg_encode_word(&msg, IRQTableCmd_Delete);
  28.313 -    idc_msg_encode_word(&msg, irq);
  28.314 -    return cap_invoke(irqcap, &msg).error;
  28.315 -}
  28.316 -
  28.317 -// XXX TODO: Clean this with proper symbols
  28.318 -static inline errval_t invoke_kernel_get_core_id(struct capref kern_cap,
  28.319 -                                                 coreid_t *core_id)
  28.320 -{
  28.321 -    assert(core_id != 0);
  28.322 -    volatile unsigned int *ptr = (void*)0x02;
  28.323 -    unsigned int val = *ptr;
  28.324 -    *core_id = ((val >> 10) & 0xf);
  28.325 -    return SYS_ERR_OK;
  28.326 -}
  28.327 -
  28.328 -static inline errval_t
  28.329 -invoke_dispatcher_properties(struct capref dispatcher,
  28.330 -                             enum task_type type, unsigned long deadline,
  28.331 -                             unsigned long wcet, unsigned long period,
  28.332 -                             unsigned long release, unsigned short weight)
  28.333 -{
  28.334 -    return LIB_ERR_NOT_IMPLEMENTED;
  28.335 -}

    29.1 --- a/include/arch/beehive/barrelfish/lmp_chan_arch.h	Fri Jan 20 14:32:03 2012 -0800
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,113 +0,0 @@
    29.4 -/**
    29.5 - * \file
    29.6 - * \brief
    29.7 - */
    29.8 -
    29.9 -/*
   29.10 - * Copyright (c) 2007, 2008, ETH Zurich.
   29.11 - * All rights reserved.
   29.12 - *
   29.13 - * This file is distributed under the terms in the attached LICENSE file.
   29.14 - * If you do not find this file, copies can be found by writing to:
   29.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   29.16 - */
   29.17 -
   29.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_LMP_CHAN_H
   29.19 -#define ARCH_BEEHIVE_BARRELFISH_LMP_CHAN_H
   29.20 -
   29.21 -#include <barrelfish/syscall_arch.h> // for cap_invoke
   29.22 -#include <barrelfish/caddr.h>
   29.23 -#include <barrelfish_kpi/lmp.h>
   29.24 -
   29.25 -// Sanity check
   29.26 -#if LMP_MSG_LENGTH != 9
   29.27 -#error "LMP_MSG_LENGTH != 9"
   29.28 -#endif
   29.29 -
   29.30 -// all this code relies massively on the compilers post-inlining optimiser
   29.31 -
   29.32 -/**
   29.33 - * \brief Send a message on the given LMP channel, if possible
   29.34 - *
   29.35 - * Non-blocking, may fail if there is no space in the receiver's endpoint.
   29.36 - *
   29.37 - * \param ep Remote endpoint cap
   29.38 - * \param flags LMP send flags
   29.39 - * \param send_cap (Optional) capability to send with the message
   29.40 - * \param length_words Length of the message in words; payload beyond this
   29.41 - *                      size will not be delivered
   29.42 - * \param arg1..N Message payload
   29.43 - */
   29.44 -static inline errval_t lmp_ep_send(struct capref ep, lmp_send_flags_t flags,
   29.45 -				   struct capref send_cap, uint8_t length_words,
   29.46 -				   uint32_t a, uint32_t b, uint32_t c, uint32_t d,
   29.47 -				   uint32_t e, uint32_t f, uint32_t g, uint32_t h,
   29.48 -				   uint32_t i)
   29.49 -{
   29.50 -    struct idc_send_msg msg;
   29.51 -    
   29.52 -    idc_msg_init(&msg);
   29.53 -    if (length_words > 0) idc_msg_encode_word(&msg, a);
   29.54 -    if (length_words > 1) idc_msg_encode_word(&msg, b);
   29.55 -    if (length_words > 2) idc_msg_encode_word(&msg, c);
   29.56 -    if (length_words > 3) idc_msg_encode_word(&msg, d);
   29.57 -    if (length_words > 4) idc_msg_encode_word(&msg, e);
   29.58 -    if (length_words > 5) idc_msg_encode_word(&msg, f);
   29.59 -    if (length_words > 6) idc_msg_encode_word(&msg, g);
   29.60 -    if (length_words > 7) idc_msg_encode_word(&msg, h);
   29.61 -    if (length_words > 8) idc_msg_encode_word(&msg, i);
   29.62 -
   29.63 -    msg.u.x.header.x.flags.sync = ((flags & LMP_FLAG_SYNC) != 0) ? 1 : 0;
   29.64 -    msg.u.x.header.x.flags.yield = ((flags & LMP_FLAG_YIELD) != 0) ? 1 : 0;
   29.65 -
   29.66 -    if (!capref_is_null(send_cap)) {
   29.67 -	uint8_t send_bits = get_cap_valid_bits(send_cap);
   29.68 -	msg.u.x.header.x.send_bits = send_bits;
   29.69 -	msg.u.x.header.x.send_cptr = get_cap_addr(send_cap) >> (CPTR_BITS - send_bits);
   29.70 -    }
   29.71 -
   29.72 -    return cap_invoke(ep, &msg).error;
   29.73 -}
   29.74 -
   29.75 -// all this code relies massively on the compilers post-inlining optimiser
   29.76 -
   29.77 -#define lmp_ep_send4(_ep, _flags, _send_cap, _a, _b, _c, _d) \
   29.78 -    lmp_ep_send((_ep), (_flags), (_send_cap), 4, (_a), (_b), (_c), (_d), 5, 6, 7, 8, 9)
   29.79 -#define lmp_ep_send3(_ep, _flags, _send_cap, _a, _b, _c) \
   29.80 -    lmp_ep_send((_ep), (_flags), (_send_cap), 3, (_a), (_b), (_c), 4, 5, 6, 7, 8, 9)
   29.81 -#define lmp_ep_send2(_ep, _flags, _send_cap, _a, _b) \
   29.82 -    lmp_ep_send((_ep), (_flags), (_send_cap), 2, (_a), (_b), 3, 4, 5, 6, 7, 8, 9)
   29.83 -#define lmp_ep_send1(_ep, _flags, _send_cap, _a) \
   29.84 -    lmp_ep_send((_ep), (_flags), (_send_cap), 1, (_a), 2, 3, 4, 5, 6, 7, 8, 9)
   29.85 -#define lmp_ep_send0(_ep, _flags, _send_cap) \
   29.86 -    lmp_ep_send((_ep), (_flags), (_send_cap), 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
   29.87 -
   29.88 -
   29.89 -#define lmp_chan_send(_lc, _flags, _send_cap, _len, _a, _b, _c, _d, _e, _f, _g, _h, _i) \
   29.90 -  lmp_ep_send((_lc)->remote_cap, (_flags), (_send_cap), (_len), \
   29.91 -		(_a), (_b), (_c), (_d), (_e), (_f), (_g), (_h), (_i))
   29.92 -
   29.93 -// all this code relies massively on the compilers post-inlining optimiser
   29.94 -
   29.95 -#define lmp_chan_send9(_lc, _flags, _send_cap, _a, _b, _c, _d, _e, _f, _g, _h, _i) \
   29.96 -    lmp_chan_send((_lc), (_flags), (_send_cap), 9, (_a), (_b), (_c), (_d), (_e), (_f), (_g), (_h), (_i))
   29.97 -#define lmp_chan_send8(_lc, _flags, _send_cap, _a, _b, _c, _d, _e, _f, _g, _h) \
   29.98 -    lmp_chan_send((_lc), (_flags), (_send_cap), 8, (_a), (_b), (_c), (_d), (_e), (_f), (_g), (_h), 9)
   29.99 -#define lmp_chan_send7(_lc, _flags, _send_cap, _a, _b, _c, _d, _e, _f, _g) \
  29.100 -    lmp_chan_send((_lc), (_flags), (_send_cap), 7, (_a), (_b), (_c), (_d), (_e), (_f), (_g), 8, 9)
  29.101 -#define lmp_chan_send6(_lc, _flags, _send_cap, _a, _b, _c, _d, _e, _f) \
  29.102 -    lmp_chan_send((_lc), (_flags), (_send_cap), 6, (_a), (_b), (_c), (_d), (_e), (_f), 7, 8, 9)
  29.103 -#define lmp_chan_send5(_lc, _flags, _send_cap, _a, _b, _c, _d, _e) \
  29.104 -    lmp_chan_send((_lc), (_flags), (_send_cap), 5, (_a), (_b), (_c), (_d), (_e), 6, 7, 8, 9)
  29.105 -#define lmp_chan_send4(_lc, _flags, _send_cap, _a, _b, _c, _d) \
  29.106 -    lmp_chan_send((_lc), (_flags), (_send_cap), 4, (_a), (_b), (_c), (_d), 5, 6, 7, 8, 9)
  29.107 -#define lmp_chan_send3(_lc, _flags, _send_cap, _a, _b, _c) \
  29.108 -    lmp_chan_send((_lc), (_flags), (_send_cap), 3, (_a), (_b), (_c), 4, 5, 6, 7, 8, 9)
  29.109 -#define lmp_chan_send2(_lc, _flags, _send_cap, _a, _b) \
  29.110 -    lmp_chan_send((_lc), (_flags), (_send_cap), 2, (_a), (_b), 3, 4, 5, 6, 7, 8, 9)
  29.111 -#define lmp_chan_send1(_lc, _flags, _send_cap, _a) \
  29.112 -    lmp_chan_send((_lc), (_flags), (_send_cap), 1, (_a), 2, 3, 4, 5, 6, 7, 8, 9)
  29.113 -#define lmp_chan_send0(_lc, _flags, _send_cap) \
  29.114 -    lmp_chan_send((_lc), (_flags), (_send_cap), 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
  29.115 -
  29.116 -#endif // ARCH_BEEHIVE_BARRELFISH_LMP_CHAN_H

    30.1 --- a/include/arch/beehive/barrelfish/pmap_arch.h	Fri Jan 20 14:32:03 2012 -0800
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,26 +0,0 @@
    30.4 -/**
    30.5 - * \file
    30.6 - * \brief pmap management wrappers
    30.7 - */
    30.8 -
    30.9 -/*
   30.10 - * Copyright (c) 2010, ETH Zurich.
   30.11 - * All rights reserved.
   30.12 - *
   30.13 - * This file is distributed under the terms in the attached LICENSE file.
   30.14 - * If you do not find this file, copies can be found by writing to:
   30.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   30.16 - */
   30.17 -
   30.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_PMAP_H
   30.19 -#define ARCH_BEEHIVE_BARRELFISH_PMAP_H
   30.20 -
   30.21 -#include <barrelfish/pmap.h>
   30.22 -
   30.23 -#define ARCH_DEFAULT_PMAP_SIZE sizeof(struct pmap)
   30.24 -
   30.25 -errval_t pmap_init(struct pmap *pmap, struct vspace *vspace,
   30.26 -                   struct capref vnode, struct slot_allocator *opt_slot_alloc);
   30.27 -errval_t pmap_current_init(bool);
   30.28 -
   30.29 -#endif // ARCH_BEEHIVE_BARRELFISH_PMAP_H

    31.1 --- a/include/arch/beehive/barrelfish/syscall_arch.h	Fri Jan 20 14:32:03 2012 -0800
    31.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.3 @@ -1,65 +0,0 @@
    31.4 -/**
    31.5 - * \file
    31.6 - * \brief User-side system call implementation
    31.7 - */
    31.8 -
    31.9 -/*
   31.10 - * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
   31.11 - * All rights reserved.
   31.12 - *
   31.13 - * This file is distributed under the terms in the attached LICENSE file.
   31.14 - * If you do not find this file, copies can be found by writing to:
   31.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   31.16 - */
   31.17 -
   31.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_SYSCALL_H
   31.19 -#define ARCH_BEEHIVE_BARRELFISH_SYSCALL_H
   31.20 -
   31.21 -#include <barrelfish/caddr.h> // for get_cap_valid_bits
   31.22 -#include <barrelfish_kpi/legacy_idc_buffer.h> // for struct idc_send_msg
   31.23 -
   31.24 -// Implemented in assembler
   31.25 -
   31.26 -#if 0 // these are already declared in include/barrelfish/syscalls.h
   31.27 -extern errval_t sys_yield(caddr_t target);
   31.28 -extern errval_t sys_nop(void);
   31.29 -extern errval_t sys_print(const char *string, size_t length);
   31.30 -#endif
   31.31 -
   31.32 -extern errval_t sys_invoke(uintptr_t *const pvalue,
   31.33 -			   uint8_t invokebits,
   31.34 -			   caddr_t invokecptr,
   31.35 -			   struct idc_send_msg *const msg);
   31.36 -
   31.37 -
   31.38 -extern errval_t sys_rundown(void);
   31.39 -
   31.40 -/*
   31.41 - *  This must be here since it is relied on variously by
   31.42 - *  incovations.h, monitor_invocations.h and lmp_chan_arch.h
   31.43 - */
   31.44 -
   31.45 -/**
   31.46 - * \brief Invoke (send a message to) a capability, returning an error and a value
   31.47 - *
   31.48 - * \param to Capability to invoke
   31.49 - * \param msg Message to send
   31.50 - *
   31.51 - * This is needed for some system calls that return a structure of two values.
   31.52 - *
   31.53 - * \returns System return structure (#sysret)
   31.54 - */
   31.55 -static inline struct sysret
   31.56 -cap_invoke(struct capref to, struct idc_send_msg *msg)
   31.57 -{
   31.58 -    // TODO: XXX: This should have a typedef not a uint8_t
   31.59 -    uint8_t invokebits = get_cap_valid_bits(to);
   31.60 -    caddr_t invokecptr = get_cap_addr(to) >> (CPTR_BITS - invokebits);
   31.61 -
   31.62 -    struct sysret retval;
   31.63 -    retval.error = sys_invoke(&retval.value, invokebits, invokecptr, msg);
   31.64 -    return retval;
   31.65 -}
   31.66 -
   31.67 -
   31.68 -#endif // ARCH_BEEHIVE_BARRELFISH_SYSCALL_H

    32.1 --- a/include/arch/beehive/barrelfish_kpi/bmp.h	Fri Jan 20 14:32:03 2012 -0800
    32.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.3 @@ -1,20 +0,0 @@
    32.4 -/**
    32.5 - * \file
    32.6 - * \brief BMP declarations
    32.7 - */
    32.8 -
    32.9 -/*
   32.10 - * Copyright (c) 2010, ETH Zurich.
   32.11 - * All rights reserved.
   32.12 - *
   32.13 - * This file is distributed under the terms in the attached LICENSE file.
   32.14 - * If you do not find this file, copies can be found by writing to:
   32.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   32.16 - */
   32.17 -
   32.18 -#ifndef BMP_H
   32.19 -#define BMP_H
   32.20 -
   32.21 -#define BMP_MSG_LENGTH 58 /* words */
   32.22 -
   32.23 -#endif // BMP_H

    33.1 --- a/include/arch/beehive/barrelfish_kpi/cpu_arch.h	Fri Jan 20 14:32:03 2012 -0800
    33.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.3 @@ -1,21 +0,0 @@
    33.4 -/**
    33.5 - * \file
    33.6 - * \brief Arch specific CPU declarations
    33.7 - */
    33.8 -
    33.9 -/*
   33.10 - * Copyright (c) 2010, ETH Zurich.
   33.11 - * All rights reserved.
   33.12 - *
   33.13 - * This file is distributed under the terms in the attached LICENSE file.
   33.14 - * If you do not find this file, copies can be found by writing to:
   33.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   33.16 - */
   33.17 -
   33.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_CPU_H
   33.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_CPU_H
   33.20 -
   33.21 -/// This CPU supports lazy FPU context switching?
   33.22 -#undef FPU_LAZY_CONTEXT_SWITCH
   33.23 -
   33.24 -#endif

    34.1 --- a/include/arch/beehive/barrelfish_kpi/dispatcher_shared_arch.h	Fri Jan 20 14:32:03 2012 -0800
    34.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.3 @@ -1,54 +0,0 @@
    34.4 -/**
    34.5 - * \file
    34.6 - * \brief Architecture specific dispatcher struct shared between kernel and user
    34.7 - */
    34.8 -
    34.9 -/*
   34.10 - * Copyright (c) 2010, ETH Zurich.
   34.11 - * All rights reserved.
   34.12 - *
   34.13 - * This file is distributed under the terms in the attached LICENSE file.
   34.14 - * If you do not find this file, copies can be found by writing to:
   34.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   34.16 - */
   34.17 -
   34.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_ARCH_H
   34.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_ARCH_H
   34.20 -
   34.21 -#include <target/beehive/barrelfish_kpi/dispatcher_shared_target.h>
   34.22 -
   34.23 -/**
   34.24 - * \brief Returns whether dispatcher is currently disabled, given IP.
   34.25 - *
   34.26 - * \param disp  Pointer to dispatcher
   34.27 - * \param ip    User-level instruction pointer.
   34.28 - *
   34.29 - * \return true if dispatcher disabled, false otherwise.
   34.30 - */
   34.31 -static inline bool dispatcher_is_disabled_ip(dispatcher_handle_t handle,
   34.32 -                                             uintptr_t rip)
   34.33 -{
   34.34 -    struct dispatcher_shared_generic *disp =
   34.35 -        get_dispatcher_shared_generic(handle);
   34.36 -    return disp->disabled;
   34.37 -}
   34.38 -
   34.39 -static inline arch_registers_state_t*
   34.40 -dispatcher_get_enabled_save_area(dispatcher_handle_t handle)
   34.41 -{
   34.42 -    return dispatcher_beehive_get_enabled_save_area(handle);
   34.43 -}
   34.44 -
   34.45 -static inline arch_registers_state_t*
   34.46 -dispatcher_get_disabled_save_area(dispatcher_handle_t handle)
   34.47 -{
   34.48 -    return dispatcher_beehive_get_disabled_save_area(handle);
   34.49 -}
   34.50 -
   34.51 -static inline arch_registers_state_t*
   34.52 -dispatcher_get_trap_save_area(dispatcher_handle_t handle)
   34.53 -{
   34.54 -    return dispatcher_beehive_get_trap_save_area(handle);
   34.55 -}
   34.56 -
   34.57 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_ARCH_H

    35.1 --- a/include/arch/beehive/barrelfish_kpi/generic_arch.h	Fri Jan 20 14:32:03 2012 -0800
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,21 +0,0 @@
    35.4 -/**
    35.5 - * \file
    35.6 - * \brief Generic include for a bunch of arch specific files
    35.7 - */
    35.8 -
    35.9 -/*
   35.10 - * Copyright (c) 2010, ETH Zurich.
   35.11 - * All rights reserved.
   35.12 - *
   35.13 - * This file is distributed under the terms in the attached LICENSE file.
   35.14 - * If you do not find this file, copies can be found by writing to:
   35.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   35.16 - */
   35.17 -
   35.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_GENERIC_H
   35.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_GENERIC_H
   35.20 -
   35.21 -#include <barrelfish_kpi/spinlocks_arch.h>
   35.22 -#include <barrelfish_kpi/unknown_arch.h>
   35.23 -
   35.24 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_GENERIC_H

    36.1 --- a/include/arch/beehive/barrelfish_kpi/lmp_arch.h	Fri Jan 20 14:32:03 2012 -0800
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,37 +0,0 @@
    36.4 -/**
    36.5 - * \file
    36.6 - * \brief Arch specific LMP declarations
    36.7 - */
    36.8 -
    36.9 -/*
   36.10 - * Copyright (c) 2010, ETH Zurich.
   36.11 - * All rights reserved.
   36.12 - *
   36.13 - * This file is distributed under the terms in the attached LICENSE file.
   36.14 - * If you do not find this file, copies can be found by writing to:
   36.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   36.16 - */
   36.17 -
   36.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_LMP_H
   36.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_LMP_H
   36.20 -
   36.21 -#include <barrelfish_kpi/legacy_idc_buffer.h>
   36.22 -
   36.23 -/**
   36.24 - * \brief Maximum total length of LMP and LRPC messages (payload)
   36.25 - *
   36.26 - * Determined by the size of idc_send_msg.  LMP is done by marshalling
   36.27 - * into an struct idc_send_msg in lmp_chan_arch.h and then invoking
   36.28 - * the endpoint capability passing the idc_send_msg.  This passes
   36.29 - * through the syscal call to handle_invocation in the kernel and
   36.30 - * thence lmp_deliver in the kernel.
   36.31 - */
   36.32 -
   36.33 -// Warning: this is also known to tools/flounder/Args.hs
   36.34 -
   36.35 -#define LMP_MSG_LENGTH          IDC_MSG_LENGTH
   36.36 -
   36.37 -// TODO: XXX Size of LRPC
   36.38 -#define LRPC_MSG_LENGTH         0
   36.39 -
   36.40 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_LMP_H

    37.1 --- a/include/arch/beehive/barrelfish_kpi/paging_arch.h	Fri Jan 20 14:32:03 2012 -0800
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,27 +0,0 @@
    37.4 -/**
    37.5 - * \file
    37.6 - * \brief Arch specific paging definitions
    37.7 - */
    37.8 -
    37.9 -/*
   37.10 - * Copyright (c) 2010, ETH Zurich.
   37.11 - * All rights reserved.
   37.12 - *
   37.13 - * This file is distributed under the terms in the attached LICENSE file.
   37.14 - * If you do not find this file, copies can be found by writing to:
   37.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   37.16 - */
   37.17 -
   37.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_PAGING_H
   37.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_PAGING_H
   37.20 -
   37.21 -// Required for various APIs to compile even if it means nothing
   37.22 -#define PTABLE_ACCESS_DEFAULT 0
   37.23 -
   37.24 -/* Default page size is 4K */
   37.25 -#define BASE_PAGE_BITS          12
   37.26 -#define BASE_PAGE_SIZE          (1u << BASE_PAGE_BITS)
   37.27 -#define BASE_PAGE_MASK          (BASE_PAGE_SIZE - 1)
   37.28 -#define BASE_PAGE_OFFSET(a)     ((a) & BASE_PAGE_MASK)
   37.29 -
   37.30 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_PAGING_H

    38.1 --- a/include/arch/beehive/barrelfish_kpi/registers_arch.h	Fri Jan 20 14:32:03 2012 -0800
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,71 +0,0 @@
    38.4 -/**
    38.5 - * \file
    38.6 - * \brief architecture-specific registers code
    38.7 - */
    38.8 -
    38.9 -/*
   38.10 - * Copyright (c) 2010, ETH Zurich.
   38.11 - * All rights reserved.
   38.12 - *
   38.13 - * This file is distributed under the terms in the attached LICENSE file.
   38.14 - * If you do not find this file, copies can be found by writing to:
   38.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   38.16 - */
   38.17 -
   38.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_REGISTERS_H
   38.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_REGISTERS_H
   38.20 -
   38.21 -// saved register 0 contains the count of words in RQ.  Currently
   38.22 -// if that is non-zero we panic.
   38.23 -
   38.24 -union registers_beehive {
   38.25 -    struct registers_beehive_named {
   38.26 -	uint32_t count;
   38.27 -	uint32_t return1, return2;
   38.28 -	uint32_t arg1, arg2, arg3, arg4, arg5, arg6;
   38.29 -	uint32_t save1, save2, save3, save4, save5, save6, save7, save8;
   38.30 -	uint32_t save9, save10, save11, save12, save13, save14;
   38.31 -	uint32_t frame;
   38.32 -	uint32_t t1, t2, t3;
   38.33 -	uint32_t p1;
   38.34 -	uint32_t stack;
   38.35 -	uint32_t vb;
   38.36 -	uint32_t link, pc;
   38.37 -	uint32_t rqvals[64];
   38.38 -    } named;
   38.39 -    uint32_t regs[sizeof(struct registers_beehive_named) / sizeof(uint32_t)];
   38.40 -};
   38.41 -
   38.42 -STATIC_ASSERT_SIZEOF(union registers_beehive, 96 * 4);
   38.43 -
   38.44 -///< Opaque handle for the register state
   38.45 -typedef union registers_beehive arch_registers_state_t;
   38.46 -
   38.47 -///< Opaque handle for the FPU register state
   38.48 -typedef void *arch_registers_fpu_state_t;
   38.49 -
   38.50 -static inline void
   38.51 -registers_set_entry(arch_registers_state_t *regs, lvaddr_t entry)
   38.52 -{
   38.53 -    regs->named.pc = (uint32_t)entry;
   38.54 -}
   38.55 -
   38.56 -static inline void
   38.57 -registers_set_param(arch_registers_state_t *regs, uint32_t param)
   38.58 -{
   38.59 -    regs->named.arg1 = param;
   38.60 -}
   38.61 -
   38.62 -static inline void
   38.63 -registers_get_param(arch_registers_state_t *regs, uint32_t *param)
   38.64 -{
   38.65 -    *param = regs->named.arg1;
   38.66 -}
   38.67 -
   38.68 -static inline uint32_t
   38.69 -registers_get_ip(arch_registers_state_t *regs)
   38.70 -{
   38.71 -    return regs->named.pc;
   38.72 -}
   38.73 -
   38.74 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_REGISTERS_H

    39.1 --- a/include/arch/beehive/barrelfish_kpi/spinlocks_arch.h	Fri Jan 20 14:32:03 2012 -0800
    39.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.3 @@ -1,35 +0,0 @@
    39.4 -/**
    39.5 - * \file
    39.6 - * \brief
    39.7 - */
    39.8 -
    39.9 -/*
   39.10 - * Copyright (c) 2010, ETH Zurich.
   39.11 - * All rights reserved.
   39.12 - *
   39.13 - * This file is distributed under the terms in the attached LICENSE file.
   39.14 - * If you do not find this file, copies can be found by writing to:
   39.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   39.16 - */
   39.17 -
   39.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_SPINLOCKS_H
   39.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_SPINLOCKS_H
   39.20 -
   39.21 -// required for kernel printf -- really!
   39.22 -// and it has to be here which is strange
   39.23 -// spinlock_t must be an integer because lots of places initialise it with = 0
   39.24 -typedef int spinlock_t;
   39.25 -
   39.26 -static inline void acquire_spinlock(spinlock_t *lock)
   39.27 -{
   39.28 -    assert(*lock == 0);
   39.29 -    *lock = 1;
   39.30 -}
   39.31 -
   39.32 -static inline void release_spinlock(spinlock_t *lock)
   39.33 -{
   39.34 -    assert(*lock == 1);
   39.35 -    *lock = 0;
   39.36 -}
   39.37 -
   39.38 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_SPINLOCKS_H

    40.1 --- a/include/arch/beehive/barrelfish_kpi/unknown_arch.h	Fri Jan 20 14:32:03 2012 -0800
    40.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.3 @@ -1,30 +0,0 @@
    40.4 -/**
    40.5 - * \file
    40.6 - * \brief Not sure where to put these definitions
    40.7 - */
    40.8 -
    40.9 -/*
   40.10 - * Copyright (c) 2010, ETH Zurich.
   40.11 - * All rights reserved.
   40.12 - *
   40.13 - * This file is distributed under the terms in the attached LICENSE file.
   40.14 - * If you do not find this file, copies can be found by writing to:
   40.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   40.16 - */
   40.17 -
   40.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_KPI_UNKNOWN_H
   40.19 -#define ARCH_BEEHIVE_BARRELFISH_KPI_UNKNOWN_H
   40.20 -
   40.21 -// required for lib/lwip/src/barrelfish/idc_barrelfish.c
   40.22 -
   40.23 -// We have a totally ordered memory system, but need to ensure that
   40.24 -// compiler optimised does not reorder across it.
   40.25 -#define mfence() __asm volatile("" : /*outs*/ : /*ins*/ : "memory")
   40.26 -
   40.27 -
   40.28 -// Provided by assembler
   40.29 -extern void bee_dcache_flush_rgn(void * a,size_t n);
   40.30 -
   40.31 -#define cache_flush_range(_b, _l) bee_dcache_flush_rgn((_b), (_l))
   40.32 -
   40.33 -#endif // ARCH_BEEHIVE_BARRELFISH_KPI_UNKNOWN_H

    41.1 --- a/include/arch/beehive/beej7.h	Fri Jan 20 14:32:03 2012 -0800
    41.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.3 @@ -1,26 +0,0 @@
    41.4 -/**
    41.5 - * \file
    41.6 - * \brief beehive j7 dop definitions
    41.7 - */
    41.8 -
    41.9 -/*
   41.10 - * Copyright (c) 2009, 2010, ETH Zurich.
   41.11 - * All rights reserved.
   41.12 - *
   41.13 - * This file is distributed under the terms in the attached LICENSE file.
   41.14 - * If you do not find this file, copies can be found by writing to:
   41.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   41.16 - */
   41.17 -
   41.18 -#ifndef ARCH_BEEHIVE_J7_H
   41.19 -#define ARCH_BEEHIVE_J7_H
   41.20 -
   41.21 -#define BEE_J7_NOP 0
   41.22 -#define BEE_J7_COREAREA 1
   41.23 -#define BEE_J7_SAVEDPC 2
   41.24 -#define BEE_J7_SAVEDLINK 3
   41.25 -#define BEE_J7_TEST_RQ_EMPTY 4
   41.26 -#define BEE_J7_TEST_RUNNING 5
   41.27 -#define BEE_J7_BREAKPOINT 6
   41.28 -
   41.29 -#endif // ARCH_BEEHIVE_J7_H

    42.1 --- a/include/arch/beehive/bench/bench_arch.h	Fri Jan 20 14:32:03 2012 -0800
    42.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.3 @@ -1,30 +0,0 @@
    42.4 -/**
    42.5 - * \file
    42.6 - * \brief Arch specific bench include.
    42.7 - */
    42.8 -
    42.9 -/*
   42.10 - * Copyright (c) 2010, ETH Zurich.
   42.11 - * All rights reserved.
   42.12 - *
   42.13 - * This file is distributed under the terms in the attached LICENSE file.
   42.14 - * If you do not find this file, copies can be found by writing to:
   42.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   42.16 - */
   42.17 -
   42.18 -#ifndef ARCH_BEEHIVE_BARRELFISH_BENCH_H
   42.19 -#define ARCH_BEEHIVE_BARRELFISH_BENCH_H
   42.20 -
   42.21 -#include <bench/bench.h>
   42.22 -
   42.23 -void bench_arch_init(void);
   42.24 -
   42.25 -/**
   42.26 - * \brief Take a timestamp
   42.27 - */
   42.28 -static inline cycles_t bench_tsc(void)
   42.29 -{
   42.30 -    return *(volatile size_t *)(0x22);
   42.31 -}
   42.32 -
   42.33 -#endif // ARCH_BEEHIVE_BARRELFISH_BENCH_H

    43.1 --- a/include/arch/beehive/corearea.h	Fri Jan 20 14:32:03 2012 -0800
    43.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.3 @@ -1,63 +0,0 @@
    43.4 -/**
    43.5 - * \file
    43.6 - * \brief Per-core debug stub save area
    43.7 - */
    43.8 -
    43.9 -/*
   43.10 - * Copyright (c) 2010, ETH Zurich.
   43.11 - * All rights reserved.
   43.12 - *
   43.13 - * This file is distributed under the terms in the attached LICENSE file.
   43.14 - * If you do not find this file, copies can be found by writing to:
   43.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   43.16 - */
   43.17 -
   43.18 -#ifndef ARCH_BEEHIVE_COREAREA_H
   43.19 -#define ARCH_BEEHIVE_COREAREA_H
   43.20 -
   43.21 -#include <barrelfish/static_assert.h>
   43.22 -
   43.23 -struct corearea {
   43.24 -    uint32_t regs[32];
   43.25 -    uint32_t rqarea[64];
   43.26 -    uint32_t flags0;
   43.27 -    uint32_t pad0[7];
   43.28 -    /* This next cache line is invalidated and read by the slave and
   43.29 -     * only ever written and flushed by the master */
   43.30 -    uint32_t master_stops;
   43.31 -    uint32_t master_ticks;
   43.32 -    uint32_t pad1[6];
   43.33 -    /* This next cache line is invalidated and read by the master and
   43.34 -     * only ever written and flushed by the slave */
   43.35 -    uint32_t slave_stops;
   43.36 -    uint32_t slave_ticks;
   43.37 -    uint32_t pad2[6];
   43.38 -    /* This cache line is used for communicating between the debug
   43.39 -     * stub and the kernel */
   43.40 -    uint32_t kernel_begins;  // code address
   43.41 -    uint32_t kernel_ends;    // code address
   43.42 -    uint32_t kernel_ticker;  // code address
   43.43 -    uint32_t kernel_pending; // != 0 implies software interrupt pending
   43.44 -    uint32_t syspad[3];
   43.45 -    uint32_t syscall;        // code address
   43.46 -};
   43.47 -
   43.48 -STATIC_ASSERT_SIZEOF(struct corearea, 128 * 4);
   43.49 -// Flags areas must be each in their own cache line
   43.50 -STATIC_ASSERT((sa_offsetof(struct corearea, flags0) & 31) == 0, "alignment");
   43.51 -STATIC_ASSERT((sa_offsetof(struct corearea, master_stops) & 31) == 0, "alignment");
   43.52 -STATIC_ASSERT((sa_offsetof(struct corearea, slave_stops) & 31) == 0, "alignment");
   43.53 -STATIC_ASSERT((sa_offsetof(struct corearea, kernel_begins) & 31) == 0, "alignment");
   43.54 -
   43.55 -#define COREAREA_FOR_CORE(_core) \
   43.56 -	((struct corearea *)(0x4000 + ((_core) << 9)))
   43.57 -
   43.58 -static inline struct corearea *my_corearea(void)
   43.59 -{
   43.60 -    struct corearea *result;
   43.61 -    __asm("j7 1; ld %[result], link"
   43.62 -	  : [result]"=r" (result) :: "link", "cc");
   43.63 -    return result;
   43.64 -}
   43.65 -
   43.66 -#endif // ARCH_BEEHIVE_COREAREA_H

    44.1 --- a/include/arch/beehive/dcache.h	Fri Jan 20 14:32:03 2012 -0800
    44.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.3 @@ -1,34 +0,0 @@
    44.4 -/**
    44.5 - * \file
    44.6 - * \brief Prototypes for Cache Management
    44.7 - */
    44.8 -
    44.9 -/*
   44.10 - * Copyright (c) 2010, ETH Zurich.
   44.11 - * All rights reserved.
   44.12 - *
   44.13 - * This file is distributed under the terms in the attached LICENSE file.
   44.14 - * If you do not find this file, copies can be found by writing to:
   44.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   44.16 - */
   44.17 -
   44.18 -#ifndef ARCH_BEEHIVE_DCACHE_H
   44.19 -#define ARCH_BEEHIVE_DCACHE_H
   44.20 -
   44.21 -/*
   44.22 - * Atomically flush and then invalidate the entire cache
   44.23 - */
   44.24 -
   44.25 -extern void bee_dcache_empty_all(void);
   44.26 -
   44.27 -/*
   44.28 - * Flush (with writeback) the entire cache
   44.29 - */
   44.30 -
   44.31 -static inline void bee_dcache_flush_all(void)
   44.32 -{
   44.33 -    __asm volatile ("aqw_long_ld vb,0x8001fc03 ROL 2"
   44.34 -	  ::: "link", "cc");
   44.35 -}
   44.36 -
   44.37 -#endif // ARCH_BEEHIVE_DCACHE_H

    45.1 --- a/include/arch/beehive/fenv.h	Fri Jan 20 14:32:03 2012 -0800
    45.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.3 @@ -1,217 +0,0 @@
    45.4 -/*-
    45.5 - * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
    45.6 - * All rights reserved.
    45.7 - *
    45.8 - * Redistribution and use in source and binary forms, with or without
    45.9 - * modification, are permitted provided that the following conditions
   45.10 - * are met:
   45.11 - * 1. Redistributions of source code must retain the above copyright
   45.12 - *    notice, this list of conditions and the following disclaimer.
   45.13 - * 2. Redistributions in binary form must reproduce the above copyright
   45.14 - *    notice, this list of conditions and the following disclaimer in the
   45.15 - *    documentation and/or other materials provided with the distribution.
   45.16 - *
   45.17 - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
   45.18 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   45.19 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   45.20 - * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
   45.21 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   45.22 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   45.23 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   45.24 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   45.25 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   45.26 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   45.27 - * SUCH DAMAGE.
   45.28 - *
   45.29 - * $FreeBSD: src/lib/msun/mips/fenv.h,v 1.1 2008/04/26 12:20:29 imp Exp $
   45.30 - */
   45.31 -
   45.32 -#ifndef	_FENV_H_
   45.33 -#define	_FENV_H_
   45.34 -
   45.35 -#include <sys/_types.h>
   45.36 -
   45.37 -typedef	__uint32_t	fenv_t;
   45.38 -typedef	__uint32_t	fexcept_t;
   45.39 -
   45.40 -/* Exception flags */
   45.41 -#define	FE_INVALID	0x0001
   45.42 -#define	FE_DIVBYZERO	0x0002
   45.43 -#define	FE_OVERFLOW	0x0004
   45.44 -#define	FE_UNDERFLOW	0x0008
   45.45 -#define	FE_INEXACT	0x0010
   45.46 -#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
   45.47 -			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
   45.48 -
   45.49 -/* Rounding modes */
   45.50 -#define	FE_TONEAREST	0x0000
   45.51 -#define	FE_TOWARDZERO	0x0001
   45.52 -#define	FE_UPWARD	0x0002
   45.53 -#define	FE_DOWNWARD	0x0003
   45.54 -#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
   45.55 -			 FE_UPWARD | FE_TOWARDZERO)
   45.56 -__BEGIN_DECLS
   45.57 -
   45.58 -/* Default floating-point environment */
   45.59 -extern const fenv_t	__fe_dfl_env;
   45.60 -#define	FE_DFL_ENV	(&__fe_dfl_env)
   45.61 -
   45.62 -/* We need to be able to map status flag positions to mask flag positions */
   45.63 -#define _FPUSW_SHIFT	16
   45.64 -#define	_ENABLE_MASK	(FE_ALL_EXCEPT << _FPUSW_SHIFT)
   45.65 -
   45.66 -#ifdef	ARM_HARD_FLOAT
   45.67 -#define	__rfs(__fpsr)	__asm __volatile("rfs %0" : "=r" (*(__fpsr)))
   45.68 -#define	__wfs(__fpsr)	__asm __volatile("wfs %0" : : "r" (__fpsr))
   45.69 -#else
   45.70 -#define __rfs(__fpsr)
   45.71 -#define __wfs(__fpsr)
   45.72 -#endif
   45.73 -
   45.74 -static __inline int
   45.75 -feclearexcept(int __excepts)
   45.76 -{
   45.77 -	fexcept_t __fpsr;
   45.78 -
   45.79 -	__rfs(&__fpsr);
   45.80 -	__fpsr &= ~__excepts;
   45.81 -	__wfs(__fpsr);
   45.82 -	return (0);
   45.83 -}
   45.84 -
   45.85 -static __inline int
   45.86 -fegetexceptflag(fexcept_t *__flagp, int __excepts)
   45.87 -{
   45.88 -	fexcept_t __fpsr;
   45.89 -
   45.90 -	__rfs(&__fpsr);
   45.91 -	*__flagp = __fpsr & __excepts;
   45.92 -	return (0);
   45.93 -}
   45.94 -
   45.95 -static __inline int
   45.96 -fesetexceptflag(const fexcept_t *__flagp, int __excepts)
   45.97 -{
   45.98 -	fexcept_t __fpsr;
   45.99 -
  45.100 -	__rfs(&__fpsr);
  45.101 -	__fpsr &= ~__excepts;
  45.102 -	__fpsr |= *__flagp & __excepts;
  45.103 -	__wfs(__fpsr);
  45.104 -	return (0);
  45.105 -}
  45.106 -
  45.107 -static __inline int
  45.108 -feraiseexcept(int __excepts)
  45.109 -{
  45.110 -	fexcept_t __ex = __excepts;
  45.111 -
  45.112 -	fesetexceptflag(&__ex, __excepts);	/* XXX */
  45.113 -	return (0);
  45.114 -}
  45.115 -
  45.116 -static __inline int
  45.117 -fetestexcept(int __excepts)
  45.118 -{
  45.119 -	fexcept_t __fpsr;
  45.120 -
  45.121 -	__rfs(&__fpsr);
  45.122 -	return (__fpsr & __excepts);
  45.123 -}
  45.124 -
  45.125 -static __inline int
  45.126 -fegetround(void)
  45.127 -{
  45.128 -
  45.129 -	/*
  45.130 -	 * Apparently, the rounding mode is specified as part of the
  45.131 -	 * instruction format on ARM, so the dynamic rounding mode is
  45.132 -	 * indeterminate.  Some FPUs may differ.
  45.133 -	 */
  45.134 -	return (-1);
  45.135 -}
  45.136 -
  45.137 -static __inline int
  45.138 -fesetround(int __round)
  45.139 -{
  45.140 -
  45.141 -	return (-1);
  45.142 -}
  45.143 -
  45.144 -static __inline int
  45.145 -fegetenv(fenv_t *__envp)
  45.146 -{
  45.147 -
  45.148 -	__rfs(__envp);
  45.149 -	return (0);
  45.150 -}
  45.151 -
  45.152 -static __inline int
  45.153 -feholdexcept(fenv_t *__envp)
  45.154 -{
  45.155 -	fenv_t __env;
  45.156 -
  45.157 -	__rfs(&__env);
  45.158 -	*__envp = __env;
  45.159 -	__env &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
  45.160 -	__wfs(__env);
  45.161 -	return (0);
  45.162 -}
  45.163 -
  45.164 -static __inline int
  45.165 -fesetenv(const fenv_t *__envp)
  45.166 -{
  45.167 -
  45.168 -	__wfs(*__envp);
  45.169 -	return (0);
  45.170 -}
  45.171 -
  45.172 -static __inline int
  45.173 -feupdateenv(const fenv_t *__envp)
  45.174 -{
  45.175 -	fexcept_t __fpsr;
  45.176 -
  45.177 -	__rfs(&__fpsr);
  45.178 -	__wfs(*__envp);
  45.179 -	feraiseexcept(__fpsr & FE_ALL_EXCEPT);
  45.180 -	return (0);
  45.181 -}
  45.182 -
  45.183 -#if __BSD_VISIBLE
  45.184 -
  45.185 -static __inline int
  45.186 -feenableexcept(int __mask)
  45.187 -{
  45.188 -	fenv_t __old_fpsr, __new_fpsr;
  45.189 -
  45.190 -	__rfs(&__old_fpsr);
  45.191 -	__new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT;
  45.192 -	__wfs(__new_fpsr);
  45.193 -	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
  45.194 -}
  45.195 -
  45.196 -static __inline int
  45.197 -fedisableexcept(int __mask)
  45.198 -{
  45.199 -	fenv_t __old_fpsr, __new_fpsr;
  45.200 -
  45.201 -	__rfs(&__old_fpsr);
  45.202 -	__new_fpsr = __old_fpsr & ~((__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
  45.203 -	__wfs(__new_fpsr);
  45.204 -	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
  45.205 -}
  45.206 -
  45.207 -static __inline int
  45.208 -fegetexcept(void)
  45.209 -{
  45.210 -	fenv_t __fpsr;
  45.211 -
  45.212 -	__rfs(&__fpsr);
  45.213 -	return ((__fpsr & _ENABLE_MASK) >> _FPUSW_SHIFT);
  45.214 -}
  45.215 -
  45.216 -#endif /* __BSD_VISIBLE */
  45.217 -
  45.218 -__END_DECLS
  45.219 -
  45.220 -#endif	/* !_FENV_H_ */

    46.1 --- a/include/arch/beehive/float.h	Fri Jan 20 14:32:03 2012 -0800
    46.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    46.3 @@ -1,83 +0,0 @@
    46.4 -/*      $NetBSD: float.h,v 1.6 2005/12/11 12:16:47 christos Exp $       */
    46.5 -/*      $NetBSD: float_ieee754.h,v 1.8 2005/12/11 12:25:20 christos Exp $       */
    46.6 -
    46.7 -/*
    46.8 - * Copyright (c) 1992, 1993
    46.9 - *      The Regents of the University of California.  All rights reserved.
   46.10 - *
   46.11 - * Redistribution and use in source and binary forms, with or without
   46.12 - * modification, are permitted provided that the following conditions
   46.13 - * are met:
   46.14 - * 1. Redistributions of source code must retain the above copyright
   46.15 - *    notice, this list of conditions and the following disclaimer.
   46.16 - * 2. Redistributions in binary form must reproduce the above copyright
   46.17 - *    notice, this list of conditions and the following disclaimer in the
   46.18 - *    documentation and/or other materials provided with the distribution.
   46.19 - * 3. Neither the name of the University nor the names of its contributors
   46.20 - *    may be used to endorse or promote products derived from this software
   46.21 - *    without specific prior written permission.
   46.22 - *
   46.23 - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
   46.24 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   46.25 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   46.26 - * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
   46.27 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   46.28 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   46.29 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   46.30 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   46.31 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   46.32 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   46.33 - * SUCH DAMAGE.
   46.34 - *
   46.35 - *      @(#)float.h     8.1 (Berkeley) 6/10/93
   46.36 - */
   46.37 -
   46.38 -#ifndef _ARM_FLOAT_H_
   46.39 -#define _ARM_FLOAT_H_
   46.40 -
   46.41 -#include <sys/cdefs.h>
   46.42 -
   46.43 -#ifndef FLT_ROUNDS
   46.44 -__BEGIN_DECLS
   46.45 -extern int __flt_rounds(void);
   46.46 -__END_DECLS
   46.47 -#define FLT_ROUNDS      -1 /* __flt_rounds() */
   46.48 -#endif
   46.49 -
   46.50 -#define FLT_EVAL_METHOD (-1)            /* XXX */
   46.51 -
   46.52 -#define LDBL_MANT_DIG   64
   46.53 -#define LDBL_EPSILON    1.0842021724855044340E-19L
   46.54 -#define LDBL_DIG        18
   46.55 -#define LDBL_MIN_EXP    (-16381)
   46.56 -#define LDBL_MIN        1.6810515715560467531E-4932L
   46.57 -#define LDBL_MIN_10_EXP (-4931)
   46.58 -#define LDBL_MAX_EXP    16384
   46.59 -#define LDBL_MAX        1.1897314953572317650E+4932L
   46.60 -#define LDBL_MAX_10_EXP 4932
   46.61 -
   46.62 -#define FLT_RADIX       2               /* b */
   46.63 -
   46.64 -#define FLT_MANT_DIG    24              /* p */
   46.65 -#define FLT_EPSILON     1.19209290E-7F  /* b**(1-p) */
   46.66 -#define FLT_DIG         6               /* floor((p-1)*log10(b))+(b == 10) */
   46.67 -#define FLT_MIN_EXP     (-125)          /* emin */
   46.68 -#define FLT_MIN         1.17549435E-38F /* b**(emin-1) */
   46.69 -#define FLT_MIN_10_EXP  (-37)           /* ceil(log10(b**(emin-1))) */
   46.70 -#define FLT_MAX_EXP     128             /* emax */
   46.71 -#define FLT_MAX         3.40282347E+38F /* (1-b**(-p))*b**emax */
   46.72 -#define FLT_MAX_10_EXP  38              /* floor(log10((1-b**(-p))*b**emax)) */
   46.73 -
   46.74 -#define DBL_MANT_DIG    53
   46.75 -#define DBL_EPSILON     2.2204460492503131E-16
   46.76 -#define DBL_DIG         15
   46.77 -#define DBL_MIN_EXP     (-1021)
   46.78 -#define DBL_MIN         2.2250738585072014E-308
   46.79 -#define DBL_MIN_10_EXP  (-307)
   46.80 -#define DBL_MAX_EXP     1024
   46.81 -#define DBL_MAX         1.7976931348623157E+308
   46.82 -#define DBL_MAX_10_EXP  308
   46.83 -
   46.84 -#define DECIMAL_DIG     17              /* ceil((1+p*log10(b))-(b==10) */
   46.85 -
   46.86 -#endif /* !_ARM_FLOAT_H_ */

    47.1 --- a/include/arch/beehive/machine/_limits.h	Fri Jan 20 14:32:03 2012 -0800
    47.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    47.3 @@ -1,100 +0,0 @@
    47.4 -/*-
    47.5 - * Copyright (c) 1988, 1993
    47.6 - *	The Regents of the University of California.  All rights reserved.
    47.7 - *
    47.8 - * Redistribution and use in source and binary forms, with or without
    47.9 - * modification, are permitted provided that the following conditions
   47.10 - * are met:
   47.11 - * 1. Redistributions of source code must retain the above copyright
   47.12 - *    notice, this list of conditions and the following disclaimer.
   47.13 - * 2. Redistributions in binary form must reproduce the above copyright
   47.14 - *    notice, this list of conditions and the following disclaimer in the
   47.15 - *    documentation and/or other materials provided with the distribution.
   47.16 - * 4. Neither the name of the University nor the names of its contributors
   47.17 - *    may be used to endorse or promote products derived from this software
   47.18 - *    without specific prior written permission.
   47.19 - *
   47.20 - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
   47.21 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   47.22 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   47.23 - * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
   47.24 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   47.25 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   47.26 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   47.27 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   47.28 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   47.29 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   47.30 - * SUCH DAMAGE.
   47.31 - *
   47.32 - *	@(#)limits.h	8.3 (Berkeley) 1/4/94
   47.33 - * $FreeBSD$
   47.34 - */
   47.35 -
   47.36 -#ifndef _MACHINE__LIMITS_H_
   47.37 -#define	_MACHINE__LIMITS_H_
   47.38 -
   47.39 -/*
   47.40 - * According to ANSI (section 2.2.4.2), the values below must be usable by
   47.41 - * #if preprocessing directives.  Additionally, the expression must have the
   47.42 - * same type as would an expression that is an object of the corresponding
   47.43 - * type converted according to the integral promotions.  The subtraction for
   47.44 - * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
   47.45 - * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
   47.46 - * These numbers are for the default configuration of gcc.  They work for
   47.47 - * some other compilers as well, but this should not be depended on.
   47.48 - */
   47.49 -
   47.50 -#define	__CHAR_BIT	8		/* number of bits in a char */
   47.51 -
   47.52 -#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
   47.53 -#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
   47.54 -
   47.55 -#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
   47.56 -
   47.57 -#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
   47.58 -#define	__SHRT_MAX	0x7fff		/* max value for a short */
   47.59 -#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
   47.60 -
   47.61 -#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
   47.62 -#define	__INT_MAX	0x7fffffff	/* max value for an int */
   47.63 -#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
   47.64 -
   47.65 -/* Bad hack for gcc configured to give 64-bit longs. */
   47.66 -#ifdef _LARGE_LONG
   47.67 -#define	__ULONG_MAX	0xffffffffffffffffUL
   47.68 -#define	__LONG_MAX	0x7fffffffffffffffL
   47.69 -#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
   47.70 -#else
   47.71 -#define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
   47.72 -#define	__LONG_MAX	0x7fffffffL	/* max value for a long */
   47.73 -#define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
   47.74 -#endif
   47.75 -
   47.76 -			/* max value for an unsigned long long */
   47.77 -#define	__ULLONG_MAX	0xffffffffffffffffULL
   47.78 -#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
   47.79 -#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
   47.80 -
   47.81 -#define	__SSIZE_MAX	__INT_MAX	/* max value for a ssize_t */
   47.82 -
   47.83 -#define	__SIZE_T_MAX	__UINT_MAX	/* max value for a size_t */
   47.84 -
   47.85 -#define	__OFF_MAX	__LLONG_MAX	/* max value for a off_t */
   47.86 -#define	__OFF_MIN	__LLONG_MIN	/* min value for a off_t */
   47.87 -
   47.88 -/* Quads and long longs are the same size.  Ensure they stay in sync. */
   47.89 -#define	__UQUAD_MAX	__ULLONG_MAX	/* max value for a uquad_t */
   47.90 -#define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
   47.91 -#define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
   47.92 -
   47.93 -#ifdef _LARGE_LONG
   47.94 -#define	__LONG_BIT	64
   47.95 -#else
   47.96 -#define	__LONG_BIT	32
   47.97 -#endif
   47.98 -#define	__WORD_BIT	32
   47.99 -
  47.100 -/* Minimum signal stack size. */
  47.101 -#define	__MINSIGSTKSZ	(1024 * 4)
  47.102 -
  47.103 -#endif /* !_MACHINE__LIMITS_H_ */

    48.1 --- a/include/arch/beehive/machine/endian.h	Fri Jan 20 14:32:03 2012 -0800
    48.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    48.3 @@ -1,129 +0,0 @@
    48.4 -/*-
    48.5 - * Copyright (c) 2001 David E. O'Brien
    48.6 - *
    48.7 - * Redistribution and use in source and binary forms, with or without
    48.8 - * modification, are permitted provided that the following conditions
    48.9 - * are met:
   48.10 - * 1. Redistributions of source code must retain the above copyright
   48.11 - *    notice, this list of conditions and the following disclaimer.
   48.12 - * 2. Redistributions in binary form must reproduce the above copyright
   48.13 - *    notice, this list of conditions and the following disclaimer in the
   48.14 - *    documentation and/or other materials provided with the distribution.
   48.15 - * 3. Neither the name of the University nor the names of its contributors
   48.16 - *    may be used to endorse or promote products derived from this software
   48.17 - *    without specific prior written permission.
   48.18 - *
   48.19 - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
   48.20 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   48.21 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   48.22 - * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
   48.23 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   48.24 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   48.25 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   48.26 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   48.27 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   48.28 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   48.29 - * SUCH DAMAGE.
   48.30 - *
   48.31 - *	@(#)endian.h	8.1 (Berkeley) 6/10/93
   48.32 - * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
   48.33 - * $FreeBSD$
   48.34 - */
   48.35 -
   48.36 -#ifndef _ENDIAN_H_
   48.37 -#define	_ENDIAN_H_
   48.38 -
   48.39 -#include <sys/_types.h>
   48.40 -
   48.41 -/*
   48.42 - * Definitions for byte order, according to byte significance from low
   48.43 - * address to high.
   48.44 - */
   48.45 -#define _LITTLE_ENDIAN  1234    /* LSB first: i386, vax */
   48.46 -#define _BIG_ENDIAN     4321    /* MSB first: 68000, ibm, net */
   48.47 -#define _PDP_ENDIAN     3412    /* LSB first in word, MSW first in long */
   48.48 -
   48.49 -#define	_BYTE_ORDER	_LITTLE_ENDIAN
   48.50 -
   48.51 -#if __BSD_VISIBLE
   48.52 -#define LITTLE_ENDIAN   _LITTLE_ENDIAN
   48.53 -#define BIG_ENDIAN      _BIG_ENDIAN
   48.54 -#define PDP_ENDIAN      _PDP_ENDIAN
   48.55 -#define BYTE_ORDER      _BYTE_ORDER
   48.56 -#endif
   48.57 -
   48.58 -#define _QUAD_HIGHWORD  1
   48.59 -#define _QUAD_LOWWORD 0
   48.60 -#define __ntohl(x)        (__bswap32(x))
   48.61 -#define __ntohs(x)        (__bswap16(x))
   48.62 -#define __htonl(x)        (__bswap32(x))
   48.63 -#define __htons(x)        (__bswap16(x))
   48.64 -
   48.65 -
   48.66 -static __inline __uint64_t
   48.67 -__bswap64(__uint64_t _x)
   48.68 -{
   48.69 -
   48.70 -	return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
   48.71 -	    ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
   48.72 -	    ((_x << 24) & ((__uint64_t)0xff << 40)) | 
   48.73 -	    ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
   48.74 -}
   48.75 -
   48.76 -static __inline __uint32_t
   48.77 -__bswap32_var(__uint32_t v)
   48.78 -{
   48.79 -	__uint32_t t1;
   48.80 -
   48.81 -	__asm __volatile("eor %1, %0, %0, ror #16\n"
   48.82 -	    		"bic %1, %1, #0x00ff0000\n"
   48.83 -			"mov %0, %0, ror #8\n"
   48.84 -			"eor %0, %0, %1, lsr #8\n"
   48.85 -			 : "+r" (v), "=r" (t1));
   48.86 -	
   48.87 -	return (v);
   48.88 -}
   48.89 -
   48.90 -static __inline __uint16_t
   48.91 -__bswap16_var(__uint16_t v)
   48.92 -{
   48.93 -	__uint32_t ret = v & 0xffff;
   48.94 -
   48.95 -	__asm __volatile(
   48.96 -	    "mov    %0, %0, ror #8\n"
   48.97 -	    "orr    %0, %0, %0, lsr #16\n"
   48.98 -	    "bic    %0, %0, %0, lsl #16"
   48.99 -	    : "+r" (ret));
  48.100 -	
  48.101 -	return ((__uint16_t)ret);
  48.102 -}		
  48.103 -
  48.104 -#ifdef __OPTIMIZE__
  48.105 -
  48.106 -#define __bswap32_constant(x)	\
  48.107 -    ((((x) & 0xff000000U) >> 24) |	\
  48.108 -     (((x) & 0x00ff0000U) >>  8) |	\
  48.109 -     (((x) & 0x0000ff00U) <<  8) |	\
  48.110 -     (((x) & 0x000000ffU) << 24))
  48.111 -
  48.112 -#define __bswap16_constant(x)	\
  48.113 -    ((((x) & 0xff00) >> 8) |		\
  48.114 -     (((x) & 0x00ff) << 8))
  48.115 -
  48.116 -#define __bswap16(x)	\
  48.117 -    ((__uint16_t)(__builtin_constant_p(x) ?	\
  48.118 -     __bswap16_constant(x) :			\
  48.119 -     __bswap16_var(x)))
  48.120 -
  48.121 -#define __bswap32(x)	\
  48.122 -    ((__uint32_t)(__builtin_constant_p(x) ? 	\
  48.123 -     __bswap32_constant(x) :			\
  48.124 -     __bswap32_var(x)))
  48.125 -
  48.126 -#else
  48.127 -#define __bswap16(x)	__bswap16_var(x)
  48.128 -#define __bswap32(x)	__bswap32_var(x)
  48.129 -
  48.130 -#endif /* __OPTIMIZE__ */
  48.131 -#endif /* !_ENDIAN_H_ */
  48.132 -

    49.1 --- a/include/arch/beehive/regconvention.h	Fri Jan 20 14:32:03 2012 -0800
    49.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    49.3 @@ -1,70 +0,0 @@
    49.4 -/*
    49.5 - * Copyright (c) 2009, ETH Zurich.
    49.6 - * All rights reserved.
    49.7 - *
    49.8 - * This file is distributed under the terms in the attached LICENSE file.
    49.9 - * If you do not find this file, copies can be found by writing to:
   49.10 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   49.11 - */
   49.12 -
   49.13 -// ------------------------------------------------------------
   49.14 -// Standard assembler definitions
   49.15 -
   49.16 -r0 = $0      // fixed zero
   49.17 -r1 = $1      // function return 1
   49.18 -r2 = $2      // not callee save, function return 2
   49.19 -r3 = $3      // not callee save, function argument 1
   49.20 -r4 = $4      // not callee save, function argument 2
   49.21 -r5 = $5      // not callee save, function argument 3
   49.22 -r6 = $6      // not callee save, function argument 4
   49.23 -r7 = $7      // not callee save, function argument 5
   49.24 -r8 = $8      // not callee save, function argument 6
   49.25 -r9 = $9      // callee save
   49.26 -r10 = $10    // callee save
   49.27 -r11 = $11    // callee save
   49.28 -r12 = $12    // callee save
   49.29 -r13 = $13    // callee save
   49.30 -r14 = $14    // callee save
   49.31 -r15 = $15    // callee save
   49.32 -r16 = $16    // callee save
   49.33 -r17 = $17    // callee save
   49.34 -r18 = $18    // callee save
   49.35 -r19 = $19    // callee save
   49.36 -r20 = $20    // callee save
   49.37 -r21 = $21    // callee save
   49.38 -r22 = $22    // callee save
   49.39 -
   49.40 -fp = $23     // callee save, frame pointer
   49.41 -t1 = $24     // not callee save, temporary 1, not avail for reg alloc
   49.42 -t2 = $25     // not callee save, temporary 2, not avail for reg alloc
   49.43 -t3 = $26     // not callee save, temporary 3, not avail for reg alloc
   49.44 -p1 = $27     // not callee save, platform 1, not avail for reg alloc
   49.45 -sp = $28     // callee save, stack pointer
   49.46 -vb = $29     // not callee save, rw & rb only, not avail for reg alloc
   49.47 -
   49.48 -zero = $0    // fixed zero
   49.49 -void = $0    // discard register
   49.50 -a1 = $3      // not callee save, function argument 1
   49.51 -a2 = $4      // not callee save, function argument 2
   49.52 -a3 = $5      // not callee save, function argument 3
   49.53 -a4 = $6      // not callee save, function argument 4
   49.54 -a5 = $7      // not callee save, function argument 5
   49.55 -a6 = $8      // not callee save, function argument 6
   49.56 -s1 = $9      // callee save
   49.57 -s2 = $10     // callee save
   49.58 -s3 = $11     // callee save
   49.59 -s4 = $12     // callee save
   49.60 -s5 = $13     // callee save
   49.61 -s6 = $14     // callee save
   49.62 -s7 = $15     // callee save
   49.63 -s8 = $16     // callee save
   49.64 -s9 = $17     // callee save
   49.65 -s10 = $18    // callee save
   49.66 -s11 = $19    // callee save
   49.67 -s12 = $20    // callee save
   49.68 -s13 = $21    // callee save
   49.69 -s14 = $22    // callee save
   49.70 -
   49.71 -    .assume   zero,0
   49.72 -
   49.73 -// ------------------------------------------------------------

    50.1 --- a/include/arch/beehive/simctrl.h	Fri Jan 20 14:32:03 2012 -0800
    50.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    50.3 @@ -1,40 +0,0 @@
    50.4 -/**
    50.5 - * \file
    50.6 - * \brief simulator control pseudo-instructions
    50.7 - */
    50.8 -
    50.9 -/*
   50.10 - * Copyright (c) 2009, 2010, ETH Zurich.
   50.11 - * All rights reserved.
   50.12 - *
   50.13 - * This file is distributed under the terms in the attached LICENSE file.
   50.14 - * If you do not find this file, copies can be found by writing to:
   50.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   50.16 - */
   50.17 -
   50.18 -#ifndef ARCH_BEEHIVE_SIMCTRL_H
   50.19 -#define ARCH_BEEHIVE_SIMCTRL_H
   50.20 -
   50.21 -#define BEE_SIMCTRL_NOP 0
   50.22 -#define BEE_SIMCTRL_TERMINATE 1
   50.23 -#define BEE_SIMCTRL_TRACEON 2
   50.24 -#define BEE_SIMCTRL_TRACEOFF 3
   50.25 -#define BEE_SIMCTRL_REGISTERS 4
   50.26 -#define BEE_SIMCTRL_ILLEGAL 5
   50.27 -#define BEE_SIMCTRL_NOSEQTRACE 6
   50.28 -#define BEE_SIMCTRL_ADDRCHECK 7
   50.29 -#define BEE_SIMCTRL_CACHE_DELTA 8
   50.30 -#define BEE_SIMCTRL_CACHE_STAT 9
   50.31 -#define BEE_SIMCTRL_BREAK_SIM 10
   50.32 -#define BEE_SIMCTRL_TRACE 11
   50.33 -#define BEE_SIMCTRL_HALT 12
   50.34 -
   50.35 -#ifndef __ASSEMBLER__
   50.36 -#include <sys/cdefs.h>
   50.37 -
   50.38 -#define BEE_SIMCTRL(_s) \
   50.39 -    __asm volatile("simctrl " __XSTRING(_s) ";")
   50.40 -
   50.41 -#endif // __ASSEMBLER__
   50.42 -
   50.43 -#endif // ARCH_BEEHIVE_SIMCTRL_H

    51.1 --- a/include/arch/beehive/stopcode.h	Fri Jan 20 14:32:03 2012 -0800
    51.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    51.3 @@ -1,23 +0,0 @@
    51.4 -/**
    51.5 - * \file
    51.6 - * \brief beehive slave stopcode definitions
    51.7 - */
    51.8 -
    51.9 -/*
   51.10 - * Copyright (c) 2010, ETH Zurich.
   51.11 - * All rights reserved.
   51.12 - *
   51.13 - * This file is distributed under the terms in the attached LICENSE file.
   51.14 - * If you do not find this file, copies can be found by writing to:
   51.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   51.16 - */
   51.17 -
   51.18 -#ifndef ARCH_BEEHIVE_STOPCODE_H
   51.19 -#define ARCH_BEEHIVE_STOPCODE_H
   51.20 -
   51.21 -#define STOPCODE_POWERUP 0
   51.22 -#define STOPCODE_TIMER 1
   51.23 -#define STOPCODE_STOP 2
   51.24 -#define STOPCODE_BREAK 3
   51.25 -
   51.26 -#endif // ARCH_BEEHIVE_STOPCODE_H

    52.1 --- a/include/barrelfish/barrelfish.h	Fri Jan 20 14:32:03 2012 -0800
    52.2 +++ b/include/barrelfish/barrelfish.h	Mon Jan 23 11:04:15 2012 -0800
    52.3 @@ -16,13 +16,6 @@
    52.4  #ifndef LIBBARRELFISH_BARRELFISH_H
    52.5  #define LIBBARRELFISH_BARRELFISH_H
    52.6  
    52.7 -/* Beehive does not support translation
    52.8 - * XXX Should really be defined in a plaform config file
    52.9 - */
   52.10 -#ifdef __BEEHIVE__
   52.11 -#define NOTRANS
   52.12 -#endif
   52.13 -
   52.14  /* standard libc types and assert */
   52.15  #include <stdint.h>
   52.16  #include <stddef.h>

    53.1 --- a/include/barrelfish/caddr.h	Fri Jan 20 14:32:03 2012 -0800
    53.2 +++ b/include/barrelfish/caddr.h	Mon Jan 23 11:04:15 2012 -0800
    53.3 @@ -55,7 +55,7 @@
    53.4  
    53.5  /* well-known capabilities */
    53.6  extern struct capref cap_root, cap_monitorep, cap_irq, cap_io, cap_dispatcher,
    53.7 -  cap_selfep, cap_kernel, cap_initep, cap_bmptable, cap_perfmon, cap_dispframe;
    53.8 +  cap_selfep, cap_kernel, cap_initep, cap_perfmon, cap_dispframe;
    53.9  
   53.10  /**
   53.11   * \brief Returns the number of valid bits in the CSpace address of a cap

    54.1 --- a/include/barrelfish/core_state.h	Fri Jan 20 14:32:03 2012 -0800
    54.2 +++ b/include/barrelfish/core_state.h	Mon Jan 23 11:04:15 2012 -0800
    54.3 @@ -46,9 +46,7 @@
    54.4      Header *header_freep;
    54.5      struct vspace_mmu_aware mmu_state;
    54.6  #if 0 // DELETEME
    54.7 -#ifndef NOTRANS
    54.8      struct captrack track_frames[MAX_TRACK_FRAMES];
    54.9 -#endif
   54.10  #endif // 0 DELETEME
   54.11  };
   54.12  

    55.1 --- a/include/barrelfish/dispatcher.h	Fri Jan 20 14:32:03 2012 -0800
    55.2 +++ b/include/barrelfish/dispatcher.h	Mon Jan 23 11:04:15 2012 -0800
    55.3 @@ -21,7 +21,6 @@
    55.4  #include <barrelfish/threads.h>
    55.5  
    55.6  struct lmp_chan;
    55.7 -struct bmp_chan;
    55.8  struct deferred_event;
    55.9  
   55.10  // Architecture generic user only dispatcher struct
   55.11 @@ -51,11 +50,6 @@
   55.12      struct heap lmp_endpoint_heap;
   55.13  #endif // CONFIG_INTERCONNECT_DRIVER_LMP
   55.14  
   55.15 -#ifdef CONFIG_INTERCONNECT_DRIVER_BMP
   55.16 -    /// List of BMP channels waiting to retry a send
   55.17 -    struct bmp_chan *bmp_send_events_list;
   55.18 -#endif
   55.19 -
   55.20      /// Queue of deferred events (i.e. timers)
   55.21      struct deferred_event *deferred_events;
   55.22  

    56.1 --- a/include/barrelfish/idc.h	Fri Jan 20 14:32:03 2012 -0800
    56.2 +++ b/include/barrelfish/idc.h	Mon Jan 23 11:04:15 2012 -0800
    56.3 @@ -52,10 +52,6 @@
    56.4  #include <barrelfish/ump_chan.h>
    56.5  #endif
    56.6  
    56.7 -#ifdef CONFIG_INTERCONNECT_DRIVER_BMP
    56.8 -#include <barrelfish/bmp_chan.h>
    56.9 -#endif
   56.10 -
   56.11  #if defined(CONFIG_FLOUNDER_BACKEND_UMP_IPI)
   56.12  #include <arch/x86/barrelfish/ipi_notify.h>
   56.13  #endif

    57.1 --- a/include/barrelfish/idc_export.h	Fri Jan 20 14:32:03 2012 -0800
    57.2 +++ b/include/barrelfish/idc_export.h	Mon Jan 23 11:04:15 2012 -0800
    57.3 @@ -33,12 +33,6 @@
    57.4                                           struct capref notify_cap);
    57.5  #endif // CONFIG_INTERCONNECT_DRIVER_UMP
    57.6  
    57.7 -#ifdef CONFIG_INTERCONNECT_DRIVER_BMP
    57.8 -typedef errval_t bmp_connect_callback_fn(void *st, struct monitor_binding *mb,
    57.9 -                                         uintptr_t mon_id, struct capref bee_ep,
   57.10 -                                         size_t remote_ep_len);
   57.11 -#endif // CONFIG_INTERCONNECT_DRIVER_BMP
   57.12 -
   57.13  #ifdef CONFIG_INTERCONNECT_DRIVER_MULTIHOP
   57.14  typedef errval_t multihop_connect_callback_fn(void *st, uint64_t vci);
   57.15  #endif // CONFIG_INTERCONNECT_DRIVER_MULTIHOP
   57.16 @@ -58,9 +52,6 @@
   57.17  #ifdef CONFIG_INTERCONNECT_DRIVER_UMP
   57.18      ump_connect_callback_fn *ump_connect_callback;
   57.19  #endif
   57.20 -#ifdef CONFIG_INTERCONNECT_DRIVER_BMP
   57.21 -    bmp_connect_callback_fn *bmp_connect_callback;
   57.22 -#endif
   57.23  #ifdef CONFIG_INTERCONNECT_DRIVER_MULTIHOP
   57.24    multihop_connect_callback_fn *multihop_connect_callback;
   57.25  #endif

    58.1 --- a/include/barrelfish/ump_impl.h	Fri Jan 20 14:32:03 2012 -0800
    58.2 +++ b/include/barrelfish/ump_impl.h	Mon Jan 23 11:04:15 2012 -0800
    58.3 @@ -31,8 +31,6 @@
    58.4  # else
    58.5  #  define CACHELINE_BYTES 64
    58.6  # endif
    58.7 -#elif defined(__BEEHIVE__)
    58.8 -#  define CACHELINE_BYTES 32
    58.9  #elif defined(__arm__)
   58.10  #  define CACHELINE_BYTES 32
   58.11  #else

    59.1 --- a/include/barrelfish/vspace_mmu_aware.h	Fri Jan 20 14:32:03 2012 -0800
    59.2 +++ b/include/barrelfish/vspace_mmu_aware.h	Mon Jan 23 11:04:15 2012 -0800
    59.3 @@ -24,17 +24,10 @@
    59.4  struct vspace_mmu_aware {
    59.5      size_t size;
    59.6      size_t consumed;
    59.7 -#ifdef NOTRANS
    59.8 -    struct vspace_mmu_vregion_list *head;
    59.9 -    struct memobj *memobj;
   59.10 -    struct vspace_mmu_vregion_list init_list;    ///< One to initialize
   59.11 -    struct memobj_one_frame_one_map init_memobj; ///< One to initialize
   59.12 -#else
   59.13      struct vregion vregion;           ///< Needs just one vregion
   59.14      struct memobj_anon memobj;        ///< Needs just one memobj
   59.15      lvaddr_t offset;    ///< Offset of free space in anon
   59.16      lvaddr_t mapoffset; ///< Offset into the anon that has been mapped in
   59.17 -#endif
   59.18  };
   59.19  
   59.20  errval_t vspace_mmu_aware_init(struct vspace_mmu_aware *state, size_t size);

    60.1 --- a/include/barrelfish/waitset.h	Fri Jan 20 14:32:03 2012 -0800
    60.2 +++ b/include/barrelfish/waitset.h	Mon Jan 23 11:04:15 2012 -0800
    60.3 @@ -37,7 +37,6 @@
    60.4      CHANTYPE_LMP_IN,
    60.5      CHANTYPE_LMP_OUT,
    60.6      CHANTYPE_UMP_IN,
    60.7 -    CHANTYPE_BMP_OUT,
    60.8      CHANTYPE_DEFERRED, ///< Timer events
    60.9      CHANTYPE_EVENT_QUEUE,
   60.10      CHANTYPE_FLOUNDER,

    61.1 --- a/include/barrelfish_kpi/capabilities.h	Fri Jan 20 14:32:03 2012 -0800
    61.2 +++ b/include/barrelfish_kpi/capabilities.h	Mon Jan 23 11:04:15 2012 -0800
    61.3 @@ -46,7 +46,7 @@
    61.4  
    61.5  static inline bool type_is_vnode(enum objtype type)
    61.6  {
    61.7 -    STATIC_ASSERT(27 == ObjType_Num, "Check VNode definitions");
    61.8 +    STATIC_ASSERT(25 == ObjType_Num, "Check VNode definitions");
    61.9  
   61.10      return (type == ObjType_VNode_x86_64_pml4 ||
   61.11              type == ObjType_VNode_x86_64_pdpt ||
   61.12 @@ -70,7 +70,7 @@
   61.13  static inline size_t vnode_objbits(enum objtype type)
   61.14  {
   61.15      // This function should be emitted by hamlet or somesuch.
   61.16 -    STATIC_ASSERT(27 == ObjType_Num, "Check VNode definitions");
   61.17 +    STATIC_ASSERT(25 == ObjType_Num, "Check VNode definitions");
   61.18  
   61.19      if (type == ObjType_VNode_x86_64_pml4 ||
   61.20          type == ObjType_VNode_x86_64_pdpt ||
   61.21 @@ -177,14 +177,6 @@
   61.22  };
   61.23  
   61.24  /**
   61.25 - * BMP Table capability commands.
   61.26 - */
   61.27 -enum bmptable_cmd {
   61.28 -    BMPTableCmd_Set,    ///< Set endpoint for BMP# notifications
   61.29 -    BMPTableCmd_Delete  ///< Remove notification endpoint for BMP#
   61.30 -};
   61.31 -
   61.32 -/**
   61.33   * Notify capability commands.
   61.34   */
   61.35  enum notify_cmd {

    62.1 --- a/include/barrelfish_kpi/cpu.h	Fri Jan 20 14:32:03 2012 -0800
    62.2 +++ b/include/barrelfish_kpi/cpu.h	Mon Jan 23 11:04:15 2012 -0800
    62.3 @@ -20,7 +20,6 @@
    62.4  enum cpu_type {
    62.5      CPU_X86_64,
    62.6      CPU_X86_32,
    62.7 -    CPU_BEEHIVE,
    62.8      CPU_SCC,
    62.9      CPU_ARM, // XXX: Which ARMs to add here?
   62.10      CPU_TYPE_NUM // must be last

    63.1 --- a/include/barrelfish_kpi/init.h	Fri Jan 20 14:32:03 2012 -0800
    63.2 +++ b/include/barrelfish_kpi/init.h	Mon Jan 23 11:04:15 2012 -0800
    63.3 @@ -101,7 +101,7 @@
    63.4  #define TASKCN_SLOT_TRACEBUF    9   ///< Trace buffer cap in task cnode
    63.5  #define TASKCN_SLOT_ARGSPAGE    10  ///< ?
    63.6  #define TASKCN_SLOT_MON_URPC    11  ///< Frame cap for urpc comm.
    63.7 -#define TASKCN_SLOT_BMP_TABLE   12  ///< cap to access BMP association table
    63.8 +/* slot 12 is free */
    63.9  #define TASKCN_SLOT_FDSPAGE     13  ///< cap for performance monitoring
   63.10  #define TASKCN_SLOT_PERF_MON    14  ///< cap for performance monitoring
   63.11  #define TASKCN_SLOTS_USER       15  ///< First free slot in taskcn for user

    64.1 --- a/include/barrelfish_kpi/legacy_idc_buffer.h	Fri Jan 20 14:32:03 2012 -0800
    64.2 +++ b/include/barrelfish_kpi/legacy_idc_buffer.h	Mon Jan 23 11:04:15 2012 -0800
    64.3 @@ -51,8 +51,6 @@
    64.4  typedef unsigned int idc_flag_t;
    64.5  #elif __arm__
    64.6  typedef uint8_t idc_flag_t;
    64.7 -#elif __BEEHIVE__
    64.8 -typedef uint8_t idc_flag_t;
    64.9  #else
   64.10  #error "Unknown architecture."
   64.11  #endif

    65.1 --- a/include/barrelfish_kpi/syscalls.h	Fri Jan 20 14:32:03 2012 -0800
    65.2 +++ b/include/barrelfish_kpi/syscalls.h	Mon Jan 23 11:04:15 2012 -0800
    65.3 @@ -48,7 +48,6 @@
    65.4  /* Architecture-specific syscalls 
    65.5   * FIXME: shouldn't these be in an arch-specific header? -AB */
    65.6  #define SYSCALL_X86_FPU_TRAP_ON     7     ///< Turn FPU trap on (x86)
    65.7 -#define SYSCALL_BEEHIVE_TRACE_RUNDOWN 7   ///< Trace DCB rundown
    65.8  #define SYSCALL_X86_RELOAD_LDT      8     ///< Reload the LDT register (x86_64)
    65.9  
   65.10  #define SYSCALL_COUNT               9     ///< Number of syscalls [0..SYSCALL_COUNT - 1]

    66.1 --- a/include/bexec.h	Fri Jan 20 14:32:03 2012 -0800
    66.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    66.3 @@ -1,36 +0,0 @@
    66.4 -/**
    66.5 - * \file
    66.6 - * \brief Beehive executable image format
    66.7 - */
    66.8 -
    66.9 -/*
   66.10 - * Copyright (c) 2010, ETH Zurich.
   66.11 - * All rights reserved.
   66.12 - *
   66.13 - * This file is distributed under the terms in the attached LICENSE file.
   66.14 - * If you do not find this file, copies can be found by writing to:
   66.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   66.16 - */
   66.17 -
   66.18 -#ifndef BEXEC_H
   66.19 -#define BEXEC_H
   66.20 -
   66.21 -#define BEXEC_IMAGE_SIZE(b) (((b)->bborg + (b)->bbsize - (b)->btorg)<<2)
   66.22 -#define BEXEC_IMAGE_BASE(b) ((b)->btorg)
   66.23 -
   66.24 -typedef struct bexec {
   66.25 -    unsigned bmagic, btorg, btsize, bdorg, bdsize, bborg, bbsize, bcksum;
   66.26 -} bexec_t, *pbexec_t;
   66.27 -
   66.28 -#define BEXEC_BMAGIC (0xF800220CU)
   66.29 -#define BEXEC_ARGSMAGIC (0x53475241U)
   66.30 -
   66.31 -// XXX: contents of "image pointer" file that appears in the VFS
   66.32 -struct mem_region;
   66.33 -struct bimgref_file {
   66.34 -    uint32_t magic;
   66.35 -    struct mem_region *region;
   66.36 -};
   66.37 -#define BIMGREF_MAGIC 0x42494d47u
   66.38 -
   66.39 -#endif

    67.1 --- a/include/flounder/flounder_support_bmp.h	Fri Jan 20 14:32:03 2012 -0800
    67.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    67.3 @@ -1,138 +0,0 @@
    67.4 -/**
    67.5 - * \file
    67.6 - * \brief Prototypes for use by flounder-generated stubs
    67.7 - */
    67.8 -
    67.9 -/*
   67.10 - * Copyright (c) 2010, ETH Zurich.
   67.11 - * All rights reserved.
   67.12 - *
   67.13 - * This file is distributed under the terms in the attached LICENSE file.
   67.14 - * If you do not find this file, copies can be found by writing to:
   67.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   67.16 - */
   67.17 -
   67.18 -#ifndef __FLOUNDER_SUPPORT_BMP_H
   67.19 -#define __FLOUNDER_SUPPORT_BMP_H
   67.20 -
   67.21 -#include <barrelfish/bmp_chan.h>
   67.22 -#include <flounder/flounder_support_caps.h>
   67.23 -
   67.24 -/// Type used for indices of BMP message slots
   67.25 -typedef uint16_t bmp_index_t;
   67.26 -#define BMP_INDEX_BITS  16
   67.27 -#define BMP_MSGNUM_BITS 16
   67.28 -
   67.29 -/// Message header word
   67.30 -union bmp_msg_header {
   67.31 -    struct {
   67.32 -        uintptr_t acknum:BMP_INDEX_BITS;
   67.33 -        uintptr_t msgnum:BMP_MSGNUM_BITS;
   67.34 -    } x;
   67.35 -    uintptr_t raw;
   67.36 -};
   67.37 -STATIC_ASSERT_SIZEOF(union bmp_msg_header, sizeof(uintptr_t));
   67.38 -
   67.39 -/// Special message types
   67.40 -enum flounder_bmp_msgnum {
   67.41 -    FL_BMP_ACK = 0,
   67.42 -    FL_BMP_CAP_ACK = (1 << BMP_INDEX_BITS) - 1,
   67.43 -};
   67.44 -
   67.45 -struct flounder_bmp_state {
   67.46 -    struct bmp_chan chan;
   67.47 -
   67.48 -    bmp_index_t sent_id;   ///< Sequence number of next message to be sent
   67.49 -    bmp_index_t seq_id;    ///< Last sequence number received from remote
   67.50 -    bmp_index_t ack_id;    ///< Last sequence number acknowledged by remote
   67.51 -    bmp_index_t last_ack;  ///< Last acknowledgement we sent to remote
   67.52 -
   67.53 -    struct flounder_cap_state capst; ///< State for indirect cap tx/rx machinery
   67.54 -};
   67.55 -
   67.56 -void flounder_stub_bmp_state_init(struct flounder_bmp_state *s, void *binding);
   67.57 -
   67.58 -errval_t flounder_stub_bmp_send_string(struct flounder_bmp_state *s,
   67.59 -                                       int msgnum, const char *str,
   67.60 -                                       size_t *pos, size_t *len);
   67.61 -
   67.62 -errval_t flounder_stub_bmp_recv_string(struct bmp_recv_msg *msg,
   67.63 -                                       char **str, size_t *pos, size_t *len);
   67.64 -
   67.65 -errval_t flounder_stub_bmp_send_buf(struct flounder_bmp_state *s,
   67.66 -                                    int msgnum, const void *buf,
   67.67 -                                    size_t len, size_t *pos);
   67.68 -
   67.69 -errval_t flounder_stub_bmp_recv_buf(struct bmp_recv_msg *msg,
   67.70 -                                    void **buf, size_t *len, size_t *pos);
   67.71 -
   67.72 -/// Computes (from seq/ack numbers) whether we can currently send on the channel
   67.73 -static inline bool flounder_stub_bmp_can_send(struct flounder_bmp_state *s,
   67.74 -                                              size_t totlen)
   67.75 -{
   67.76 -    assert(totlen <= s->chan.outeplen);
   67.77 -    return (bmp_index_t)(s->sent_id - s->ack_id) <= (s->chan.outeplen - totlen);
   67.78 -}
   67.79 -
   67.80 -/// Prepare a header word
   67.81 -static inline uintptr_t flounder_stub_bmp_mkheader(struct flounder_bmp_state *s,
   67.82 -                                                   int msgtype)
   67.83 -{
   67.84 -    assert(msgtype < (1 << BMP_MSGNUM_BITS)); // check for overflow
   67.85 -    union bmp_msg_header h = {
   67.86 -        .x = {
   67.87 -            .acknum = s->seq_id,
   67.88 -            .msgnum = msgtype }};
   67.89 -    return h.raw;
   67.90 -}
   67.91 -
   67.92 -/// Try to send a message
   67.93 -static inline errval_t flounder_stub_bmp_send(struct flounder_bmp_state *s,
   67.94 -                                              uintptr_t *msg, size_t totlen)
   67.95 -{
   67.96 -    assert(flounder_stub_bmp_can_send(s, totlen));
   67.97 -    errval_t err = bmp_chan_send(&s->chan, msg, totlen);
   67.98 -    if (err_is_ok(err)) {
   67.99 -        s->last_ack = s->seq_id;
  67.100 -        s->sent_id += totlen + LMP_RECV_HEADER_LENGTH; /* header on receive LMP side */
  67.101 -    }
  67.102 -    return err;
  67.103 -}
  67.104 -
  67.105 -/// Process a header word
  67.106 -static inline int flounder_stub_bmp_process_header(struct flounder_bmp_state *s,
  67.107 -                                                   uintptr_t header, size_t totlen)
  67.108 -{
  67.109 -    union bmp_msg_header h = { .raw = header };
  67.110 -    s->ack_id = h.x.acknum;
  67.111 -    s->seq_id += totlen + LMP_RECV_HEADER_LENGTH;
  67.112 -    return h.x.msgnum;
  67.113 -}
  67.114 -
  67.115 -/// Should we send an ACK?
  67.116 -static inline bool flounder_stub_bmp_needs_ack(struct flounder_bmp_state *s)
  67.117 -{
  67.118 -    // send a forced ACK if the channel would now not be able
  67.119 -    // to accept another MTU-sized message
  67.120 -    assert(s->chan.inep->buflen >= BMP_MSG_LENGTH);
  67.121 -    return (bmp_index_t)(s->seq_id - s->last_ack)
  67.122 -                >= s->chan.inep->buflen - BMP_MSG_LENGTH;
  67.123 -}
  67.124 -
  67.125 -/// Send an explicit ACK
  67.126 -static inline errval_t flounder_stub_bmp_send_ack(struct flounder_bmp_state *s)
  67.127 -{
  67.128 -    assert(flounder_stub_bmp_can_send(s, 1));
  67.129 -    uintptr_t msg = flounder_stub_bmp_mkheader(s, FL_BMP_ACK);
  67.130 -    return flounder_stub_bmp_send(s, &msg, 1);
  67.131 -}
  67.132 -
  67.133 -/// Send a cap ACK (message that we are ready to receive caps)
  67.134 -static inline errval_t flounder_stub_bmp_send_cap_ack(struct flounder_bmp_state *s)
  67.135 -{
  67.136 -    assert(flounder_stub_bmp_can_send(s, 1));
  67.137 -    uintptr_t msg = flounder_stub_bmp_mkheader(s, FL_BMP_CAP_ACK);
  67.138 -    return flounder_stub_bmp_send(s, &msg, 1);
  67.139 -}
  67.140 -
  67.141 -#endif // __FLOUNDER_SUPPORT_BMP_H

    68.1 --- a/include/target/beehive/barrelfish/dispatcher_target.h	Fri Jan 20 14:32:03 2012 -0800
    68.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    68.3 @@ -1,29 +0,0 @@
    68.4 -/**
    68.5 - * \file
    68.6 - * \brief Architecture specific dispatcher structure private to the user
    68.7 - */
    68.8 -
    68.9 -/*
   68.10 - * Copyright (c) 2010, ETH Zurich.
   68.11 - * All rights reserved.
   68.12 - *
   68.13 - * This file is distributed under the terms in the attached LICENSE file.
   68.14 - * If you do not find this file, copies can be found by writing to:
   68.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   68.16 - */
   68.17 -
   68.18 -#ifndef TARGET_BEEHIVE_BARRELFISH_DISPATCHER_H
   68.19 -#define TARGET_BEEHIVE_BARRELFISH_DISPATCHER_H
   68.20 -
   68.21 -#include <barrelfish_kpi/dispatcher_shared.h>
   68.22 -#include <barrelfish_kpi/dispatcher_shared_arch.h>
   68.23 -#include <barrelfish/dispatcher.h>
   68.24 -
   68.25 -/// Dispatcher structure (including data accessed only by user code)
   68.26 -struct dispatcher_beehive {
   68.27 -    struct dispatcher_shared_beehive d;  ///< Shared (user/kernel) data. Must be first.
   68.28 -    struct dispatcher_generic generic;   ///< User private data
   68.29 -    /* Incoming LMP endpoints (buffers and receive cap pointers) follow */
   68.30 -};
   68.31 -
   68.32 -#endif // TARGET_BEEHIVE_BARRELFISH_DISPATCHER_H

    69.1 --- a/include/target/beehive/barrelfish_kpi/coredata_target.h	Fri Jan 20 14:32:03 2012 -0800
    69.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    69.3 @@ -1,52 +0,0 @@
    69.4 -/**
    69.5 - * \file
    69.6 - * \brief Data sent to a newly booted beehive kernel
    69.7 - */
    69.8 -
    69.9 -/*
   69.10 - * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
   69.11 - * All rights reserved.
   69.12 - *
   69.13 - * This file is distributed under the terms in the attached LICENSE file.
   69.14 - * If you do not find this file, copies can be found by writing to:
   69.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   69.16 - */
   69.17 -
   69.18 -#ifndef COREDATA_H
   69.19 -#define COREDATA_H
   69.20 -
   69.21 -#include <bexec.h>
   69.22 -
   69.23 -// XXX Shouldn't really be visible outside kernel
   69.24 -typedef struct stringtable {
   69.25 -    unsigned smagic, slength, soffset[];
   69.26 -} *pstringtable_t;
   69.27 -
   69.28 -/**
   69.29 - * \brief Data sent to a newly booted kernel
   69.30 - *
   69.31 - * \bug Should use mackerel to define this struct instead of packing
   69.32 - * it so that it matches up between heterogeneous cores.
   69.33 - */
   69.34 -struct beehive_core_data {
   69.35 -    bexec_t   *cpu_module;    ///< bexec structure for the cpu module
   69.36 -    genpaddr_t module_start;  ///< The start of the cpu module
   69.37 -    genpaddr_t module_end;    ///< The end of the cpu module
   69.38 -
   69.39 -    bexec_t   *monitor_module;    ///< bexec structure for the cpu module
   69.40 -    genpaddr_t monitor_binary;
   69.41 -    genpaddr_t monitor_binary_size;
   69.42 -
   69.43 -    coreid_t src_core_id;
   69.44 -    int      chanid;
   69.45 -
   69.46 -    genpaddr_t memory_base;
   69.47 -    genpaddr_t memory_limit;
   69.48 -
   69.49 -    struct bootinfo *bootinfo;
   69.50 -    pstringtable_t strings;
   69.51 -
   69.52 -} __attribute__ ((packed));
   69.53 -
   69.54 -
   69.55 -#endif

    70.1 --- a/include/target/beehive/barrelfish_kpi/dispatcher_shared_target.h	Fri Jan 20 14:32:03 2012 -0800
    70.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    70.3 @@ -1,59 +0,0 @@
    70.4 -/**
    70.5 - * \file
    70.6 - * \brief Architecture specific dispatcher struct shared between kernel and user
    70.7 - */
    70.8 -
    70.9 -/*
   70.10 - * Copyright (c) 2010, ETH Zurich.
   70.11 - * All rights reserved.
   70.12 - *
   70.13 - * This file is distributed under the terms in the attached LICENSE file.
   70.14 - * If you do not find this file, copies can be found by writing to:
   70.15 - * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
   70.16 - */
   70.17 -
   70.18 -#ifndef TARGET_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_H
   70.19 -#define TARGET_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_H
   70.20 -
   70.21 -#include <barrelfish_kpi/dispatcher_shared.h>
   70.22 -
   70.23 -///< Architecture specific kernel/user shared dispatcher struct
   70.24 -struct dispatcher_shared_beehive {
   70.25 -    struct dispatcher_shared_generic d; ///< Generic portion
   70.26 -
   70.27 -    union registers_beehive enabled_save_area;  ///< Enabled register save area
   70.28 -    union registers_beehive disabled_save_area; ///< Disabled register save area
   70.29 -    union registers_beehive trap_save_area;     ///< Trap register save area
   70.30 -};
   70.31 -
   70.32 -static inline struct dispatcher_shared_beehive*
   70.33 -get_dispatcher_shared_beehive(dispatcher_handle_t handle)
   70.34 -{
   70.35 -    return (struct dispatcher_shared_beehive*)handle;
   70.36 -}
   70.37 -
   70.38 -static inline union registers_beehive*
   70.39 -dispatcher_beehive_get_enabled_save_area(dispatcher_handle_t handle)
   70.40 -{
   70.41 -    struct dispatcher_shared_beehive *disp =
   70.42 -        get_dispatcher_shared_beehive(handle);
   70.43 -    return &disp->enabled_save_area;
   70.44 -}
   70.45 -
   70.46 -static inline union registers_beehive*
   70.47 -dispatcher_beehive_get_disabled_save_area(dispatcher_handle_t handle)
   70.48 -{
   70.49 -    struct dispatcher_shared_beehive *disp =
   70.50 -        get_dispatcher_shared_beehive(handle);
   70.51 -    return &disp->disabled_save_area;
   70.52 -}
   70.53 -
   70.54 -static inline union registers_beehive*
   70.55 -dispatcher_beehive_get_trap_save_area(dispatcher_handle_t handle)
   70.56 -{
   70.57 -    struct dispatcher_shared_beehive *disp =
   70.58 -        get_dispatcher_shared_beehive(handle);
   70.59 -    return &disp->trap_save_area;
   70.60 -}
   70.61 -
   70.62 -#endif // TARGET_BEEHIVE_BARRELFISH_KPI_DISPATCHER_SHARED_H

    71.1 --- a/include/thc/thcinternal.h	Fri Jan 20 14:32:03 2012 -0800
    71.2 +++ b/include/thc/thcinternal.h	Mon Jan 23 11:04:15 2012 -0800
    71.3 @@ -199,11 +199,6 @@
    71.4  #define KILL_CALLEE_SAVES()						\
    71.5    __asm__ volatile ("" : : : "ebx", "edi", "esi", "esp", "memory", "cc")
    71.6  #endif
    71.7 -#elif defined(__BEEHIVE__)
    71.8 -#define KILL_CALLEE_SAVES()				                \
    71.9 -  __asm__ volatile ("" : : : "r9", "r10", "r11", "r12", "r13",		\
   71.10 -		    "r14", "r15", "r16", "r17", "r18", "r19",		\
   71.11 -		    "r20", "r21", "r22", "sp", "memory", "cc")
   71.12  #elif defined(__arm__)
   71.13  #define KILL_CALLEE_SAVES assert(0 && "THC not yet implemented on ARM")
   71.14  #else
   71.15 @@ -228,10 +223,6 @@
   71.16  #elif defined(__i386__)                             
   71.17  #define FORCE_ARGS_STACK      
   71.18  #define FORCE_ARGS_STACK_CALL 
   71.19 -#elif defined(__BEEHIVE__)
   71.20 -#define FORCE_ARGS_STACK      void*__a, void*__b, void*__c, void*__d, \
   71.21 -                              void*__e, void*__f,
   71.22 -#define FORCE_ARGS_STACK_CALL NULL, NULL, NULL, NULL, NULL, NULL,
   71.23  #elif defined(__arm__)
   71.24  #define FORCE_ARGS_STACK assert(0 && "THC not yet implemented on ARM")
   71.25  #define FORCE_ARGS_STACK_CALL assert(0 && "THC not yet implemented on ARM")
   71.26 @@ -258,15 +249,6 @@
   71.27  #define RESTORE_OLD_STACK_POINTER(OLD_STACK_PTR)			\
   71.28    __asm__ volatile ("movl %0, %%esp       \n\t"				\
   71.29  		    : : "m"(OLD_STACK_PTR))
   71.30 -#elif defined(__BEEHIVE__)
   71.31 -#define GET_STACK_POINTER(STACK_PTR)					\
   71.32 -  __asm__ volatile("aqw_add vb, %0, 0       \n\t"			\
   71.33 -		   "ld      wq, sp          \n\t"			\
   71.34 -		   : : "r"(&(STACK_PTR)) )
   71.35 -#define RESTORE_OLD_STACK_POINTER(OLD_STACK_PTR)			\
   71.36 -  __asm__ volatile("aqr_add vb, %0, 0       \n\t"			\
   71.37 -		   "ld      sp, rq          \n\t"			\
   71.38 -		   : : "r"(&(OLD_STACK_PTR)) )
   71.39  #elif defined(__arm__)
   71.40  #define GET_STACK_POINTER(_) assert(0 && "THC not yet implemented on ARM")
   71.41  #define RESTORE_OLD_STACK_POINTER(_) assert(0 && "THC not yet implemented on ARM")
   71.42 @@ -309,29 +291,6 @@
   71.43      );
   71.44  #define GET_LAZY_AWE(FRAME_PTR)						\
   71.45      *((FRAME_PTR)+2)   /* was passed as first arg */
   71.46 -#elif defined(__BEEHIVE__)
   71.47 -#define INIT_LAZY_AWE(AWE_PTR, LAZY_MARKER)				\
   71.48 -  __asm__ volatile (							\
   71.49 -    " aqr_add vb, fp, 4          \n\t"					\
   71.50 -    " ld   link, rq              \n\t"					\
   71.51 -    " aqw_add vb, %0, 0          \n\t"				        \
   71.52 -    " ld   wq, link              \n\t" /* EIP   (our return address) */ \
   71.53 -    " aqr_add vb, fp, 0          \n\t"					\
   71.54 -    " ld   link, rq              \n\t"					\
   71.55 -    " aqw_add vb, %0, 4          \n\t"				        \
   71.56 -    " ld   wq, link                \n\t" /* EBP */			\
   71.57 -    " aqw_add vb, fp, 4          \n\t"					\
   71.58 -    " ld   wq, %1                \n\t"	/* put marker as ret address  */\
   71.59 -    : : "r"((AWE_PTR)), "r"((LAZY_MARKER)) : "vb" );
   71.60 -#define RETURN_CONT(JMP_ADDR)			                        \
   71.61 -  __asm__ volatile (							\
   71.62 -    " ld   sp, fp                \n\t" /* free frame                 */ \
   71.63 -    " aqr_ld  vb, sp             \n\t"					\
   71.64 -    " ld   fp, rq                \n\t" /* restore frame pointer      */	\
   71.65 -    " j " JMP_ADDR "             \n\t"	                                \
   71.66 -    );
   71.67 -#define GET_LAZY_AWE(FRAME_PTR)						\
   71.68 -    *((FRAME_PTR)+2)   /* was passed as first arg */
   71.69  #elif defined(__arm__)
   71.70  #define INIT_LAZY_AWE(_) assert(0 && "THC not yet implemented on ARM")
   71.71  #define RETURN_CONT(_) assert(0 && "THC not yet implemented on ARM")
   71.72 @@ -405,22 +364,6 @@
   71.73                       : "m" (_NS)                                        \
   71.74                       : "memory", "cc", "eax", "edx");			\
   71.75    }									
   71.76 -#elif defined(__BEEHIVE__)
   71.77 -#define SWIZZLE_DEF(_NAME,_NS,_FN)                                      \
   71.78 -  __attribute__((noinline)) void _NAME(void) {                          \
   71.79 -    __asm__ volatile("aqr_add vb, %0, 0       \n\t"			\
   71.80 -                     "ld      r3, rq          \n\t"			\
   71.81 -                     "sub     r3, r3, 4       \n\t"                     \
   71.82 -                     "aqw_add vb, r3, 0       \n\t"                     \
   71.83 -                     "ld      wq, sp          \n\t"                     \
   71.84 -                     "ld      sp, r3          \n\t"                     \
   71.85 -                     "long_call " _FN "       \n\t"                     \
   71.86 -                     "aqr_add vb, sp, 0       \n\t"                     \
   71.87 -                     "ld      sp, rq          \n\t"                     \
   71.88 -                     :							\
   71.89 -                     : "r" (&(_NS))                                     \
   71.90 -                     : "memory", "cc", "r2", "r3");			\
   71.91 -  }									
   71.92  #elif defined(__arm__)
   71.93  #define SWIZZLE_DEF(_NAME,_NS,_FN) assert(0 && "THC not yet implemented on ARM")
   71.94  #else