qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 12:40:12 -07:00
Code Releases Activity

cgo: handle C99 bool type

Browse Source 
Fixes #307.

R=rsc
CC=golang-dev
https://golang.org/cl/186073
This commit is contained in:
Devon H. O'Dell 2010-01-13 10:25:28 -08:00 committed by Russ Cox
parent 84ac357c79
commit 14a74378f4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/cgo/gcc.go
View File

@ -329,6 +329,7 @@ type typeConv struct {
typedef map[string]ast.Expr typedef map[string]ast.Expr
// Predeclared types. // Predeclared types.
bool ast.Expr
byte ast.Expr // denotes padding byte ast.Expr // denotes padding
int8, int16, int32, int64 ast.Expr int8, int16, int32, int64 ast.Expr
uint8, uint16, uint32, uint64, uintptr ast.Expr uint8, uint16, uint32, uint64, uintptr ast.Expr
@ -346,6 +347,7 @@ func (c *typeConv) Init(ptrSize int64) {
c.ptrSize = ptrSize c.ptrSize = ptrSize
c.m = make(map[dwarf.Type]*Type) c.m = make(map[dwarf.Type]*Type)
c.typedef = make(map[string]ast.Expr) c.typedef = make(map[string]ast.Expr)
c.bool = c.Ident("bool")
c.byte = c.Ident("byte") c.byte = c.Ident("byte")
c.int8 = c.Ident("int8") c.int8 = c.Ident("int8")
c.int16 = c.Ident("int16") c.int16 = c.Ident("int16")
@ -443,6 +445,10 @@ func (c *typeConv) Type(dtype dwarf.Type) *Type {
gt.Elt = sub.Go gt.Elt = sub.Go
t.C = fmt.Sprintf("typeof(%s[%d])", sub.C, dt.Count) t.C = fmt.Sprintf("typeof(%s[%d])", sub.C, dt.Count)
case *dwarf.BoolType:
t.Go = c.bool
t.Align = c.ptrSize
case *dwarf.CharType: case *dwarf.CharType:
if t.Size != 1 { if t.Size != 1 {
fatal("unexpected: %d-byte char type - %s", t.Size, dtype) fatal("unexpected: %d-byte char type - %s", t.Size, dtype)
@ -613,7 +619,7 @@ func (c *typeConv) Type(dtype dwarf.Type) *Type {
} }
switch dtype.(type) { switch dtype.(type) {
case *dwarf.AddrType, *dwarf.CharType, *dwarf.IntType, *dwarf.FloatType, *dwarf.UcharType, *dwarf.UintType: case *dwarf.AddrType, *dwarf.BoolType, *dwarf.CharType, *dwarf.IntType, *dwarf.FloatType, *dwarf.UcharType, *dwarf.UintType:
s := dtype.Common().Name s := dtype.Common().Name
if s != "" { if s != "" {
if ss, ok := cnameMap[s]; ok { if ss, ok := cnameMap[s]; ok {