authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-02 21:56:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-02 21:56:33-07:00
log1abb4e59be4ceed603ec377d89b4b8ce831dbebe
tree0423da0469c75d8308c58325312200a5d7284740
parentfb1e3a5be976c76f821abf387bdd69446f2ab07b

fix various bugs related to guess number example

5 files changed, 25 insertions(+), 17 deletions(-)

example/guess_number/main.zig+3-1
......@@ -10,7 +10,9 @@ pub fn main(argc: isize, argv: &&u8, env: &&u8) -> i32 {
1010 print_str("Welcome to the Guess Number Game in Zig.\n");
1111
1212 var seed : u32;
13 if (os_get_random_bytes(&seed as &u8, 4) != 0) {
13 var err : isize;
14 // TODO #sizeof(u32) instead of 4
15 if ({err = os_get_random_bytes(&seed as &u8, 4); err != 4}) {
1416 // TODO full error message
1517 fprint_str(stderr_fileno, "unable to get random bytes");
1618 return 1;
src/analyze.cpp+1
......@@ -196,6 +196,7 @@ static TypeTableEntry *get_array_type(CodeGen *g, TypeTableEntry *child_type, ui
196196
197197 entry->size_in_bits = child_type->size_in_bits * array_size;
198198 entry->align_in_bits = child_type->align_in_bits;
199
199200 entry->di_type = LLVMZigCreateDebugArrayType(g->dbuilder, entry->size_in_bits,
200201 entry->align_in_bits, child_type->di_type, array_size);
201202 entry->data.array.child_type = child_type;
src/codegen.cpp+1
......@@ -1570,6 +1570,7 @@ static void do_code_gen(CodeGen *g) {
15701570
15711571 add_debug_source_node(g, var->decl_node);
15721572 var->value_ref = LLVMBuildAlloca(g->builder, var->type->type_ref, buf_ptr(&var->name));
1573 LLVMSetAlignment(var->value_ref, var->type->align_in_bits / 8);
15731574 }
15741575
15751576 var->di_loc_var = LLVMZigCreateLocalVariable(g->dbuilder, tag,
src/parser.cpp+1-1
......@@ -628,7 +628,7 @@ static uint8_t parse_char_literal(ParseContext *pc, Token *token) {
628628 } else if (return_count > 1) {
629629 ast_error(pc, token, "character literal too long");
630630 }
631 return return_count;
631 return return_value;
632632}
633633
634634static void parse_string_literal(ParseContext *pc, Token *token, Buf *buf, bool *out_c_str,
std/std.zig+19-15
......@@ -1,9 +1,6 @@
11const SYS_write : usize = 1;
22const SYS_exit : usize = 60;
3const SYS_getrandom : usize = 278;
4
5const stdout_fileno : isize = 1;
6const stderr_fileno : isize = 2;
3const SYS_getrandom : usize = 318;
74
85fn syscall1(number: usize, arg1: usize) -> usize {
96 asm volatile ("syscall"
......@@ -19,32 +16,37 @@ fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) -> usize {
1916 : "rcx", "r11")
2017}
2118
22pub fn getrandom(buf: &u8, count: usize, flags: u32) -> i32 {
23 return syscall3(SYS_getrandom, buf as usize, count, flags as usize) as i32;
24}
25
2619pub fn write(fd: isize, buf: &const u8, count: usize) -> isize {
27 return syscall3(SYS_write, fd as usize, buf as usize, count) as isize;
20 syscall3(SYS_write, fd as usize, buf as usize, count) as isize
2821}
2922
3023pub fn exit(status: i32) -> unreachable {
3124 syscall1(SYS_exit, status as usize);
32 unreachable;
25 unreachable
26}
27
28pub fn getrandom(buf: &u8, count: usize, flags: u32) -> isize {
29 syscall3(SYS_getrandom, buf as usize, count, flags as usize) as isize
3330}
3431
32const stdout_fileno : isize = 1;
33const stderr_fileno : isize = 2;
34
3535// TODO error handling
36pub fn os_get_random_bytes(buf: &u8, count: usize) -> i32 {
37 return getrandom(buf, count, 0);
36pub fn os_get_random_bytes(buf: &u8, count: usize) -> isize {
37 getrandom(buf, count, 0)
3838}
3939
4040// TODO error handling
4141// TODO handle buffering and flushing (mutex protected)
42pub fn print_str(str: string) -> isize { fprint_str(stdout_fileno, str) }
42pub fn print_str(str: string) -> isize {
43 fprint_str(stdout_fileno, str)
44}
4345
4446// TODO error handling
4547// TODO handle buffering and flushing (mutex protected)
4648pub fn fprint_str(fd: isize, str: string) -> isize {
47 return write(fd, str.ptr, str.len);
49 write(fd, str.ptr, str.len)
4850}
4951
5052// TODO handle buffering and flushing (mutex protected)
......@@ -56,7 +58,9 @@ pub fn print_u64(x: u64) -> isize {
5658 return write(stdout_fileno, buf.ptr, len);
5759}
5860
59fn digit_to_char(digit: u64) -> u8 { '0' + (digit as u8) }
61fn digit_to_char(digit: u64) -> u8 {
62 '0' + (digit as u8)
63}
6064
6165const max_u64_base10_digits: usize = 20;
6266