github
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

unix: Workaround MP_OBJ_NEW_SMALL_INT() 64-bit issues.

pull/518/head
Paul Sokolovsky 11 years ago
parent
5d3a830171
commit
fa6f0506c1
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      unix/file.c
  2. 6
      unix/modffi.c
  3. 4
      unix/modsocket.c

2
unix/file.c
View File

@ -106,7 +106,7 @@ STATIC mp_obj_t fdfile_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
int fd = open(fname, mode, 0644); int fd = open(fname, mode, 0644);
if (fd == -1) { if (fd == -1) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)errno)));
} }
return fdfile_new(fd); return fdfile_new(fd);
} }

6
unix/modffi.c
View File

@ -145,7 +145,7 @@ STATIC mp_obj_t ffimod_func(uint n_args, const mp_obj_t *args) {
void *sym = dlsym(self->handle, symname); void *sym = dlsym(self->handle, symname);
if (sym == NULL) { if (sym == NULL) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)errno)));
} }
int nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(args[3])); int nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(args[3]));
mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type*, nparams); mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type*, nparams);
@ -219,7 +219,7 @@ STATIC mp_obj_t ffimod_var(mp_obj_t self_in, mp_obj_t vartype_in, mp_obj_t symna
void *sym = dlsym(self->handle, symname); void *sym = dlsym(self->handle, symname);
if (sym == NULL) { if (sym == NULL) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)errno)));
} }
mp_obj_ffivar_t *o = m_new_obj(mp_obj_ffivar_t); mp_obj_ffivar_t *o = m_new_obj(mp_obj_ffivar_t);
o->base.type = &ffivar_type; o->base.type = &ffivar_type;
@ -235,7 +235,7 @@ STATIC mp_obj_t ffimod_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
void *mod = dlopen(fname, RTLD_NOW | RTLD_LOCAL); void *mod = dlopen(fname, RTLD_NOW | RTLD_LOCAL);
if (mod == NULL) { if (mod == NULL) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)errno)));
} }
mp_obj_ffimod_t *o = m_new_obj(mp_obj_ffimod_t); mp_obj_ffimod_t *o = m_new_obj(mp_obj_ffimod_t);
o->base.type = type_in; o->base.type = type_in;

4
unix/modsocket.c
View File

@ -33,7 +33,7 @@ STATIC const mp_obj_type_t microsocket_type;
// Helper functions // Helper functions
#define RAISE_ERRNO(err_flag, error_val) \ #define RAISE_ERRNO(err_flag, error_val) \
{ if (err_flag == -1) \ { if (err_flag == -1) \
{ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } } { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)error_val))); } }
STATIC mp_obj_socket_t *socket_new(int fd) { STATIC mp_obj_socket_t *socket_new(int fd) {
mp_obj_socket_t *o = m_new_obj(mp_obj_socket_t); mp_obj_socket_t *o = m_new_obj(mp_obj_socket_t);
@ -283,7 +283,7 @@ STATIC mp_obj_t mod_socket_gethostbyname(mp_obj_t arg) {
struct hostent *h = gethostbyname(s); struct hostent *h = gethostbyname(s);
if (h == NULL) { if (h == NULL) {
// CPython: socket.herror // CPython: socket.herror
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(h_errno))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT((machine_int_t)h_errno)));
} }
assert(h->h_length == 4); assert(h->h_length == 4);
return mp_obj_new_int(*(int*)*h->h_addr_list); return mp_obj_new_int(*(int*)*h->h_addr_list);

Write Preview
Loading…
Cancel
Save