X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=cc3a3551b2bc31074c4fd532c6414b456868db44;hb=e2ccd1a087addd231f841629b9f32e4c6ba7d87c;hp=46803f640c3376ed662883a1a4876ae5a052e3d5;hpb=5c551b40d8697add8fde696de8bce7c2d43993ea;p=babeltrace.git

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 46803f64..cc3a3551 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf-text/types.h>
@@ -23,8 +31,9 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <babeltrace/bitfield.h>
+#include <babeltrace/trace-debuginfo.h>
 
-int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -43,7 +52,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 	fprintf(pos->fp, " ");
 	if (pos->print_names)
 		fprintf(pos->fp, "%s = ",
-			g_quark_to_string(definition->name));
+			rem_(g_quark_to_string(definition->name)));
 
 	if (pos->string
 	    && (integer_declaration->encoding == CTF_STRING_ASCII
@@ -104,10 +113,15 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 	{
 		uint64_t v;
 
-		if (!integer_declaration->signedness)
+		if (!integer_declaration->signedness) {
 			v = integer_definition->value._unsigned;
-		else
+		} else {
+			/* Round length to the nearest nibble */
+			uint8_t rounded_len = ((integer_declaration->len + 3) & ~0x3);
+
 			v = (uint64_t) integer_definition->value._signed;
+			v &= ((uint64_t) 1 << rounded_len) - 1;
+		}
 
 		fprintf(pos->fp, "0x%" PRIX64, v);
 		break;
@@ -116,5 +130,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		return -EINVAL;
 	}
 
+	ctf_text_integer_write_debug_info(ppos, definition);
+
 	return 0;
 }