From 361b622b7ee25c83ea06083266f0cb66599e1912 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 14 Jan 2020 01:33:22 +0000
Subject: [PATCH] test: Update __vm_{peek,poke} tests.
---
test/vm/peek-freed.c | 3 ++-
test/vm/peek-freed2.c | 5 +++--
test/vm/peek-invalid.c | 3 ++-
test/vm/peek-user.pkg.c | 7 ++++---
test/vm/poke-freed.c | 3 ++-
test/vm/poke-invalid.c | 3 ++-
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/test/vm/peek-freed.c b/test/vm/peek-freed.c
index e266bdcf3..6cc84f3bc 100644
--- a/test/vm/peek-freed.c
+++ b/test/vm/peek-freed.c
@@ -7,6 +7,7 @@ int main()
{
int *a = malloc( 4 );
free( a );
- __vm_peek( a, _VM_ML_User ); /* ERROR */
+ __vm_pointer_t ptr = __vm_pointer_split( a );
+ __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
return 0;
}
diff --git a/test/vm/peek-freed2.c b/test/vm/peek-freed2.c
index 91743f985..0c22a8b86 100644
--- a/test/vm/peek-freed2.c
+++ b/test/vm/peek-freed2.c
@@ -8,9 +8,10 @@ int main()
int *a = malloc( 4 );
if ( a )
{
- __vm_poke( a, _VM_ML_User, 20 );
+ __vm_pointer_t ptr = __vm_pointer_split( a );
+ __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 20 );
free( a );
- __vm_peek( a, _VM_ML_User ); /* ERROR */
+ __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
}
return 0;
}
diff --git a/test/vm/peek-invalid.c b/test/vm/peek-invalid.c
index 091a60f60..9374b70aa 100644
--- a/test/vm/peek-invalid.c
+++ b/test/vm/peek-invalid.c
@@ -5,6 +5,7 @@
int main()
{
int *a;
- __vm_peek( a, _VM_ML_User ); /* ERROR */
+ __vm_pointer_t ptr = __vm_pointer_split( a );
+ __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
return 0;
}
diff --git a/test/vm/peek-user.pkg.c b/test/vm/peek-user.pkg.c
index ce4da0e8a..0dd360836 100644
--- a/test/vm/peek-user.pkg.c
+++ b/test/vm/peek-user.pkg.c
@@ -9,11 +9,12 @@
int main()
{
int a;
- __vm_poke( &a, _VM_ML_User, 32 );
+ __vm_pointer_t ptr = __vm_pointer_split( &a );
+ __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 32 );
#ifdef SUSPEND
__dios_suspend();
#endif
- int p = __vm_peek( &a, _VM_ML_User );
- assert( p == 32 );
+ __vm_meta_t meta = __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 );
+ assert( meta.value == 32 );
return 0;
}
diff --git a/test/vm/poke-freed.c b/test/vm/poke-freed.c
index 019a1ca0c..36b5c5358 100644
--- a/test/vm/poke-freed.c
+++ b/test/vm/poke-freed.c
@@ -7,6 +7,7 @@ int main()
{
int *a = malloc( 4 );
free( a );
- __vm_poke( a, _VM_ML_User, 0 ); /* ERROR */
+ __vm_pointer_t ptr = __vm_pointer_split( a );
+ __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 0 ); /* ERROR */
return 0;
}
diff --git a/test/vm/poke-invalid.c b/test/vm/poke-invalid.c
index 775f8a933..3f34b7f9d 100644
--- a/test/vm/poke-invalid.c
+++ b/test/vm/poke-invalid.c
@@ -5,6 +5,7 @@
int main()
{
int *a;
- __vm_poke( a, _VM_ML_User, 0 ); /* ERROR */
+ __vm_pointer_t ptr = __vm_pointer_split( a );
+ __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 0 ); /* ERROR */
return 0;
}
--
GitLab