Update Yasm to 1.2.0 (Yasm Part 1/3)

third_party/yasm/patched-yasm/libyasm/bytecode.h

 /**
  * \file libyasm/bytecode.h
  * \brief YASM bytecode interface.
  *
- * \rcs
- * $Id: bytecode.h 2130 2008-10-07 05:38:11Z peter $
- * \endrcs
- *
  * \license
  *  Copyright (C) 2001-2007  Peter Johnson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *  - Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *  - Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 121 matching lines @@
      * Called from yasm_bc_tobytes().
      * A generic fill-in for this is yasm_bc_tobytes_common(), but as this
      * function internal errors when called, be very careful when using it!
      * \param bc            bytecode
      * \param bufp          byte representation destination buffer;
      *                      should be incremented as it's written to,
      *                      so that on return its delta from the
      *                      passed-in buf matches the bytecode length
      *                      (it's okay not to do this if an error
      *                      indication is returned)
+     * \param bufstart      For calculating the correct offset parameter for
+     *                      the \a output_value calls: *bufp - bufstart.
      * \param d             data to pass to each call to
      *                      output_value/output_reloc
      * \param output_value  function to call to convert values into their byte
      *                      representation
      * \param output_reloc  function to call to output relocation entries
      *                      for a single sym
      * \return Nonzero on error, 0 on success.
      * \note May result in non-reversible changes to the bytecode, but it's
      *       preferable if calling this function twice would result in the
      *       same output.
      */
-    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp,
+                    unsigned char *bufstart, void *d,
                     yasm_output_value_func output_value,
                     /*@null@*/ yasm_output_reloc_func output_reloc);
 
     /** Special bytecode classifications.  Most bytecode types should use
      * #YASM_BC_SPECIAL_NONE.  Others cause special handling to kick in
      * in various parts of yasm.
      */
     enum yasm_bytecode_special_type {
         YASM_BC_SPECIAL_NONE = 0,
 
@@ skipping 98 matching lines @@
 YASM_LIB_DECL
 int yasm_bc_expand_common
     (yasm_bytecode *bc, int span, long old_val, long new_val,
      /*@out@*/ long *neg_thres, /*@out@*/ long *pos_thres);
 
 /** Common bytecode callback tobytes function, for where the bytecode
  * cannot be converted to bytes.  Causes an internal error if called.
  */
 YASM_LIB_DECL
 int yasm_bc_tobytes_common
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
 /** Get the next bytecode in a linked list of bytecodes.
  * \param bc    bytecode
  * \return Next bytecode.
  */
 #define yasm_bc__next(bc)               STAILQ_NEXT(bc, link)
 
 /** Set multiple field of a bytecode.
@@ skipping 277 matching lines @@
 /** Create a new uninitialized data value.
  * \return Newly allocated data value.
  */
 yasm_dataval *yasm_dv_create_reserve(void);
 
 #ifndef YASM_DOXYGEN
 #define yasm_dv_create_string(s, l) yasm_dv_create_raw((unsigned char *)(s), \
                                                        (unsigned long)(l))
 #endif
 
+/** Get the underlying value of a data value.
+ * \param dv    data value
+ * \return Value, or null if non-value (e.g. string or raw).
+ */
+yasm_value *yasm_dv_get_value(yasm_dataval *dv);
+
 /** Set multiple field of a data value.
  * A data value can be repeated a number of times when output.  This function
  * sets that multiple.
  * \param dv    data value
  * \param e     multiple (kept, do not free)
  */
 void yasm_dv_set_multiple(yasm_dataval *dv, /*@keep@*/ yasm_expr *e);
 
 /** Get the data value multiple value as an unsigned long integer.
  * \param dv            data value
@@ skipping 31 matching lines @@
 
 /** Print a data value list.  For debugging purposes.
  * \param f             file
  * \param indent_level  indentation level
  * \param headp         data value list
  */
 YASM_LIB_DECL
 void yasm_dvs_print(const yasm_datavalhead *headp, FILE *f, int indent_level);
 
 #endif