September 2010 - macruby-changes - lists.macosforge.org

[4513] MacRuby/trunk/ext/openssl/ossl_rand.c
by source_changes＠macosforge.org 14 Sep '10

14 Sep '10

Revision: 4513 http://trac.macosforge.org/projects/ruby/changeset/4513 Author: lsansonetti(a)apple.com Date: 2010-09-13 21:40:27 -0700 (Mon, 13 Sep 2010) Log Message: ----------- omg another openssl crasher Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_rand.c Modified: MacRuby/trunk/ext/openssl/ossl_rand.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_rand.c 2010-09-14 01:28:43 UTC (rev 4512) +++ MacRuby/trunk/ext/openssl/ossl_rand.c 2010-09-14 04:40:27 UTC (rev 4513) @@ -120,8 +120,9 @@ VALUE str; int n = NUM2INT(len); - str = rb_str_new(0, n); - if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) { + str = rb_bstr_new(); + rb_bstr_resize(str, n); + if (!RAND_pseudo_bytes((unsigned char *)rb_bstr_bytes(str), n)) { ossl_raise(eRandomError, NULL); }

1 0

[4512] MacRuby/trunk/bs.c
by source_changes＠macosforge.org 14 Sep '10

14 Sep '10

Revision: 4512 http://trac.macosforge.org/projects/ruby/changeset/4512 Author: lsansonetti(a)apple.com Date: 2010-09-13 18:28:43 -0700 (Mon, 13 Sep 2010) Log Message: ----------- in 32-bit mode, ignore elements having only type64 attributes Modified Paths: -------------- MacRuby/trunk/bs.c Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2010-09-13 21:38:09 UTC (rev 4511) +++ MacRuby/trunk/bs.c 2010-09-14 01:28:43 UTC (rev 4512) @@ -485,6 +485,16 @@ } \ while (0) +#if __LP64__ +# define CHECK_TYPE_ATTRIBUTE(var) CHECK_ATTRIBUTE(var, "type") +#else +# define CHECK_TYPE_ATTRIBUTE(var) \ + if (var == NULL && get_type64_attribute(reader) != NULL) { \ + break; \ + } \ + CHECK_ATTRIBUTE(var, "type") +#endif + #define CHECK_ATTRIBUTE_CAN_BE_EMPTY(a, name) \ CHECK_ATTRIBUTE0(a, name, true) @@ -595,7 +605,7 @@ const_name = get_attribute(reader, "name"); CHECK_ATTRIBUTE(const_name, "name"); const_type = get_type_attribute(reader); - CHECK_ATTRIBUTE(const_type, "type"); + CHECK_TYPE_ATTRIBUTE(const_type); bs_const = (bs_element_constant_t *) malloc(sizeof(bs_element_constant_t)); @@ -688,7 +698,7 @@ int field_count; struct_decorated_type = get_type_attribute(reader); - CHECK_ATTRIBUTE(struct_decorated_type, "type"); + CHECK_TYPE_ATTRIBUTE(struct_decorated_type); struct_name = get_attribute(reader, "name"); CHECK_ATTRIBUTE(struct_name, "name"); @@ -731,7 +741,7 @@ opaque_name = get_attribute(reader, "name"); CHECK_ATTRIBUTE(opaque_name, "name"); opaque_type = get_type_attribute(reader); - CHECK_ATTRIBUTE(opaque_type, "type"); + CHECK_TYPE_ATTRIBUTE(opaque_type); bs_opaque = (bs_element_opaque_t *)malloc(sizeof(bs_element_opaque_t)); @@ -754,7 +764,7 @@ cftype_name = get_attribute(reader, "name"); CHECK_ATTRIBUTE(cftype_name, "name"); cftype_type = get_type_attribute(reader); - CHECK_ATTRIBUTE(cftype_type, "type"); + CHECK_TYPE_ATTRIBUTE(cftype_type); bs_cftype = (bs_element_cftype_t *)malloc(sizeof(bs_element_cftype_t)); @@ -1041,7 +1051,7 @@ CHECK_ATTRIBUTE(selector, "selector"); method_type = get_type_attribute(reader); - CHECK_ATTRIBUTE(method_type, "type"); + CHECK_TYPE_ATTRIBUTE(method_type); bs_informal_method = (bs_element_informal_protocol_method_t *) malloc(sizeof(bs_element_informal_protocol_method_t));

1 0

[4511] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 13 Sep '10

13 Sep '10

Revision: 4511 http://trac.macosforge.org/projects/ruby/changeset/4511 Author: lsansonetti(a)apple.com Date: 2010-09-13 14:38:09 -0700 (Mon, 13 Sep 2010) Log Message: ----------- don't crash when using defined?(super) out of a method block Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-13 21:18:42 UTC (rev 4510) +++ MacRuby/trunk/vm.cpp 2010-09-13 21:38:09 UTC (rev 4511) @@ -1605,6 +1605,10 @@ if (type == DEFINED_SUPER) { klass = RCLASS_SUPER(klass); } + if (what == 0) { + rb_raise(rb_eRuntimeError, + "defined?(super) out of a method block isn't supported"); + } const char *idname = rb_id2name((ID)what); SEL sel = sel_registerName(idname);

1 0

[4510] MacRuby/trunk/ext/openssl
by source_changes＠macosforge.org 13 Sep '10

13 Sep '10

Revision: 4510 http://trac.macosforge.org/projects/ruby/changeset/4510 Author: lsansonetti(a)apple.com Date: 2010-09-13 14:18:42 -0700 (Mon, 13 Sep 2010) Log Message: ----------- more openssl fixes Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl.h MacRuby/trunk/ext/openssl/ossl_asn1.c MacRuby/trunk/ext/openssl/ossl_ocsp.c MacRuby/trunk/ext/openssl/ossl_pkcs12.c MacRuby/trunk/ext/openssl/ossl_pkcs7.c MacRuby/trunk/ext/openssl/ossl_pkey_dh.c MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c MacRuby/trunk/ext/openssl/ossl_pkey_ec.c MacRuby/trunk/ext/openssl/ossl_x509attr.c MacRuby/trunk/ext/openssl/ossl_x509cert.c MacRuby/trunk/ext/openssl/ossl_x509req.c Modified: MacRuby/trunk/ext/openssl/ossl.h =================================================================== --- MacRuby/trunk/ext/openssl/ossl.h 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl.h 2010-09-13 21:18:42 UTC (rev 4510) @@ -119,10 +119,10 @@ VALUE ossl_buf2str(char *buf, int len); #define ossl_str_adjust(str, p) \ do{\ - int len = RSTRING_LEN(str);\ - int newlen = (p) - (unsigned char*)RSTRING_PTR(str);\ + long len = rb_bstr_length(str);\ + long newlen = (p) - (unsigned char*)rb_bstr_bytes(str);\ assert(newlen <= len);\ - rb_str_set_len(str, newlen);\ + rb_bstr_set_length(str, newlen);\ }while(0) /* Modified: MacRuby/trunk/ext/openssl/ossl_asn1.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -696,8 +696,9 @@ tag_class = ossl_asn1_tag_class(self); if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0) ossl_raise(eASN1Error, NULL); - der = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(der); + der = rb_bstr_new(); + rb_bstr_resize(der, length); + p = (unsigned char *)rb_bstr_bytes(der); ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class); memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value)); p += RSTRING_LEN(value); Modified: MacRuby/trunk/ext/openssl/ossl_ocsp.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_ocsp.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_ocsp.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -266,8 +266,9 @@ GetOCSPReq(self, req); if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0) ossl_raise(eOCSPError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_OCSP_REQUEST(req, &p) <= 0) ossl_raise(eOCSPError, NULL); ossl_str_adjust(str, p); @@ -380,8 +381,9 @@ GetOCSPRes(self, res); if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0) ossl_raise(eOCSPError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_OCSP_RESPONSE(res, &p) <= 0) ossl_raise(eOCSPError, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_pkcs12.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkcs12.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_pkcs12.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -182,8 +182,9 @@ GetPKCS12(self, p12); if((len = i2d_PKCS12(p12, NULL)) <= 0) ossl_raise(ePKCS12Error, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_PKCS12(p12, &p) <= 0) ossl_raise(ePKCS12Error, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_pkcs7.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkcs7.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_pkcs7.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -779,8 +779,9 @@ GetPKCS7(self, pkcs7); if((len = i2d_PKCS7(pkcs7, NULL)) <= 0) ossl_raise(ePKCS7Error, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_PKCS7(pkcs7, &p) <= 0) ossl_raise(ePKCS7Error, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_pkey_dh.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkey_dh.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_pkey_dh.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -253,8 +253,9 @@ GetPKeyDH(self, pkey); if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0) ossl_raise(eDHError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_DHparams(pkey->pkey.dh, &p) < 0) ossl_raise(eDHError, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -288,8 +288,9 @@ i2d_func = i2d_DSA_PUBKEY; if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0) ossl_raise(eDSAError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_func(pkey->pkey.dsa, &p) < 0) ossl_raise(eDSAError, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_pkey_ec.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkey_ec.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_pkey_ec.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -672,8 +672,9 @@ if (EC_KEY_get0_private_key(ec) == NULL) ossl_raise(eECError, "Private EC key needed!"); - str = rb_str_new(0, ECDSA_size(ec) + 16); - if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1) + str = rb_bstr_new(); + rb_bstr_resize(str, ECDSA_size(ec) + 16); + if (ECDSA_sign(0, (const unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) rb_bstr_bytes(str), &buf_len, ec) != 1) ossl_raise(eECError, "ECDSA_sign"); rb_str_resize(str, buf_len); Modified: MacRuby/trunk/ext/openssl/ossl_x509attr.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_x509attr.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_x509attr.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -212,16 +212,18 @@ if(attr->value.ptr == NULL) return Qnil; if(OSSL_X509ATTR_IS_SINGLE(attr)){ length = i2d_ASN1_TYPE(attr->value.single, NULL); - str = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, length); + p = (unsigned char *)rb_bstr_bytes(str); i2d_ASN1_TYPE(attr->value.single, &p); ossl_str_adjust(str, p); } else{ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); - str = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, length); + p = (unsigned char *)rb_bstr_bytes(str); i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_x509cert.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_x509cert.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_x509cert.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -191,8 +191,8 @@ GetX509(self, x509); if ((len = i2d_X509(x509, NULL)) <= 0) ossl_raise(eX509CertError, NULL); - str = rb_bstr_new_with_data(0, len); - rb_bstr_set_length(str, len); + str = rb_bstr_new(); + rb_bstr_resize(str, len); p = (unsigned char *)rb_bstr_bytes(str); if (i2d_X509(x509, &p) <= 0) ossl_raise(eX509CertError, NULL); Modified: MacRuby/trunk/ext/openssl/ossl_x509req.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_x509req.c 2010-09-11 08:51:52 UTC (rev 4509) +++ MacRuby/trunk/ext/openssl/ossl_x509req.c 2010-09-13 21:18:42 UTC (rev 4510) @@ -172,8 +172,9 @@ GetX509Req(self, req); if ((len = i2d_X509_REQ(req, NULL)) <= 0) ossl_raise(eX509CertError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if (i2d_X509_REQ(req, &p) <= 0) ossl_raise(eX509ReqError, NULL); ossl_str_adjust(str, p);

1 0

[4509] MacRuby/trunk/ext/openssl
by source_changes＠macosforge.org 11 Sep '10

11 Sep '10

Revision: 4509 http://trac.macosforge.org/projects/ruby/changeset/4509 Author: lsansonetti(a)apple.com Date: 2010-09-11 01:51:52 -0700 (Sat, 11 Sep 2010) Log Message: ----------- fix more openssl crashers Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_asn1.c MacRuby/trunk/ext/openssl/ossl_x509ext.c MacRuby/trunk/ext/openssl/ossl_x509name.c Modified: MacRuby/trunk/ext/openssl/ossl_asn1.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-11 08:42:08 UTC (rev 4508) +++ MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-11 08:51:52 UTC (rev 4509) @@ -672,7 +672,7 @@ static VALUE join_der(VALUE enumerable) { - VALUE str = rb_str_new(0, 0); + VALUE str = rb_bstr_new(); rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str); return str; } Modified: MacRuby/trunk/ext/openssl/ossl_x509ext.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_x509ext.c 2010-09-11 08:42:08 UTC (rev 4508) +++ MacRuby/trunk/ext/openssl/ossl_x509ext.c 2010-09-11 08:51:52 UTC (rev 4509) @@ -281,7 +281,7 @@ if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){ oid = ossl_to_der_if_possible(oid); StringValue(oid); - p = (unsigned char *)RSTRING_PTR(oid); + p = (const unsigned char *)RSTRING_PTR(oid); x = d2i_X509_EXTENSION(&ext, &p, RSTRING_LEN(oid)); DATA_PTR(self) = ext; if(!x) @@ -411,8 +411,9 @@ GetX509Ext(obj, ext); if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0) ossl_raise(eX509ExtError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_X509_EXTENSION(ext, &p) < 0) ossl_raise(eX509ExtError, NULL); ossl_str_adjust(str, p); Modified: MacRuby/trunk/ext/openssl/ossl_x509name.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_x509name.c 2010-09-11 08:42:08 UTC (rev 4508) +++ MacRuby/trunk/ext/openssl/ossl_x509name.c 2010-09-11 08:51:52 UTC (rev 4509) @@ -139,7 +139,7 @@ VALUE str = ossl_to_der_if_possible(arg); X509_NAME *x; StringValue(str); - p = (unsigned char *)RSTRING_PTR(str); + p = (const unsigned char *)RSTRING_PTR(str); x = d2i_X509_NAME(&name, &p, RSTRING_LEN(str)); DATA_PTR(self) = name; if(!x){ @@ -321,8 +321,9 @@ GetX509Name(self, name); if((len = i2d_X509_NAME(name, NULL)) <= 0) ossl_raise(eX509NameError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if(i2d_X509_NAME(name, &p) <= 0) ossl_raise(eX509NameError, NULL); ossl_str_adjust(str, p);

1 0

[4508] MacRuby/trunk/ext/openssl/ossl_ns_spki.c
by source_changes＠macosforge.org 11 Sep '10

11 Sep '10

Revision: 4508 http://trac.macosforge.org/projects/ruby/changeset/4508 Author: lsansonetti(a)apple.com Date: 2010-09-11 01:42:08 -0700 (Sat, 11 Sep 2010) Log Message: ----------- fix a crasher in Netscape::SPKI#to_der Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_ns_spki.c Modified: MacRuby/trunk/ext/openssl/ossl_ns_spki.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_ns_spki.c 2010-09-11 08:38:59 UTC (rev 4507) +++ MacRuby/trunk/ext/openssl/ossl_ns_spki.c 2010-09-11 08:42:08 UTC (rev 4508) @@ -86,8 +86,9 @@ GetSPKI(self, spki); if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0) ossl_raise(eX509CertError, NULL); - str = rb_str_new(0, len); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, len); + p = (unsigned char *)rb_bstr_bytes(str); if (i2d_NETSCAPE_SPKI(spki, &p) <= 0) ossl_raise(eX509CertError, NULL); ossl_str_adjust(str, p);

1 0

[4507] MacRuby/trunk/ext/openssl/ossl_asn1.c
by source_changes＠macosforge.org 11 Sep '10

11 Sep '10

Revision: 4507 http://trac.macosforge.org/projects/ruby/changeset/4507 Author: lsansonetti(a)apple.com Date: 2010-09-11 01:38:59 -0700 (Sat, 11 Sep 2010) Log Message: ----------- fix a crasher in ASN1::Constructive#to_der Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_asn1.c Modified: MacRuby/trunk/ext/openssl/ossl_asn1.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-11 00:36:29 UTC (rev 4506) +++ MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-09-11 08:38:59 UTC (rev 4507) @@ -971,8 +971,9 @@ seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag); length = ASN1_object_size(1, seq_len, tn); - str = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(str); + str = rb_bstr_new(); + rb_bstr_resize(str, length); + p = (unsigned char *)rb_bstr_bytes(str); if(tc == V_ASN1_UNIVERSAL) ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc); else{

1 0

[4506] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 11 Sep '10

11 Sep '10

Revision: 4506 http://trac.macosforge.org/projects/ruby/changeset/4506 Author: lsansonetti(a)apple.com Date: 2010-09-10 17:36:29 -0700 (Fri, 10 Sep 2010) Log Message: ----------- grab the kernel bitcode from SDK if it exists Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-09-10 22:41:36 UTC (rev 4505) +++ MacRuby/trunk/bin/rubyc 2010-09-11 00:36:29 UTC (rev 4506) @@ -158,9 +158,18 @@ tmp_objs = [] @archs.each do |arch| + # Locate the kernel bitcode file if needed. + env = '' + if @sdk + kernel_path = File.join(@sdk, "usr/lib/libmacruby-kernel-#{arch}.bc") + if File.exist?(kernel_path) + env = "/usr/bin/env VM_KERNEL_PATH=\"#{kernel_path}\"" + end + end + # Compile the file into LLVM bitcode. bc = gen_tmpfile(base + arch, 'bc') - execute("arch -#{arch} #{@macruby} #{@uses_bs_flags} --emit-llvm \"#{bc}\" #{init_func} \"#{path}\"") + execute("#{env} arch -#{arch} #{@macruby} #{@uses_bs_flags} --emit-llvm \"#{bc}\" #{init_func} \"#{path}\"") # Compile the bitcode as assembly. asm = gen_tmpfile(base + arch, 's')

1 0

[4505] MacRuby/trunk
by source_changes＠macosforge.org 10 Sep '10

10 Sep '10

Revision: 4505 http://trac.macosforge.org/projects/ruby/changeset/4505 Author: lsansonetti(a)apple.com Date: 2010-09-10 15:41:36 -0700 (Fri, 10 Sep 2010) Log Message: ----------- expose ivar slots to static compilation Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-09-10 21:17:10 UTC (rev 4504) +++ MacRuby/trunk/compiler.cpp 2010-09-10 22:41:36 UTC (rev 4505) @@ -1357,16 +1357,6 @@ "", bb); } -extern "C" -struct icache * -rb_vm_ivar_slot_allocate(void) -{ - struct icache *icache = (struct icache *)malloc(sizeof(struct icache)); - icache->klass = 0; - icache->slot = SLOT_CACHE_VIRGIN; - return icache; -} - Value * RoxorCompiler::compile_slot_cache(ID id) { Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-10 21:17:10 UTC (rev 4504) +++ MacRuby/trunk/vm.cpp 2010-09-10 22:41:36 UTC (rev 4505) @@ -1415,6 +1415,16 @@ } extern "C" +struct icache * +rb_vm_ivar_slot_allocate(void) +{ + struct icache *icache = (struct icache *)malloc(sizeof(struct icache)); + icache->klass = 0; + icache->slot = SLOT_CACHE_VIRGIN; + return icache; +} + +extern "C" int rb_vm_get_ivar_slot(VALUE obj, ID name, bool create) { Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-09-10 21:17:10 UTC (rev 4504) +++ MacRuby/trunk/vm.h 2010-09-10 22:41:36 UTC (rev 4505) @@ -531,6 +531,8 @@ int slot; }; +struct icache *rb_vm_ivar_slot_allocate(void); + struct ccache { VALUE outer; VALUE val;

1 0

[4504] ControlTower/trunk/lib/control_tower/rack_socket.rb
by source_changes＠macosforge.org 10 Sep '10

10 Sep '10

Revision: 4504 http://trac.macosforge.org/projects/ruby/changeset/4504 Author: joshua.ballanco(a)apple.com Date: 2010-09-10 14:17:10 -0700 (Fri, 10 Sep 2010) Log Message: ----------- Fix tempfile unlink code Modified Paths: -------------- ControlTower/trunk/lib/control_tower/rack_socket.rb Modified: ControlTower/trunk/lib/control_tower/rack_socket.rb =================================================================== --- ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-09-10 07:55:31 UTC (rev 4503) +++ ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-09-10 21:17:10 UTC (rev 4504) @@ -110,7 +110,7 @@ ensure # We should clean up after our tempfile, if we used one. input = env['rack.input'] - unlink input if input.class == Tempfile + input.unlink if input.class == Tempfile connection.close rescue nil end end

1 0