projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17a2aad
)
bug fixes
author
root
<root@plrg-1.ics.uci.edu>
Tue, 7 Apr 2020 22:35:37 +0000
(15:35 -0700)
committer
root
<root@plrg-1.ics.uci.edu>
Tue, 7 Apr 2020 22:35:37 +0000
(15:35 -0700)
actionlist.cc
patch
|
blob
|
history
diff --git
a/actionlist.cc
b/actionlist.cc
index 9f335e900e2de1910bf7e1a75531b04a64cb56a7..e39fb3cff2ac845d1dc3aa294a761b7180c70d3c 100644
(file)
--- a/
actionlist.cc
+++ b/
actionlist.cc
@@
-104,19
+104,16
@@
void actionlist::addAction(ModelAction * act) {
sllnode<ModelAction *> * llnode = new sllnode<ModelAction *>();
llnode->val = act;
if (tmp == NULL) {
sllnode<ModelAction *> * llnode = new sllnode<ModelAction *>();
llnode->val = act;
if (tmp == NULL) {
- ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
sllnode<ModelAction *> * llnodeprev = ptr->findPrev(clock);
if (llnodeprev != NULL) {
sllnode<ModelAction *> * llnodeprev = ptr->findPrev(clock);
if (llnodeprev != NULL) {
-
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
//see if we are the new tail
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
//see if we are the new tail
- if (llnode
prev->next =
= NULL)
-
tail
= llnode;
+ if (llnode
->next !
= NULL)
+
llnode->next->prev
= llnode;
else
else
- llnode->next->prev = llnode;
-
+ tail = llnode;
llnodeprev->next = llnode;
} else {
//We are the begining
llnodeprev->next = llnode;
} else {
//We are the begining
@@
-131,16
+128,20
@@
void actionlist::addAction(ModelAction * act) {
head = llnode;
}
head = llnode;
}
+ ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
+
//need to find next link
ptr->count++;
} else {
//handle case where something else is here
//need to find next link
ptr->count++;
} else {
//handle case where something else is here
- sllnode<ModelAction *> * llnodeprev = reinterpret_cast<sllnode<ModelAction *>*>(((uintptr_t)
llnode
) & ACTMASK);
+ sllnode<ModelAction *> * llnodeprev = reinterpret_cast<sllnode<ModelAction *>*>(((uintptr_t)
tmp
) & ACTMASK);
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
if (llnode->next != NULL)
llnode->next->prev = llnode;
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
if (llnode->next != NULL)
llnode->next->prev = llnode;
+ else
+ tail = llnode;
llnodeprev->next = llnode;
ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
}
llnodeprev->next = llnode;
ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
}