Changeset 1c5c96d in mainline

Timestamp:

2017-10-11T20:35:01Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d29ae35

Parents:

b08e98ba

Message:

Unify offset ranges in update_damaged_region.

Location:

uspace/lib

Files:

• c/generic/io/visualizer.c (modified) (2 diffs)
• graph/graph.c (modified) (1 diff)

uspace/lib/c/generic/io/visualizer.c

@@ -33 +33 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <as.h>
@@ -175 +176 @@
         sysarg_t x_offset, sysarg_t y_offset)
 {
-#ifdef __32_BITS__
+        assert(x_offset <= UINT16_MAX);
+        assert(y_offset <= UINT16_MAX);
+
         sysarg_t offsets = ((x_offset << 16) | (y_offset & 0x0000ffff));
-#else
-        sysarg_t offsets = ((x_offset << 32) | (y_offset & 0xffffffff));
-#endif
 
         async_exch_t *exch = async_exchange_begin(sess);

uspace/lib/graph/graph.c

@@ -469 +469 @@
 static void vs_update_damaged_region(visualizer_t *vs, ipc_callid_t iid, ipc_call_t *icall)
 {
-#ifdef __32_BITS__
         sysarg_t x_offset = (IPC_GET_ARG5(*icall) >> 16);
         sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0x0000ffff);
-#else
-        sysarg_t x_offset = (IPC_GET_ARG5(*icall) >> 32);
-        sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0xffffffff);
-#endif
         
         int rc = vs->ops.handle_damage(vs,