Skip to content
Permalink
Browse files
Periodic Merge branch 'master' into ffi-io
  • Loading branch information
chuckremes committed Jan 8, 2016
2 parents 37e42ce + da81b5d commit 1c5650b44c25f5ea8c63b0f2a9d9b0fa165db658
Showing with 11 additions and 8 deletions.
  1. +2 −2 dockerfiles/ubuntu/14.04/Dockerfile
  2. +2 −2 dockerfiles/ubuntu/15.10/Dockerfile
  3. +1 −1 gems_list.txt
  4. +1 −1 vm/instructions.def
  5. +5 −2 vm/oop.hpp
@@ -1,8 +1,8 @@
FROM ubuntu:14.04

ADD https://rubinius-binaries-rubinius-com.s3-us-west-2.amazonaws.com/ubuntu/14.04/x86_64/rubinius-3.2.tar.bz2 /tmp/rubinius.tar.bz2
ADD https://rubinius-binaries-rubinius-com.s3-us-west-2.amazonaws.com/ubuntu/14.04/x86_64/rubinius-3.3.tar.bz2 /tmp/rubinius.tar.bz2
RUN apt-get -y install bzip2 && cd /opt && tar xvjf /tmp/rubinius.tar.bz2

ENV PATH /opt/rubinius/3.2/bin:/opt/rubinius/3.2/gems/bin:$PATH
ENV PATH /opt/rubinius/3.3/bin:/opt/rubinius/3.3/gems/bin:$PATH

CMD ["bash"]
@@ -1,8 +1,8 @@
FROM ubuntu:15.10

ADD https://rubinius-binaries-rubinius-com.s3-us-west-2.amazonaws.com/ubuntu/15.10/x86_64/rubinius-3.2.tar.bz2 /tmp/rubinius.tar.bz2
ADD https://rubinius-binaries-rubinius-com.s3-us-west-2.amazonaws.com/ubuntu/15.10/x86_64/rubinius-3.3.tar.bz2 /tmp/rubinius.tar.bz2
RUN apt-get -y install bzip2 && cd /opt && tar xvjf /tmp/rubinius.tar.bz2

ENV PATH /opt/rubinius/3.2/bin:/opt/rubinius/3.2/gems/bin:$PATH
ENV PATH /opt/rubinius/3.3/bin:/opt/rubinius/3.3/gems/bin:$PATH

CMD ["bash"]
@@ -93,7 +93,7 @@ rubysl-securerandom-2.0.0.gem
rubysl-set-2.0.1.gem
rubysl-shellwords-2.0.0.gem
rubysl-singleton-2.0.0.gem
rubysl-socket-2.0.1.gem
rubysl-socket-2.1.0.gem
rubysl-stringio-2.0.0.gem
rubysl-strscan-2.0.0.gem
rubysl-sync-2.0.0.gem
@@ -162,7 +162,7 @@ end

instruction goto_if_nil(location) [ value -- ] => branch
Object* t1 = stack_pop();
if(t1 == cNil) {
if(t1->nil_p()) {
store_ip(location);
}
end
@@ -93,7 +93,10 @@ Object* const cUndef = reinterpret_cast<Object*>(0x22L);

// Indicates the mask to use to check if a value is ruby false.
// This mask matches both false and nil ONLY.
#define FALSE_MASK 0xf
#define FALSE_MASK 0xf

// The bits that identify any nil value.
#define NIL_MASK 0x1f

#define CBOOL(v) (((uintptr_t)(v) & FALSE_MASK) != (uintptr_t)cFalse)
#define RBOOL(v) ((v) ? cTrue : cFalse)
@@ -586,7 +589,7 @@ Object* const cUndef = reinterpret_cast<Object*>(0x22L);
void wait(STATE);

bool nil_p() const {
return this == reinterpret_cast<ObjectHeader*>(cNil);
return (reinterpret_cast<intptr_t>(this) & NIL_MASK) == reinterpret_cast<intptr_t>(cNil);
}

bool true_p() const {

0 comments on commit 1c5650b

Please sign in to comment.