MSVC: compilation works again (+minor style fixes)

This commit is contained in:
Cremno
2013-09-03 21:15:14 +02:00
parent 2fe64f24f8
commit 501df71833
5 changed files with 159 additions and 117 deletions
+17 -17
View File
@@ -1,3 +1,9 @@
/*
** mruby/debug.h - mruby debug info
**
** See Copyright Notice in mruby.h
*/
#ifndef MRUBY_DEBUG_H
#define MRUBY_DEBUG_H
@@ -5,9 +11,6 @@
extern "C" {
#endif
#include <stdint.h>
#include "mruby/value.h"
typedef enum mrb_debug_line_type {
mrb_debug_line_ary = 0,
mrb_debug_line_flat_map = 1
@@ -20,43 +23,40 @@ typedef struct mrb_irep_debug_info_line {
typedef struct mrb_irep_debug_info_file {
uint32_t start_pos;
char const* filename;
const char *filename;
mrb_sym filename_sym;
uint32_t line_entry_count;
mrb_debug_line_type line_type;
union {
void* line_ptr;
mrb_irep_debug_info_line* line_flat_map;
uint16_t* line_ary;
void *line_ptr;
mrb_irep_debug_info_line *line_flat_map;
uint16_t *line_ary;
};
} mrb_irep_debug_info_file;
typedef struct mrb_irep_debug_info {
uint32_t pc_count;
uint16_t flen;
mrb_irep_debug_info_file** files;
mrb_irep_debug_info_file **files;
} mrb_irep_debug_info;
struct mrb_irep;
struct mrb_state;
/*
* get line from irep's debug info and program counter
* @return returns NULL if not found
*/
char const* mrb_debug_get_filename(struct mrb_irep* irep, uint32_t pc);
const char *mrb_debug_get_filename(mrb_irep *irep, uint32_t pc);
/*
* get line from irep's debug info and program counter
* @return returns -1 if not found
*/
int32_t mrb_debug_get_line(struct mrb_irep* irep, uint32_t pc);
int32_t mrb_debug_get_line(mrb_irep *irep, uint32_t pc);
mrb_irep_debug_info_file* mrb_debug_info_append_file(
struct mrb_state* mrb, struct mrb_irep* irep,
mrb_irep_debug_info_file *mrb_debug_info_append_file(
mrb_state *mrb, mrb_irep *irep,
uint32_t start_pos, uint32_t end_pos);
mrb_irep_debug_info* mrb_debug_info_alloc(struct mrb_state* mrb, struct mrb_irep* irep);
void mrb_debug_info_free(struct mrb_state* mrb, mrb_irep_debug_info* d);
mrb_irep_debug_info *mrb_debug_info_alloc(mrb_state *mrb, mrb_irep *irep);
void mrb_debug_info_free(mrb_state *mrb, mrb_irep_debug_info *d);
#if defined(__cplusplus)
} /* extern "C" { */