Commit bc1f4c18 authored by Dave Cheney's avatar Dave Cheney Committed by Russ Cox

runtime: regenerate defs_darwin_{386,amd64}.h

Regenerated under Lion 10.7.2 amd64.
Also tested on Snow Leopart 10.6.8 386.

R=golang-dev, dsymonds, minux.ma
CC=golang-dev
https://golang.org/cl/5533058
parent 800c4982
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
/* /*
Input to cgo. Input to cgo.
GOARCH=amd64 cgo -cdefs defs.go >amd64/defs.h GOARCH=amd64 cgo -cdefs defs_darwin.go >defs_darwin_amd64.h
GOARCH=386 cgo -cdefs defs.go >386/defs.h GOARCH=386 cgo -cdefs defs_darwin.go >defs_darwin_386.h
*/ */
package runtime package runtime
...@@ -55,7 +55,6 @@ const ( ...@@ -55,7 +55,6 @@ const (
MACH_SEND_TIMEOUT = C.MACH_SEND_TIMEOUT MACH_SEND_TIMEOUT = C.MACH_SEND_TIMEOUT
MACH_SEND_INTERRUPT = C.MACH_SEND_INTERRUPT MACH_SEND_INTERRUPT = C.MACH_SEND_INTERRUPT
MACH_SEND_CANCEL = C.MACH_SEND_CANCEL
MACH_SEND_ALWAYS = C.MACH_SEND_ALWAYS MACH_SEND_ALWAYS = C.MACH_SEND_ALWAYS
MACH_SEND_TRAILER = C.MACH_SEND_TRAILER MACH_SEND_TRAILER = C.MACH_SEND_TRAILER
MACH_RCV_TIMEOUT = C.MACH_RCV_TIMEOUT MACH_RCV_TIMEOUT = C.MACH_RCV_TIMEOUT
......
// Created by cgo -cdefs - DO NOT EDIT // Created by cgo -cdefs - DO NOT EDIT
// cgo -cdefs defs.go // cgo -cdefs defs_darwin.go
enum { enum {
...@@ -33,7 +33,6 @@ enum { ...@@ -33,7 +33,6 @@ enum {
MACH_SEND_TIMEOUT = 0x10, MACH_SEND_TIMEOUT = 0x10,
MACH_SEND_INTERRUPT = 0x40, MACH_SEND_INTERRUPT = 0x40,
MACH_SEND_CANCEL = 0x80,
MACH_SEND_ALWAYS = 0x10000, MACH_SEND_ALWAYS = 0x10000,
MACH_SEND_TRAILER = 0x20000, MACH_SEND_TRAILER = 0x20000,
MACH_RCV_TIMEOUT = 0x100, MACH_RCV_TIMEOUT = 0x100,
...@@ -197,10 +196,10 @@ struct Itimerval { ...@@ -197,10 +196,10 @@ struct Itimerval {
}; };
struct FPControl { struct FPControl {
byte Pad_godefs_0[2]; byte Pad_cgo_0[2];
}; };
struct FPStatus { struct FPStatus {
byte Pad_godefs_0[2]; byte Pad_cgo_0[2];
}; };
struct RegMMST { struct RegMMST {
int8 mmst_reg[10]; int8 mmst_reg[10];
...@@ -276,7 +275,8 @@ struct FloatState64 { ...@@ -276,7 +275,8 @@ struct FloatState64 {
int32 fpu_reserved1; int32 fpu_reserved1;
}; };
struct ExceptionState64 { struct ExceptionState64 {
uint32 trapno; uint16 trapno;
uint16 cpu;
uint32 err; uint32 err;
uint64 faultvaddr; uint64 faultvaddr;
}; };
...@@ -339,7 +339,8 @@ struct FloatState32 { ...@@ -339,7 +339,8 @@ struct FloatState32 {
int32 fpu_reserved1; int32 fpu_reserved1;
}; };
struct ExceptionState32 { struct ExceptionState32 {
uint32 trapno; uint16 trapno;
uint16 cpu;
uint32 err; uint32 err;
uint32 faultvaddr; uint32 faultvaddr;
}; };
......
// Created by cgo -cdefs - DO NOT EDIT // Created by cgo -cdefs - DO NOT EDIT
// cgo -cdefs defs.go // cgo -cdefs defs_darwin.go
enum { enum {
...@@ -33,7 +33,6 @@ enum { ...@@ -33,7 +33,6 @@ enum {
MACH_SEND_TIMEOUT = 0x10, MACH_SEND_TIMEOUT = 0x10,
MACH_SEND_INTERRUPT = 0x40, MACH_SEND_INTERRUPT = 0x40,
MACH_SEND_CANCEL = 0x80,
MACH_SEND_ALWAYS = 0x10000, MACH_SEND_ALWAYS = 0x10000,
MACH_SEND_TRAILER = 0x20000, MACH_SEND_TRAILER = 0x20000,
MACH_RCV_TIMEOUT = 0x100, MACH_RCV_TIMEOUT = 0x100,
...@@ -164,7 +163,7 @@ struct StackT { ...@@ -164,7 +163,7 @@ struct StackT {
byte *ss_sp; byte *ss_sp;
uint64 ss_size; uint64 ss_size;
int32 ss_flags; int32 ss_flags;
byte Pad_godefs_0[4]; byte Pad_cgo_0[4];
}; };
typedef byte Sighandler[8]; typedef byte Sighandler[8];
...@@ -191,7 +190,7 @@ struct Siginfo { ...@@ -191,7 +190,7 @@ struct Siginfo {
struct Timeval { struct Timeval {
int64 tv_sec; int64 tv_sec;
int32 tv_usec; int32 tv_usec;
byte Pad_godefs_0[4]; byte Pad_cgo_0[4];
}; };
struct Itimerval { struct Itimerval {
Timeval it_interval; Timeval it_interval;
...@@ -199,10 +198,10 @@ struct Itimerval { ...@@ -199,10 +198,10 @@ struct Itimerval {
}; };
struct FPControl { struct FPControl {
byte Pad_godefs_0[2]; byte Pad_cgo_0[2];
}; };
struct FPStatus { struct FPStatus {
byte Pad_godefs_0[2]; byte Pad_cgo_0[2];
}; };
struct RegMMST { struct RegMMST {
int8 mmst_reg[10]; int8 mmst_reg[10];
...@@ -278,7 +277,8 @@ struct FloatState64 { ...@@ -278,7 +277,8 @@ struct FloatState64 {
int32 fpu_reserved1; int32 fpu_reserved1;
}; };
struct ExceptionState64 { struct ExceptionState64 {
uint32 trapno; uint16 trapno;
uint16 cpu;
uint32 err; uint32 err;
uint64 faultvaddr; uint64 faultvaddr;
}; };
...@@ -286,7 +286,7 @@ struct Mcontext64 { ...@@ -286,7 +286,7 @@ struct Mcontext64 {
ExceptionState64 es; ExceptionState64 es;
Regs64 ss; Regs64 ss;
FloatState64 fs; FloatState64 fs;
byte Pad_godefs_0[4]; byte Pad_cgo_0[4];
}; };
struct Regs32 { struct Regs32 {
...@@ -342,7 +342,8 @@ struct FloatState32 { ...@@ -342,7 +342,8 @@ struct FloatState32 {
int32 fpu_reserved1; int32 fpu_reserved1;
}; };
struct ExceptionState32 { struct ExceptionState32 {
uint32 trapno; uint16 trapno;
uint16 cpu;
uint32 err; uint32 err;
uint32 faultvaddr; uint32 faultvaddr;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment