Skip to content

Commit

Permalink
Change unsigned char to uint8_t
Browse files Browse the repository at this point in the history
  • Loading branch information
@masuidrive
masuidrive committed Mar 8, 2013
1 parent 2842583 commit 8140942
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 70 deletions.
38 changes: 19 additions & 19 deletions include/mruby/dump.h
View file
Expand Up @@ -22,7 +22,7 @@ int mrb_dump_irep_binary(mrb_state*, int, FILE*);
int mrb_dump_irep_cfunc(mrb_state *mrb, int n, FILE *f, const char *initname);
int mrb_read_irep_file(mrb_state*, FILE*);
#endif
int mrb_read_irep(mrb_state*, const unsigned char*);
int mrb_read_irep(mrb_state*, const uint8_t*);

#ifdef ENABLE_STDIO
mrb_value mrb_load_irep_file(mrb_state*,FILE*);
Expand Down Expand Up @@ -60,18 +60,18 @@ mrb_value mrb_load_irep_file(mrb_state*,FILE*);

// Rite binary header
struct rite_binary_header {
unsigned char binary_identify[4]; // Rite Binary Identify
unsigned char binary_version[4]; // Rite Binary Format Version
unsigned char binary_crc[2]; // Rite Binary CRC
unsigned char binary_size[4]; // Rite Binary Size
unsigned char compiler_name[4]; // Rite Compiler name
unsigned char compiler_version[4];
uint8_t binary_identify[4]; // Rite Binary Identify
uint8_t binary_version[4]; // Rite Binary Format Version
uint8_t binary_crc[2]; // Rite Binary CRC
uint8_t binary_size[4]; // Rite Binary Size
uint8_t compiler_name[4]; // Rite Compiler name
uint8_t compiler_version[4];
};

// Rite section header
#define RITE_SECTION_HEADER \
unsigned char section_identify[4]; \
unsigned char section_size[4];
uint8_t section_identify[4]; \
uint8_t section_size[4];

struct rite_section_header {
RITE_SECTION_HEADER;
Expand All @@ -80,32 +80,32 @@ struct rite_section_header {
struct rite_section_irep_header {
RITE_SECTION_HEADER;

unsigned char rite_version[4]; // Rite Instruction Specification Version
unsigned char nirep[2]; // Number of ireps
unsigned char sirep[2]; // Start index
uint8_t rite_version[4]; // Rite Instruction Specification Version
uint8_t nirep[2]; // Number of ireps
uint8_t sirep[2]; // Start index
};

struct rite_binary_footer {
RITE_SECTION_HEADER;
};

static inline int
uint8_to_bin(uint8_t s, unsigned char *bin)
uint8_to_bin(uint8_t s, uint8_t *bin)
{
*bin = s;
return sizeof(uint8_t);
}

static inline int
uint16_to_bin(uint16_t s, unsigned char *bin)
uint16_to_bin(uint16_t s, uint8_t *bin)
{
*bin++ = (s >> 8) & 0xff;
*bin = s & 0xff;
return sizeof(uint16_t);
}

static inline int
uint32_to_bin(uint32_t l, unsigned char *bin)
uint32_to_bin(uint32_t l, uint8_t *bin)
{
*bin++ = (l >> 24) & 0xff;
*bin++ = (l >> 16) & 0xff;
Expand All @@ -115,7 +115,7 @@ uint32_to_bin(uint32_t l, unsigned char *bin)
}

static inline uint32_t
bin_to_uint32(const unsigned char *bin)
bin_to_uint32(const uint8_t *bin)
{
return (uint32_t)bin[0] << 24 |
(uint32_t)bin[1] << 16 |
Expand All @@ -124,21 +124,21 @@ bin_to_uint32(const unsigned char *bin)
}

static inline uint16_t
bin_to_uint16(const unsigned char *bin)
bin_to_uint16(const uint8_t *bin)
{
return (uint16_t)bin[0] << 8 |
(uint16_t)bin[1];
}

static inline uint8_t
bin_to_uint8(const unsigned char *bin)
bin_to_uint8(const uint8_t *bin)
{
return (uint8_t)bin[0];
}

/* crc.c */
uint32_t
calc_crc_16_ccitt(const unsigned char *src, uint32_t nbytes, uint16_t crcwk);
calc_crc_16_ccitt(const uint8_t *src, uint32_t nbytes, uint16_t crcwk);

#if defined(__cplusplus)
} /* extern "C" { */
Expand Down
2 changes: 1 addition & 1 deletion mrblib/init_mrblib.c
View file
Expand Up @@ -4,7 +4,7 @@
#include "mruby/string.h"
#include "mruby/proc.h"

extern const unsigned char mrblib_irep[];
extern const uint8_t mrblib_irep[];

void
mrb_init_mrblib(mrb_state *mrb)
Expand Down
42 changes: 21 additions & 21 deletions src/dump.c
View file
Expand Up @@ -28,9 +28,9 @@ get_irep_header_size(mrb_state *mrb)
}

static size_t
write_irep_header(mrb_state *mrb, mrb_irep *irep, unsigned char *buf)
write_irep_header(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
{
unsigned char *cur = buf;
uint8_t *cur = buf;

cur += uint32_to_bin(get_irep_record_size(mrb, irep), cur); /* record size */
cur += uint16_to_bin((uint16_t)irep->nlocals, cur); /* number of local variable */
Expand All @@ -50,9 +50,9 @@ get_iseq_block_size(mrb_state *mrb, mrb_irep *irep)
}

static int
write_iseq_block(mrb_state *mrb, mrb_irep *irep, unsigned char *buf)
write_iseq_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
{
unsigned char *cur = buf;
uint8_t *cur = buf;
int iseq_no;

cur += uint32_to_bin(irep->ilen, cur); /* number of opcode */
Expand Down Expand Up @@ -101,10 +101,10 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
}

static int
write_pool_block(mrb_state *mrb, mrb_irep *irep, unsigned char *buf)
write_pool_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
{
int result, pool_no;
unsigned char *cur = buf;
uint8_t *cur = buf;
size_t buf_size, len;
mrb_value str;
char *char_buf = NULL;
Expand Down Expand Up @@ -184,10 +184,10 @@ get_syms_block_size(mrb_state *mrb, mrb_irep *irep)
}

static int
write_syms_block(mrb_state *mrb, mrb_irep *irep, unsigned char *buf)
write_syms_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
{
int result, sym_no, len, buf_size;
unsigned char *cur = buf;
uint8_t *cur = buf;
uint16_t nlen;
char *char_buf = NULL;
const char *name;
Expand Down Expand Up @@ -248,7 +248,7 @@ get_irep_record_size(mrb_state *mrb, mrb_irep *irep)
}

static int
write_irep_record(mrb_state *mrb, mrb_irep *irep, unsigned char* bin, uint32_t *irep_record_size)
write_irep_record(mrb_state *mrb, mrb_irep *irep, uint8_t* bin, uint32_t *irep_record_size)
{
if (irep == NULL) {
return MRB_DUMP_INVALID_IREP;
Expand All @@ -271,7 +271,7 @@ write_irep_record(mrb_state *mrb, mrb_irep *irep, unsigned char* bin, uint32_t *
}

static size_t
mrb_write_eof(mrb_state *mrb, unsigned char *bin)
mrb_write_eof(mrb_state *mrb, uint8_t *bin)
{
struct rite_binary_footer footer;

Expand All @@ -284,7 +284,7 @@ mrb_write_eof(mrb_state *mrb, unsigned char *bin)


static int
mrb_write_section_irep_header(mrb_state *mrb, uint32_t section_size, uint16_t nirep, uint16_t sirep, unsigned char *bin)
mrb_write_section_irep_header(mrb_state *mrb, uint32_t section_size, uint16_t nirep, uint16_t sirep, uint8_t *bin)
{
struct rite_section_irep_header *header = (struct rite_section_irep_header*)bin;

Expand All @@ -298,11 +298,11 @@ mrb_write_section_irep_header(mrb_state *mrb, uint32_t section_size, uint16_t ni
}

static int
mrb_write_section_irep(mrb_state *mrb, int start_index, unsigned char *bin)
mrb_write_section_irep(mrb_state *mrb, int start_index, uint8_t *bin)
{
int result, irep_no;
uint32_t section_size = 0, rlen = 0; /* size of irep record */
unsigned char *cur = bin;
uint8_t *cur = bin;

if (mrb == NULL || start_index < 0 || start_index >= mrb->irep_len || bin == NULL) {
return MRB_DUMP_INVALID_ARGUMENT;
Expand All @@ -326,7 +326,7 @@ mrb_write_section_irep(mrb_state *mrb, int start_index, unsigned char *bin)
}

static int
write_rite_binary_header(mrb_state *mrb, uint32_t binary_size, unsigned char* bin)
write_rite_binary_header(mrb_state *mrb, uint32_t binary_size, uint8_t* bin)
{
struct rite_binary_header *header = (struct rite_binary_header*)bin;
uint16_t crc;
Expand All @@ -346,10 +346,10 @@ write_rite_binary_header(mrb_state *mrb, uint32_t binary_size, unsigned char* bi
}

static int
mrb_dump_irep(mrb_state *mrb, int start_index, unsigned char **bin, uint32_t *bin_size)
mrb_dump_irep(mrb_state *mrb, int start_index, uint8_t **bin, uint32_t *bin_size)
{
int result = MRB_DUMP_OK, irep_no, section_irep_size;
unsigned char *cur = NULL;
uint8_t *cur = NULL;

if (mrb == NULL || start_index < 0 || start_index >= mrb->irep_len) {
*bin = NULL;
Expand All @@ -362,7 +362,7 @@ mrb_dump_irep(mrb_state *mrb, int start_index, unsigned char **bin, uint32_t *bi
}

*bin_size += sizeof(struct rite_binary_header) + section_irep_size + sizeof(struct rite_binary_footer);
cur = *bin = (unsigned char *)mrb_malloc(mrb, *bin_size);
cur = *bin = (uint8_t *)mrb_malloc(mrb, *bin_size);
if(cur == NULL) {
goto error_exit;
}
Expand Down Expand Up @@ -393,7 +393,7 @@ mrb_dump_irep(mrb_state *mrb, int start_index, unsigned char **bin, uint32_t *bi
int
mrb_dump_irep_binary(mrb_state *mrb, int start_index, FILE* fp)
{
unsigned char *bin = NULL;
uint8_t *bin = NULL;
uint32_t bin_size = 0;
int result;

Expand All @@ -413,7 +413,7 @@ mrb_dump_irep_binary(mrb_state *mrb, int start_index, FILE* fp)
int
mrb_dump_irep_cfunc(mrb_state *mrb, int start_index, FILE *fp, const char *initname)
{
unsigned char *bin = NULL;
uint8_t *bin = NULL;
uint32_t bin_size = 0, bin_idx = 0;
int result;

Expand All @@ -423,10 +423,10 @@ mrb_dump_irep_cfunc(mrb_state *mrb, int start_index, FILE *fp, const char *initn

result = mrb_dump_irep(mrb, start_index, &bin, &bin_size);
if (result == MRB_DUMP_OK) {
fprintf(fp, "const unsigned char %s[] = {", initname);
fprintf(fp, "const uint8_t %s[] = {", initname);
while (bin_idx < bin_size) {
if (bin_idx % 16 == 0 ) fputs("\n", fp);
fprintf(fp, "0x%02x,", (unsigned char)bin[bin_idx++]);
fprintf(fp, "0x%02x,", bin[bin_idx++]);
}
fputs("\n};\n", fp);
}
Expand Down

0 comments on commit 8140942

Please sign in to comment.