mirror of
https://github.com/urbit/shrub.git
synced 2024-12-15 04:22:48 +03:00
Merge branch 'master' of https://github.com/urbit/urbit
Conflicts: urb/zod/arvo/hoon.hoon
This commit is contained in:
commit
88fca6f98d
2
Makefile
2
Makefile
@ -57,7 +57,7 @@ endif
|
|||||||
INCLUDE=include
|
INCLUDE=include
|
||||||
MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\"
|
MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\"
|
||||||
|
|
||||||
CFLAGS= -O2 -g \
|
CFLAGS= -O2 -g -msse3 -ffast-math \
|
||||||
-funsigned-char \
|
-funsigned-char \
|
||||||
-I/usr/local/include \
|
-I/usr/local/include \
|
||||||
-I/opt/local/include \
|
-I/opt/local/include \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* include/rail.h
|
/* include/meme.h
|
||||||
**
|
**
|
||||||
** This file is in the public domain.
|
** This file is in the public domain.
|
||||||
*/
|
*/
|
||||||
@ -12,6 +12,19 @@
|
|||||||
# define u2_leak_off (COD_w = 0)
|
# define u2_leak_off (COD_w = 0)
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
/** Data structures.
|
||||||
|
**/
|
||||||
|
typedef struct _u2_road {
|
||||||
|
void* cap_v; // top of transient region
|
||||||
|
void* hat_v; // top of new durable region
|
||||||
|
void* mat_v; // bottom of transient region
|
||||||
|
void* rut_v; // bottom of new durable region
|
||||||
|
} u2_road;
|
||||||
|
|
||||||
|
typedef struct _u2_town {
|
||||||
|
u2_town* par_u;
|
||||||
|
} u2_town;
|
||||||
|
|
||||||
/** Data types.
|
/** Data types.
|
||||||
**/
|
**/
|
||||||
/** Ray types.
|
/** Ray types.
|
2
v/ames.c
2
v/ames.c
@ -157,9 +157,11 @@ _ames_send_cb(uv_udp_send_t* req_u, c3_i sas_i)
|
|||||||
{
|
{
|
||||||
_u2_udp_send_t* ruq_u = (void*)req_u;
|
_u2_udp_send_t* ruq_u = (void*)req_u;
|
||||||
|
|
||||||
|
#if 0
|
||||||
if ( 0 != sas_i ) {
|
if ( 0 != sas_i ) {
|
||||||
uL(fprintf(uH, "ames: send_cb: %s\n", uv_strerror(uv_last_error(u2L))));
|
uL(fprintf(uH, "ames: send_cb: %s\n", uv_strerror(uv_last_error(u2L))));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
// fprintf(stderr, "ames: tx\r\n");
|
// fprintf(stderr, "ames: tx\r\n");
|
||||||
free(ruq_u->buf_y);
|
free(ruq_u->buf_y);
|
||||||
free(ruq_u);
|
free(ruq_u);
|
||||||
|
5
v/main.c
5
v/main.c
@ -18,6 +18,8 @@
|
|||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <term.h>
|
#include <term.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#include <pmmintrin.h>
|
||||||
|
#include <xmmintrin.h>
|
||||||
|
|
||||||
#define U2_GLOBAL
|
#define U2_GLOBAL
|
||||||
#define C3_GLOBAL
|
#define C3_GLOBAL
|
||||||
@ -248,6 +250,9 @@ main(c3_i argc,
|
|||||||
{
|
{
|
||||||
c3_w kno_w;
|
c3_w kno_w;
|
||||||
|
|
||||||
|
_MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
|
||||||
|
_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
|
||||||
|
|
||||||
// Parse options.
|
// Parse options.
|
||||||
//
|
//
|
||||||
if ( u2_no == _main_getopt(argc, argv) ) {
|
if ( u2_no == _main_getopt(argc, argv) ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user