rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from mikegarts/working.with.stricter.compilers

Browse source 
working with stricter compiler flags
This commit is contained in:
David Lamparter 2016-06-22 13:27:15 +02:00 • committed by GitHub
commit 2b15c6ceae
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/capnpc-c.c
View file

@ -449,6 +449,8 @@ static const char *xor_member(struct field *f) {
return strf(&buf, " ^ %#xu", (uint32_t) f->v.intval); return strf(&buf, " ^ %#xu", (uint32_t) f->v.intval);
case Value_int64: case Value_int64:
return strf(&buf, " ^ ((int64_t)((uint64_t) %#xu << 32) ^ %#xu)",
(uint32_t) (f->v.intval >> 32), (uint32_t) f->v.intval);
case Value_uint64: case Value_uint64:
case Value_float64: case Value_float64:
return strf(&buf, " ^ ((uint64_t) %#xu << 32) ^ %#xu", return strf(&buf, " ^ ((uint64_t) %#xu << 32) ^ %#xu",
@ -487,17 +489,17 @@ static void set_member(struct str *func, struct field *f, const char *ptr, const
str_addf(func, "capn_write1(%s, %d, %s != %d);\n", ptr, f->f.slot.offset, var, (int) f->v.intval); str_addf(func, "capn_write1(%s, %d, %s != %d);\n", ptr, f->f.slot.offset, var, (int) f->v.intval);
break; break;
case Type_int8: case Type_int8:
str_addf(func, "capn_write8(%s, %d, (uint8_t) %s%s);\n", ptr, f->f.slot.offset, var, xor); str_addf(func, "capn_write8(%s, %d, (uint8_t) (%s%s));\n", ptr, f->f.slot.offset, var, xor);
break; break;
case Type_int16: case Type_int16:
case Type__enum: case Type__enum:
str_addf(func, "capn_write16(%s, %d, (uint16_t) %s%s);\n", ptr, 2*f->f.slot.offset, var, xor); str_addf(func, "capn_write16(%s, %d, (uint16_t) (%s%s));\n", ptr, 2*f->f.slot.offset, var, xor);
break; break;
case Type_int32: case Type_int32:
str_addf(func, "capn_write32(%s, %d, (uint32_t) %s%s);\n", ptr, 4*f->f.slot.offset, var, xor); str_addf(func, "capn_write32(%s, %d, (uint32_t) (%s%s));\n", ptr, 4*f->f.slot.offset, var, xor);
break; break;
case Type_int64: case Type_int64:
str_addf(func, "capn_write64(%s, %d, (uint64_t) %s%s);\n", ptr, 8*f->f.slot.offset, var, xor); str_addf(func, "capn_write64(%s, %d, (uint64_t) (%s%s));\n", ptr, 8*f->f.slot.offset, var, xor);
break; break;
case Type_uint8: case Type_uint8:
str_addf(func, "capn_write8(%s, %d, %s%s);\n", ptr, f->f.slot.offset, var, xor); str_addf(func, "capn_write8(%s, %d, %s%s);\n", ptr, f->f.slot.offset, var, xor);
@ -565,16 +567,16 @@ static void get_member(struct str *func, struct field *f, const char *ptr, const
var, ptr, f->f.slot.offset/8, 1 << (f->f.slot.offset%8), (int)f->v.intval); var, ptr, f->f.slot.offset/8, 1 << (f->f.slot.offset%8), (int)f->v.intval);
return; return;
case Type_int8: case Type_int8:
str_addf(func, "%s = (int8_t) capn_read8(%s, %d)%s;\n", var, ptr, f->f.slot.offset, xor); str_addf(func, "%s = (int8_t) ((int8_t)capn_read8(%s, %d))%s;\n", var, ptr, f->f.slot.offset, xor);
return; return;
case Type_int16: case Type_int16:
str_addf(func, "%s = (int16_t) capn_read16(%s, %d)%s;\n", var, ptr, 2*f->f.slot.offset, xor); str_addf(func, "%s = (int16_t) ((int16_t)capn_read16(%s, %d))%s;\n", var, ptr, 2*f->f.slot.offset, xor);
return; return;
case Type_int32: case Type_int32:
str_addf(func, "%s = (int32_t) capn_read32(%s, %d)%s;\n", var, ptr, 4*f->f.slot.offset, xor); str_addf(func, "%s = (int32_t) ((int32_t)capn_read32(%s, %d))%s;\n", var, ptr, 4*f->f.slot.offset, xor);
return; return;
case Type_int64: case Type_int64:
str_addf(func, "%s = (int64_t) capn_read64(%s, %d)%s;\n", var, ptr, 8*f->f.slot.offset, xor); str_addf(func, "%s = (int64_t)((int64_t)(capn_read64(%s, %d))%s);\n", var, ptr, 8*f->f.slot.offset, xor);
return; return;
case Type_uint8: case Type_uint8:
str_addf(func, "%s = capn_read8(%s, %d)%s;\n", var, ptr, f->f.slot.offset, xor); str_addf(func, "%s = capn_read8(%s, %d)%s;\n", var, ptr, f->f.slot.offset, xor);

6
lib/capnp_c.h
View file

@ -348,10 +348,12 @@ CAPN_INLINE int capn_write1(capn_ptr p, int off, int val) {
if (off >= p.datasz*8) { if (off >= p.datasz*8) {
return -1; return -1;
} else if (val) { } else if (val) {
((uint8_t*)p.data)[off/8] |= (uint8_t)(1 << (off%8)); uint8_t tmp = (uint8_t)(1 << ( off & 7));
( (uint8_t*)p.data )[off>>3] |= tmp;
return 0; return 0;
} else { } else {
((uint8_t*)p.data)[off/8] &= (uint8_t)~(1 << (off%8)); uint8_t tmp = (uint8_t)(~(1 << ( off & 7)));
((uint8_t*)p.data)[off>>3] &= tmp;
return 0; return 0;
} }
} }