X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fhb-open-type-private.hh;h=ab2a3462d8d717c8e05f21fa8dff7245d06763ac;hb=97158392a5899ddb739afaac925128f33f699bd7;hp=8f3001b669abb2660dd7d265c140ca53abdd2a3d;hpb=11e3ec444a85fc72541823c2e98cc92c4ceb19af;p=framework%2Fuifw%2Fharfbuzz.git diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 8f3001b..ab2a346 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007,2008,2009,2010 Red Hat, Inc. + * Copyright © 2007,2008,2009,2010 Red Hat, Inc. * * This is part of HarfBuzz, a text shaping library. * @@ -27,7 +27,7 @@ #ifndef HB_OPEN_TYPE_PRIVATE_HH #define HB_OPEN_TYPE_PRIVATE_HH -#include "hb-private.h" +#include "hb-private.hh" #include "hb-blob.h" @@ -144,29 +144,6 @@ ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type)) #define Null(Type) Null() -/* - * Trace - */ - - -template -struct hb_trace_t { - explicit hb_trace_t (unsigned int *pdepth, const char *what, const char *function, const void *obj) : pdepth(pdepth) { - (void) (*pdepth < max_depth && - fprintf (stderr, "%s(%p) %-*d-> %s\n", what, obj, *pdepth, *pdepth, function)); - if (max_depth) ++*pdepth; - } - ~hb_trace_t (void) { if (max_depth) --*pdepth; } - - private: - unsigned int *pdepth; -}; -template <> /* Optimize when tracing is disabled */ -struct hb_trace_t<0> { - explicit hb_trace_t (unsigned int *pdepth HB_UNUSED, const char *what HB_UNUSED, const char *function HB_UNUSED, const void *obj HB_UNUSED) {} -}; - - /* * Sanitize @@ -178,33 +155,36 @@ struct hb_trace_t<0> { #define TRACE_SANITIZE() \ - hb_trace_t trace (&c->debug_depth, "SANITIZE", HB_FUNC, this); \ + hb_auto_trace_t trace (&c->debug_depth, "SANITIZE", this, NULL, HB_FUNC); struct hb_sanitize_context_t { - inline void init (hb_blob_t *blob) + inline void init (hb_blob_t *b) + { + this->blob = hb_blob_reference (b); + this->writable = false; + } + + inline void setup (void) { - this->blob = hb_blob_reference (blob); - this->start = hb_blob_lock (blob); - this->end = this->start + hb_blob_get_length (blob); - this->writable = hb_blob_is_writable (blob); + this->start = hb_blob_get_data (this->blob, NULL); + this->end = this->start + hb_blob_get_length (this->blob); this->edit_count = 0; this->debug_depth = 0; - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "sanitize %p init [%p..%p] (%lu bytes)\n", - this->blob, this->start, this->end, - (unsigned long) (this->end - this->start))); + DEBUG_MSG (SANITIZE, this->blob, + "init [%p..%p] (%lu bytes)", + this->start, this->end, + (unsigned long) (this->end - this->start)); } inline void finish (void) { - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n", - this->blob, this->start, this->end, this->edit_count)); + DEBUG_MSG (SANITIZE, this->blob, + "fini [%p..%p] %u edit requests", + this->start, this->end, this->edit_count); - hb_blob_unlock (this->blob); hb_blob_destroy (this->blob); this->blob = NULL; this->start = this->end = NULL; @@ -217,13 +197,12 @@ struct hb_sanitize_context_t p <= this->end && (unsigned int) (this->end - p) >= len; - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - p, p + len, len, - this->start, this->end, - ret ? "pass" : "FAIL")); + DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth, + "%-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s", + this->debug_depth, this->debug_depth, + p, p + len, len, + this->start, this->end, + ret ? "pass" : "FAIL"); return likely (ret); } @@ -231,15 +210,14 @@ struct hb_sanitize_context_t inline bool check_array (const void *base, unsigned int record_size, unsigned int len) const { const char *p = (const char *) base; - bool overflows = record_size > 0 && len >= ((unsigned int) -1) / record_size; + bool overflows = _hb_unsigned_int_mul_overflows (len, record_size); - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, - this->start, this->end, - !overflows ? "does not overflow" : "OVERFLOWS FAIL")); + DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth, + "%-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s", + this->debug_depth, this->debug_depth, + p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, + this->start, this->end, + !overflows ? "does not overflow" : "OVERFLOWS FAIL"); return likely (!overflows && this->check_range (base, record_size * len)); } @@ -255,14 +233,13 @@ struct hb_sanitize_context_t const char *p = (const char *) base; this->edit_count++; - (void) (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE && - fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", - p, - this->debug_depth, this->debug_depth, - this->edit_count, - p, p + len, len, - this->start, this->end, - this->writable ? "granted" : "REJECTED")); + DEBUG_MSG_LEVEL (SANITIZE, this->blob, this->debug_depth, + "%-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s", + this->debug_depth, this->debug_depth, + this->edit_count, + p, p + len, len, + this->start, this->end, + this->writable ? "granted" : "REJECTED"); return this->writable; } @@ -286,14 +263,12 @@ struct Sanitizer /* TODO is_sane() stuff */ - if (!blob) - return hb_blob_create_empty (); + c->init (blob); retry: - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "Sanitizer %p start %s\n", blob, HB_FUNC)); + DEBUG_MSG_FUNC (SANITIZE, blob, "start"); - c->init (blob); + c->setup (); if (unlikely (!c->start)) { c->finish (); @@ -305,44 +280,45 @@ struct Sanitizer sane = t->sanitize (c); if (sane) { if (c->edit_count) { - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "Sanitizer %p passed first round with %d edits; doing a second round %s\n", - blob, c->edit_count, HB_FUNC)); + DEBUG_MSG_FUNC (SANITIZE, blob, "passed first round with %d edits; going for second round", c->edit_count); /* sanitize again to ensure no toe-stepping */ c->edit_count = 0; sane = t->sanitize (c); if (c->edit_count) { - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "Sanitizer %p requested %d edits in second round; FAILLING %s\n", - blob, c->edit_count, HB_FUNC)); + DEBUG_MSG_FUNC (SANITIZE, blob, "requested %d edits in second round; FAILLING", c->edit_count); sane = false; } } - c->finish (); } else { unsigned int edit_count = c->edit_count; - c->finish (); - if (edit_count && !hb_blob_is_writable (blob) && hb_blob_try_writable (blob)) { - /* ok, we made it writable by relocating. try again */ - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "Sanitizer %p retry %s\n", blob, HB_FUNC)); - goto retry; + if (edit_count && !c->writable) { + c->start = hb_blob_get_data_writable (blob, NULL); + c->end = c->start + hb_blob_get_length (blob); + + if (c->start) { + c->writable = true; + /* ok, we made it writable by relocating. try again */ + DEBUG_MSG_FUNC (SANITIZE, blob, "retry"); + goto retry; + } } } - (void) (HB_DEBUG_SANITIZE && - fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "FAILED", HB_FUNC)); + c->finish (); + + DEBUG_MSG_FUNC (SANITIZE, blob, sane ? "PASSED" : "FAILED"); if (sane) return blob; else { hb_blob_destroy (blob); - return hb_blob_create_empty (); + return hb_blob_get_empty (); } } static const Type* lock_instance (hb_blob_t *blob) { - const char *base = hb_blob_lock (blob); + hb_blob_make_immutable (blob); + const char *base = hb_blob_get_data (blob, NULL); return unlikely (!base) ? &Null(Type) : CastP (base); } }; @@ -374,7 +350,7 @@ class BEInt public: inline void set (Type i) { hb_be_uint16_put (v,i); } inline operator Type (void) const { return hb_be_uint16_get (v); } - inline bool operator == (const BEInt& o) const { return hb_be_uint16_cmp (v, o.v); } + inline bool operator == (const BEInt& o) const { return hb_be_uint16_eq (v, o.v); } inline bool operator != (const BEInt& o) const { return !(*this == o); } private: uint8_t v[2]; }; @@ -384,7 +360,7 @@ class BEInt public: inline void set (Type i) { hb_be_uint32_put (v,i); } inline operator Type (void) const { return hb_be_uint32_get (v); } - inline bool operator == (const BEInt& o) const { return hb_be_uint32_cmp (v, o.v); } + inline bool operator == (const BEInt& o) const { return hb_be_uint32_eq (v, o.v); } inline bool operator != (const BEInt& o) const { return !(*this == o); } private: uint8_t v[4]; }; @@ -479,7 +455,7 @@ struct CheckSum : ULONG struct FixedVersion { - inline operator uint32_t (void) const { return (major << 16) + minor; } + inline uint32_t to_int (void) const { return (major << 16) + minor; } inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE ();